From 94244bb1725da3ddea7e89db0a0af9b9a0e82a38 Mon Sep 17 00:00:00 2001 From: dkanada Date: Mon, 26 Apr 2021 14:20:53 +0900 Subject: [PATCH] change some method names in theme activity --- .../gramophone/activities/AboutActivity.java | 6 ++--- .../gramophone/activities/LoginActivity.java | 6 ++--- .../gramophone/activities/MainActivity.java | 2 +- .../gramophone/activities/SearchActivity.java | 6 ++--- .../gramophone/activities/SelectActivity.java | 6 ++--- .../activities/SettingsActivity.java | 6 ++--- .../gramophone/activities/SplashActivity.java | 6 ++--- .../base/AbsMusicPanelActivity.java | 20 +++++++-------- .../activities/base/AbsThemeActivity.java | 25 +++++++++---------- .../details/AlbumDetailActivity.java | 12 ++++----- .../details/ArtistDetailActivity.java | 12 ++++----- .../details/GenreDetailActivity.java | 6 ++--- .../details/PlaylistDetailActivity.java | 6 ++--- .../mainactivity/library/LibraryFragment.java | 4 +-- 14 files changed, 61 insertions(+), 62 deletions(-) diff --git a/app/src/main/java/com/dkanada/gramophone/activities/AboutActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/AboutActivity.java index 3a2d2629..1636955c 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/AboutActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/AboutActivity.java @@ -60,10 +60,10 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen supportBinding = CardSupportDevelopmentBinding.bind(findViewById(R.id.support_layout)); thanksBinding = CardSpecialThanksBinding.bind(findViewById(R.id.thanks_layout)); - setDrawUnderStatusbar(); - setStatusbarColorAuto(); + setDrawUnderStatusBar(); + setStatusBarColorAuto(); - setNavigationbarColorAuto(); + setNavigationBarColorAuto(); setTaskDescriptionColorAuto(); setUpViews(); diff --git a/app/src/main/java/com/dkanada/gramophone/activities/LoginActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/LoginActivity.java index 9084b619..7bea34bb 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/LoginActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/LoginActivity.java @@ -33,10 +33,10 @@ public class LoginActivity extends AbsBaseActivity implements View.OnClickListen binding = ActivityLoginBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); - setDrawUnderStatusbar(); - setStatusbarColorAuto(); + setDrawUnderStatusBar(); + setStatusBarColorAuto(); - setNavigationbarColorAuto(); + setNavigationBarColorAuto(); setTaskDescriptionColorAuto(); setUpViews(); diff --git a/app/src/main/java/com/dkanada/gramophone/activities/MainActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/MainActivity.java index daa3b1d0..41a4ec08 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/MainActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/MainActivity.java @@ -51,7 +51,7 @@ public class MainActivity extends AbsMusicPanelActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setDrawUnderStatusbar(); + setDrawUnderStatusBar(); if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) { binding.navigationView.setFitsSystemWindows(false); diff --git a/app/src/main/java/com/dkanada/gramophone/activities/SearchActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/SearchActivity.java index 4d90a0e6..cd856ca7 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/SearchActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/SearchActivity.java @@ -50,10 +50,10 @@ public class SearchActivity extends AbsMusicServiceActivity implements SearchVie binding = ActivitySearchBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); - setDrawUnderStatusbar(); - setStatusbarColorAuto(); + setDrawUnderStatusBar(); + setStatusBarColorAuto(); - setNavigationbarColorAuto(); + setNavigationBarColorAuto(); setTaskDescriptionColorAuto(); binding.recyclerView.setLayoutManager(new LinearLayoutManager(this)); diff --git a/app/src/main/java/com/dkanada/gramophone/activities/SelectActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/SelectActivity.java index 88b159d7..af6deb15 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/SelectActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/SelectActivity.java @@ -41,10 +41,10 @@ public class SelectActivity extends AbsBaseActivity { } }); - setDrawUnderStatusbar(); - setStatusbarColorAuto(); + setDrawUnderStatusBar(); + setStatusBarColorAuto(); - setNavigationbarColorAuto(); + setNavigationBarColorAuto(); setTaskDescriptionColorAuto(); int primaryColor = ThemeStore.primaryColor(this); diff --git a/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java index eb2beeae..5f37ba8b 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java @@ -42,10 +42,10 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia binding = ActivitySettingsBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); - setDrawUnderStatusbar(); - setStatusbarColorAuto(); + setDrawUnderStatusBar(); + setStatusBarColorAuto(); - setNavigationbarColorAuto(); + setNavigationBarColorAuto(); setTaskDescriptionColorAuto(); binding.toolbar.setBackgroundColor(ThemeStore.primaryColor(this)); diff --git a/app/src/main/java/com/dkanada/gramophone/activities/SplashActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/SplashActivity.java index c62b4a0f..83cc604a 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/SplashActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/SplashActivity.java @@ -21,10 +21,10 @@ public class SplashActivity extends AbsBaseActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_splash); - setDrawUnderStatusbar(); + setDrawUnderStatusBar(); - setStatusbarColorAuto(); - setNavigationbarColorAuto(); + setStatusBarColorAuto(); + setNavigationBarColorAuto(); setTaskDescriptionColorAuto(); } diff --git a/app/src/main/java/com/dkanada/gramophone/activities/base/AbsMusicPanelActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsMusicPanelActivity.java index 47ab42c8..52c0e6cd 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/base/AbsMusicPanelActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsMusicPanelActivity.java @@ -142,7 +142,7 @@ public abstract class AbsMusicPanelActivity extends AbsMusicServiceActivity impl public void onPanelSlide(View panel, @FloatRange(from = 0, to = 1) float slideOffset) { setMiniPlayerAlphaProgress(slideOffset); if (navigationBarColorAnimator != null) navigationBarColorAnimator.cancel(); - super.setNavigationbarColor(ColorUtils.blendARGB(navigationbarColor, playerFragment.getPaletteColor(), slideOffset)); + super.setNavigationBarColor(ColorUtils.blendARGB(navigationbarColor, playerFragment.getPaletteColor(), slideOffset)); } @Override @@ -163,9 +163,9 @@ public abstract class AbsMusicPanelActivity extends AbsMusicServiceActivity impl public void onPanelCollapsed(View panel) { // restore values - super.setLightStatusbar(lightStatusbar); + super.setLightStatusBar(lightStatusbar); super.setTaskDescriptionColor(taskColor); - super.setNavigationbarColor(navigationbarColor); + super.setNavigationBarColor(navigationbarColor); playerFragment.setMenuVisibility(false); playerFragment.setUserVisibleHint(false); @@ -175,9 +175,9 @@ public abstract class AbsMusicPanelActivity extends AbsMusicServiceActivity impl public void onPanelExpanded(View panel) { // setting fragments values int playerFragmentColor = playerFragment.getPaletteColor(); - super.setLightStatusbar(false); + super.setLightStatusBar(false); super.setTaskDescriptionColor(playerFragmentColor); - super.setNavigationbarColor(playerFragmentColor); + super.setNavigationBarColor(playerFragmentColor); playerFragment.setMenuVisibility(true); playerFragment.setUserVisibleHint(true); @@ -252,16 +252,16 @@ public abstract class AbsMusicPanelActivity extends AbsMusicServiceActivity impl } @Override - public void setLightStatusbar(boolean enabled) { + public void setLightStatusBar(boolean enabled) { lightStatusbar = enabled; if (getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) { - super.setLightStatusbar(enabled); + super.setLightStatusBar(enabled); } } @Override - public void setNavigationbarColor(int color) { + public void setNavigationBarColor(int color) { this.navigationbarColor = color; if (navigationBarColorAnimator != null) { @@ -269,7 +269,7 @@ public abstract class AbsMusicPanelActivity extends AbsMusicServiceActivity impl } if (getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) { - super.setNavigationbarColor(color); + super.setNavigationBarColor(color); } } @@ -284,7 +284,7 @@ public abstract class AbsMusicPanelActivity extends AbsMusicServiceActivity impl .setDuration(ViewUtil.PHONOGRAPH_ANIM_TIME); navigationBarColorAnimator.setInterpolator(new PathInterpolator(0.4f, 0f, 1f, 1f)); - navigationBarColorAnimator.addUpdateListener(animation -> super.setNavigationbarColor((int) animation.getAnimatedValue())); + navigationBarColorAnimator.addUpdateListener(animation -> super.setNavigationBarColor((int) animation.getAnimatedValue())); navigationBarColorAnimator.start(); } diff --git a/app/src/main/java/com/dkanada/gramophone/activities/base/AbsThemeActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsThemeActivity.java index e7f01188..1c0bdf44 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/base/AbsThemeActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsThemeActivity.java @@ -6,7 +6,6 @@ import android.view.View; import androidx.annotation.ColorInt; -import com.dkanada.gramophone.BuildConfig; import com.kabouzeid.appthemehelper.ATH; import com.kabouzeid.appthemehelper.ThemeStore; import com.kabouzeid.appthemehelper.common.ATHToolbarActivity; @@ -28,7 +27,7 @@ public abstract class AbsThemeActivity extends ATHToolbarActivity { } } - protected void setDrawUnderStatusbar() { + protected void setDrawUnderStatusBar() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { Util.setAllowDrawUnderStatusBar(getWindow()); } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { @@ -36,26 +35,26 @@ public abstract class AbsThemeActivity extends ATHToolbarActivity { } } - public void setStatusbarColor(int color) { + public void setStatusBarColor(int color) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { final View statusBar = getWindow().getDecorView().getRootView().findViewById(R.id.status_bar); if (statusBar != null) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { statusBar.setBackgroundColor(ColorUtil.darkenColor(color)); - setLightStatusbarAuto(color); + setLightStatusBarAuto(color); } else { statusBar.setBackgroundColor(color); } } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { getWindow().setStatusBarColor(ColorUtil.darkenColor(color)); - setLightStatusbarAuto(color); + setLightStatusBarAuto(color); } } } - public void setStatusbarColorAuto() { + public void setStatusBarColorAuto() { // we don't want to use status bar color because we are darkening the color on our own to support KitKat - setStatusbarColor(ThemeStore.primaryColor(this)); + setStatusBarColor(ThemeStore.primaryColor(this)); } public void setTaskDescriptionColor(@ColorInt int color) { @@ -66,19 +65,19 @@ public abstract class AbsThemeActivity extends ATHToolbarActivity { setTaskDescriptionColor(ThemeStore.primaryColor(this)); } - public void setNavigationbarColor(int color) { + public void setNavigationBarColor(int color) { ATH.setNavigationbarColor(this, color); } - public void setNavigationbarColorAuto() { - setNavigationbarColor(ThemeStore.navigationBarColor(this)); + public void setNavigationBarColorAuto() { + setNavigationBarColor(ThemeStore.navigationBarColor(this)); } - public void setLightStatusbar(boolean enabled) { + public void setLightStatusBar(boolean enabled) { ATH.setLightStatusbar(this, enabled); } - public void setLightStatusbarAuto(int bgColor) { - setLightStatusbar(ColorUtil.isColorLight(bgColor)); + public void setLightStatusBarAuto(int bgColor) { + setLightStatusBar(ColorUtil.isColorLight(bgColor)); } } diff --git a/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java index 6b32e9b1..ac4f5d9a 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java @@ -57,7 +57,7 @@ public class AlbumDetailActivity extends AbsMusicPanelActivity implements Palett super.onCreate(savedInstanceState); - setDrawUnderStatusbar(); + setDrawUnderStatusBar(); setUpObservableListViewParams(); setUpToolbar(); setUpViews(); @@ -118,13 +118,13 @@ public class AlbumDetailActivity extends AbsMusicPanelActivity implements Palett toolbarColor = color; binding.appBarLayout.setBackgroundColor(color); - setNavigationbarColor(color); + setNavigationBarColor(color); setTaskDescriptionColor(color); binding.toolbar.setBackgroundColor(color); // needed to auto readjust the toolbar content color setSupportActionBar(binding.toolbar); - setStatusbarColor(color); + setStatusBarColor(color); int secondaryTextColor = MaterialValueHelper.getSecondaryTextColor(this, ColorUtil.isColorLight(color)); binding.artistIcon.setColorFilter(secondaryTextColor, PorterDuff.Mode.SRC_IN); @@ -241,9 +241,9 @@ public class AlbumDetailActivity extends AbsMusicPanelActivity implements Palett } @Override - public void setStatusbarColor(int color) { - super.setStatusbarColor(color); - setLightStatusbar(false); + public void setStatusBarColor(int color) { + super.setStatusBarColor(color); + setLightStatusBar(false); } private void setAlbum(Album album) { diff --git a/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java index 116c5eef..d40bec7e 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java @@ -62,7 +62,7 @@ public class ArtistDetailActivity extends AbsMusicPanelActivity implements Palet // must be loaded before album adapter usePalette = PreferenceUtil.getInstance(this).getAlbumArtistColoredFooters(); - setDrawUnderStatusbar(); + setDrawUnderStatusBar(); setUpObservableListViewParams(); setUpToolbar(); setUpViews(); @@ -167,13 +167,13 @@ public class ArtistDetailActivity extends AbsMusicPanelActivity implements Palet toolbarColor = color; binding.appBarLayout.setBackgroundColor(color); - setNavigationbarColor(color); + setNavigationBarColor(color); setTaskDescriptionColor(color); binding.toolbar.setBackgroundColor(color); // needed to auto readjust the toolbar content color setSupportActionBar(binding.toolbar); - setStatusbarColor(color); + setStatusBarColor(color); int secondaryTextColor = MaterialValueHelper.getSecondaryTextColor(this, ColorUtil.isColorLight(color)); binding.durationIcon.setColorFilter(secondaryTextColor, PorterDuff.Mode.SRC_IN); @@ -268,9 +268,9 @@ public class ArtistDetailActivity extends AbsMusicPanelActivity implements Palet } @Override - public void setStatusbarColor(int color) { - super.setStatusbarColor(color); - setLightStatusbar(false); + public void setStatusBarColor(int color) { + super.setStatusBarColor(color); + setLightStatusBar(false); } private void setArtist(Artist artist) { diff --git a/app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java index 6a9ea014..a010f22a 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java @@ -44,10 +44,10 @@ public class GenreDetailActivity extends AbsMusicPanelActivity implements CabHol super.onCreate(savedInstanceState); - setDrawUnderStatusbar(); - setStatusbarColorAuto(); + setDrawUnderStatusBar(); + setStatusBarColorAuto(); - setNavigationbarColorAuto(); + setNavigationBarColorAuto(); setTaskDescriptionColorAuto(); setUpRecyclerView(); diff --git a/app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java index cd072e21..a940f077 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java @@ -54,10 +54,10 @@ public class PlaylistDetailActivity extends AbsMusicPanelActivity implements Cab super.onCreate(savedInstanceState); - setDrawUnderStatusbar(); - setStatusbarColorAuto(); + setDrawUnderStatusBar(); + setStatusBarColorAuto(); - setNavigationbarColorAuto(); + setNavigationBarColorAuto(); setTaskDescriptionColorAuto(); setUpRecyclerView(); diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/LibraryFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/LibraryFragment.java index 75735cad..10ff9248 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/LibraryFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/LibraryFragment.java @@ -73,8 +73,8 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { PreferenceUtil.getInstance(getActivity()).registerOnSharedPreferenceChangedListener(this); - getMainActivity().setStatusbarColorAuto(); - getMainActivity().setNavigationbarColorAuto(); + getMainActivity().setStatusBarColorAuto(); + getMainActivity().setNavigationBarColorAuto(); getMainActivity().setTaskDescriptionColorAuto(); setUpToolbar();