Skip to content

Commit 4a32694

Browse files
AndyScherzingeralperozturk96
authored andcommitted
style(bgnd): Use common lib implementation for background-theming
Signed-off-by: Andy Scherzinger <[email protected]>
1 parent e5bc6e1 commit 4a32694

File tree

9 files changed

+16
-19
lines changed

9 files changed

+16
-19
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ 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);
235+
util.platform.colorViewBackground(getWindow().getDecorView());
236+
util.platform.colorViewBackground(binding.getRoot());
236237
}
237238
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
import android.os.Bundle;
1212

13-
import androidx.annotation.ColorInt;
1413
import androidx.annotation.NonNull;
1514
import androidx.fragment.app.Fragment;
1615
import androidx.fragment.app.FragmentActivity;
@@ -58,7 +57,8 @@ public void applyBrand(int color) {
5857
util.platform.themeStatusBar(this);
5958
util.material.themeToolbar(binding.toolbar);
6059
util.material.themeTabLayoutOnSurface(binding.tabs);
61-
util.notes.themeBackgroundView(binding.getRoot(), this);
60+
util.platform.colorViewBackground(getWindow().getDecorView());
61+
util.platform.colorViewBackground(binding.getRoot());
6262
}
6363

6464
private static class TabsStateAdapter extends FragmentStateAdapter {

app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import static com.nextcloud.android.common.ui.util.ColorStateListUtilsKt.buildColorStateList;
1010
import static com.nextcloud.android.common.ui.util.PlatformThemeUtil.isDarkMode;
1111

12-
import android.app.Activity;
1312
import android.content.Context;
1413
import android.content.res.ColorStateList;
1514
import android.graphics.Color;
@@ -233,14 +232,6 @@ public void themeInternalLinkIcon(ImageView view) {
233232
});
234233
}
235234

236-
public void themeBackgroundView(View view, Activity activity) {
237-
withScheme(view, scheme -> {
238-
activity.getWindow().getDecorView().setBackgroundColor(dynamicColor.surface().getArgb(scheme));
239-
view.setBackgroundColor(dynamicColor.surface().getArgb(scheme));
240-
return view;
241-
});
242-
}
243-
244235
public void themeBackgroundItemView(View view) {
245236
withScheme(view, scheme -> {
246237
StateListDrawable res = new StateListDrawable();

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@ 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);
451+
util.platform.colorViewBackground(getWindow().getDecorView());
452+
util.platform.colorViewBackground(binding.getRoot());
452453
}
453454
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import android.os.Bundle;
2828
import android.text.TextUtils;
2929
import android.util.Log;
30-
import android.view.Menu;
3130
import android.view.View;
3231

3332
import androidx.annotation.ColorInt;
@@ -607,7 +606,8 @@ public void applyBrand(int color) {
607606
util.platform.colorNavigationView(binding.navigationView);
608607
util.material.themeFAB(activityBinding.fabCreate);
609608
util.notes.themeSearchCardView(binding.activityNotesListView.searchBarWrapper);
610-
util.notes.themeBackgroundView(binding.activityNotesListView.getRoot(), this);
609+
util.platform.colorViewBackground(getWindow().getDecorView());
610+
util.platform.colorViewBackground(binding.getRoot());
611611
util.platform.colorTextView(binding.activityNotesListView.searchText, ColorRole.ON_SURFACE_VARIANT);
612612
util.notes.themeSearchToolbar(binding.activityNotesListView.searchToolbar);
613613
util.notes.themeToolbarSearchView(binding.activityNotesListView.searchView);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ 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);
231+
util.platform.colorViewBackground(getWindow().getDecorView());
232+
util.platform.colorViewBackground(binding.getRoot());
232233
}
233234
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ 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);
44+
util.platform.colorViewBackground(getWindow().getDecorView());
45+
util.platform.colorViewBackground(binding.getRoot());
4546
}
4647
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -789,7 +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);
792+
util.platform.colorViewBackground(getWindow().getDecorView());
793+
util.platform.colorViewBackground(binding.getRoot());
793794
util.platform.colorTextButtons(binding.btnShareButton);
794795
}
795796

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,8 @@ class NoteShareDetailActivity : BrandedActivity(),
154154
colorMaterialButtonPrimaryOutlined(shareProcessBtnCancel)
155155
}
156156
}
157-
util.notes.themeBackgroundView(binding.getRoot(), this)
157+
util.platform.colorViewBackground(window.decorView)
158+
util.platform.colorViewBackground(binding.getRoot())
158159
}
159160

160161
override fun onConfigurationChanged(newConfig: Configuration) {

0 commit comments

Comments
 (0)