diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java index 3cd1aef1..e766877e 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java @@ -3,7 +3,6 @@ package com.dkanada.gramophone.ui.activities.base; import android.animation.ArgbEvaluator; import android.animation.ValueAnimator; import android.content.Intent; -import android.graphics.Color; import android.os.Build; import android.os.Bundle; import androidx.annotation.ColorInt; @@ -27,7 +26,6 @@ import com.dkanada.gramophone.ui.fragments.player.card.CardPlayerFragment; import com.dkanada.gramophone.ui.fragments.player.flat.FlatPlayerFragment; import com.dkanada.gramophone.util.PreferenceUtil; import com.dkanada.gramophone.util.ViewUtil; -import com.kabouzeid.appthemehelper.ThemeStore; import com.sothree.slidinguppanel.SlidingUpPanelLayout; public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivity implements SlidingUpPanelLayout.PanelSlideListener, CardPlayerFragment.Callbacks { @@ -144,15 +142,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi public void onPanelSlide(View panel, @FloatRange(from = 0, to = 1) float slideOffset) { setMiniPlayerAlphaProgress(slideOffset); if (navigationBarColorAnimator != null) navigationBarColorAnimator.cancel(); - int color = shiftNavbarColor(playerFragment.getPaletteColor()); - - if (ThemeStore.coloredNavigationBar(this)) { - int navbarColor = ColorUtils.blendARGB(navigationbarColor, color, slideOffset); - super.setNavigationbarColor(navbarColor); - } else { - int navbarColor = ColorUtils.blendARGB(Color.TRANSPARENT, color, slideOffset); - super.setNavigationbarColor(navbarColor); - } + super.setNavigationbarColor(ColorUtils.blendARGB(navigationbarColor, playerFragment.getPaletteColor(), slideOffset)); } @Override @@ -187,8 +177,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi int playerFragmentColor = playerFragment.getPaletteColor(); super.setLightStatusbar(false); super.setTaskDescriptionColor(playerFragmentColor); - int color = shiftNavbarColor(playerFragmentColor); - super.setNavigationbarColor(color); + super.setNavigationbarColor(playerFragmentColor); playerFragment.setMenuVisibility(true); playerFragment.setUserVisibleHint(true); @@ -255,8 +244,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi if (getPanelState() == SlidingUpPanelLayout.PanelState.EXPANDED) { int playerFragmentColor = playerFragment.getPaletteColor(); super.setTaskDescriptionColor(playerFragmentColor); - int color = shiftNavbarColor(playerFragmentColor); - animateNavigationBarColor(color); + animateNavigationBarColor(playerFragmentColor); } } @@ -308,28 +296,4 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi protected View getSnackBarContainer() { return findViewById(R.id.content_container); } - - /** - * To improve contrast with the navbar controls - */ - private int shiftNavbarColor(int color) { - double luminance = ColorUtils.calculateLuminance(color); - - if (luminance > 0.7 || luminance < 0.3) { - // The color is really dark or really light, the navbar is just fine - return color; - } else if (luminance > 0.5) { - // The color is a bit lighter than the center, let's make it a bit lighter, so it's easier to see - float[] hsv = new float[3]; - Color.colorToHSV(color, hsv); - hsv[2] *= 1.3f; - return Color.HSVToColor(hsv); - } else { - // The color is a bit darker than the center, let's make it a bit darker, so it's easier to see - float[] hsv = new float[3]; - Color.colorToHSV(color, hsv); - hsv[2] *= 0.7f; - return Color.HSVToColor(hsv); - } - } } diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsThemeActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsThemeActivity.java index e0850144..6786517a 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsThemeActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsThemeActivity.java @@ -73,11 +73,7 @@ public abstract class AbsThemeActivity extends ATHToolbarActivity { } public void setNavigationbarColorAuto() { - if (ThemeStore.coloredNavigationBar(this)) { - setNavigationbarColor(ThemeStore.navigationBarColor(this)); - } else { - setNavigationbarColor(Color.TRANSPARENT); - } + setNavigationbarColor(ThemeStore.navigationBarColor(this)); } public void setLightStatusbar(boolean enabled) { diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerFragment.java index b1c83b11..90c81ec5 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerFragment.java @@ -26,7 +26,6 @@ import com.h6ah4i.android.widget.advrecyclerview.animator.GeneralItemAnimator; import com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemAnimator; import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager; import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils; -import com.kabouzeid.appthemehelper.ATH; import com.kabouzeid.appthemehelper.ThemeStore; import com.kabouzeid.appthemehelper.util.ATHUtil; import com.kabouzeid.appthemehelper.util.ColorUtil; @@ -261,9 +260,6 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum public void onHide() { playbackControlsFragment.hide(); onBackPressed(); - if (!ThemeStore.coloredNavigationBar(requireContext())) { - ATH.setNavigationbarColor(requireActivity(), Color.TRANSPARENT); - } } @Override diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java index 09bd28e9..16af23fd 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java @@ -176,7 +176,6 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbum } } - @SuppressWarnings("ConstantConditions") private void updateCurrentSong() { impl.updateCurrentSong(MusicPlayerRemote.getCurrentSong()); } @@ -243,7 +242,7 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbum @Override protected void toggleFavorite(Song song) { super.toggleFavorite(song); - if (song.id == MusicPlayerRemote.getCurrentSong().id) { + if (song.id.equals(MusicPlayerRemote.getCurrentSong().id)) { if (song.favorite) { playerAlbumCoverFragment.showHeartAnimation(); } diff --git a/app/src/main/res/layout-land/fragment_card_player.xml b/app/src/main/res/layout-land/fragment_card_player.xml index 6bf87bb4..5eeb5358 100644 --- a/app/src/main/res/layout-land/fragment_card_player.xml +++ b/app/src/main/res/layout-land/fragment_card_player.xml @@ -69,10 +69,10 @@ + android:layout_height="wrap_content"> + - \ No newline at end of file + +