Skip to content

Commit f31bf52

Browse files
styles.xml(m3): Add general background coloring
Signed-off-by: Andy Scherzinger <[email protected]>
1 parent dcad8b2 commit f31bf52

File tree

10 files changed

+13
-1
lines changed

10 files changed

+13
-1
lines changed

app/src/main/java/it/niedermann/owncloud/notes/FormattingHelpActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,5 +232,6 @@ public void applyBrand(int color) {
232232
final var util = BrandingUtil.of(color, this);
233233
util.platform.themeStatusBar(this);
234234
util.material.themeToolbar(binding.toolbar);
235+
util.notes.themeBackgroundView(binding.getRoot(), this);
235236
}
236237
}

app/src/main/java/it/niedermann/owncloud/notes/about/AboutActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public void applyBrand(int color) {
5858
util.platform.themeStatusBar(this);
5959
util.material.themeToolbar(binding.toolbar);
6060
util.material.themeTabLayoutOnSurface(binding.tabs);
61+
util.notes.themeBackgroundView(binding.getRoot(), this);
6162
}
6263

6364
private static class TabsStateAdapter extends FragmentStateAdapter {

app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,5 +448,6 @@ public void applyBrand(int color) {
448448
final var util = BrandingUtil.of(color, this);
449449
util.platform.themeStatusBar(this);
450450
util.material.themeToolbar(binding.toolbar);
451+
util.notes.themeBackgroundView(binding.getRoot(), this);
451452
}
452453
}

app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,5 +228,6 @@ public void applyBrand(int color) {
228228
final var util = BrandingUtil.of(color, this);
229229
util.platform.themeStatusBar(this);
230230
util.material.themeToolbar(binding.toolbar);
231+
util.notes.themeBackgroundView(binding.getRoot(), this);
231232
}
232233
}

app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,6 @@ public void applyBrand(int color) {
4141
final var util = BrandingUtil.of(color, this);
4242
util.platform.themeStatusBar(this);
4343
util.material.themeToolbar(binding.toolbar);
44+
util.notes.themeBackgroundView(binding.getRoot(), this);
4445
}
4546
}

app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -789,6 +789,8 @@ public void applyBrand(int color) {
789789
util.platform.themeStatusBar(this);
790790
util.androidx.themeToolbarSearchView(binding.searchView);
791791
util.platform.themeHorizontalProgressBar(binding.progressBar);
792+
util.notes.themeBackgroundView(binding.getRoot(), this);
793+
util.platform.colorTextButtons(binding.btnShareButton);
792794
}
793795

794796
@Override

app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ class NoteShareDetailActivity : BrandedActivity(),
154154
colorMaterialButtonPrimaryOutlined(shareProcessBtnCancel)
155155
}
156156
}
157+
util.notes.themeBackgroundView(binding.getRoot(), this)
157158
}
158159

159160
override fun onConfigurationChanged(newConfig: Configuration) {

app/src/main/res/values-night/colors.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,6 @@
3838

3939
<color name="nc_grey">#222222</color>
4040
<color name="icon_on_nc_grey">#ffffff</color>
41+
42+
<color name="action_mode_background">#1E1E1E</color>
4143
</resources>

app/src/main/res/values/colors.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,6 @@
4747

4848
<color name="widget_background">#ddffffff</color>
4949
<color name="widget_foreground">#222222</color>
50+
51+
<color name="action_mode_background">#ededed</color>
5052
</resources>

app/src/main/res/values/styles.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<item name="colorPrimary">@color/primary</item>
1414
<item name="colorPrimaryDark">?android:colorPrimary</item>
1515
<item name="colorAccent">@color/accent</item>
16-
1716
<item name="android:statusBarColor">@color/bg_default</item>
1817
<item name="android:windowLightStatusBar">@bool/isDayMode</item>
1918
<item name="android:colorControlNormal">?attr/colorAccent</item>
@@ -72,6 +71,7 @@
7271
<style name="actionModeStyle" parent="@style/Widget.Material3.ActionMode">
7372
<item name="android:paddingStart">@dimen/spacer_activity_sides</item>
7473
<item name="android:paddingEnd">@dimen/spacer_activity_sides</item>
74+
<item name="background">@color/action_mode_background</item>
7575
</style>
7676

7777
<style name="searchToolbarStyle" parent="@style/Widget.Material3.Toolbar">

0 commit comments

Comments
 (0)