diff --git a/app/build.gradle b/app/build.gradle index 70297a71..7228fe1c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,7 +24,7 @@ android { vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 430 + versionCode 431 versionName '3.5.300' multiDexEnabled true diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.java b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.java index dbf430e1..fa705ff6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.java @@ -382,8 +382,8 @@ public class MainActivity extends AbsSlidingMusicPanelActivity key.equals(PreferenceUtil.TOGGLE_HOME_BANNER) || key.equals(PreferenceUtil.TOGGLE_ADD_CONTROLS) || key.equals(PreferenceUtil.ALBUM_COVER_STYLE) || key.equals(PreferenceUtil.HOME_ARTIST_GRID_STYLE) || key.equals(PreferenceUtil.ALBUM_COVER_TRANSFORM) || key.equals(PreferenceUtil.DESATURATED_COLOR) || - key.equals(PreferenceUtil.TAB_TEXT_MODE) || key.equals(PreferenceUtil.LANGUAGE_NAME) || - key.equals(PreferenceUtil.LIBRARY_CATEGORIES) + key.equals(PreferenceUtil.EXTRA_SONG_INFO) || key.equals(PreferenceUtil.TAB_TEXT_MODE) || + key.equals(PreferenceUtil.LANGUAGE_NAME) || key.equals(PreferenceUtil.LIBRARY_CATEGORIES) ) { postRecreate(); } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt index eeb004e7..f78915da 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt @@ -1,7 +1,5 @@ package code.name.monkey.retromusic.fragments.player.normal -import android.content.SharedPreferences -import android.content.SharedPreferences.OnSharedPreferenceChangeListener import android.graphics.PorterDuff import android.os.Bundle import android.view.LayoutInflater @@ -27,8 +25,7 @@ import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.ViewUtil import kotlinx.android.synthetic.main.fragment_player_playback_controls.* -class PlayerPlaybackControlsFragment : AbsPlayerControlsFragment(), - OnSharedPreferenceChangeListener { +class PlayerPlaybackControlsFragment : AbsPlayerControlsFragment() { private var lastPlaybackControlsColor: Int = 0 private var lastDisabledPlaybackControlsColor: Int = 0 @@ -58,7 +55,7 @@ class PlayerPlaybackControlsFragment : AbsPlayerControlsFragment(), showBonceAnimation(playPauseButton) } title.isSelected = true - PreferenceUtil.getInstance(requireContext()).registerOnSharedPreferenceChangedListener(this) + } override fun setDark(color: Int) { @@ -253,17 +250,4 @@ class PlayerPlaybackControlsFragment : AbsPlayerControlsFragment(), } } } - - override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) { - - if (key == PreferenceUtil.EXTRA_SONG_INFO) { - if (activity != null) updateSong() - } - } - - override fun onDestroyView() { - super.onDestroyView() - PreferenceUtil.getInstance(requireContext()) - .unregisterOnSharedPreferenceChangedListener(this) - } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerControlFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerControlFragment.kt index 56efcfb8..bd0a9709 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerControlFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerControlFragment.kt @@ -20,14 +20,11 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.util.ATHUtil -import code.name.monkey.appthemehelper.util.ColorUtil import code.name.monkey.appthemehelper.util.MaterialValueHelper import code.name.monkey.appthemehelper.util.TintHelper import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.extensions.ripAlpha -import code.name.monkey.retromusic.extensions.setRange -import code.name.monkey.retromusic.extensions.textColorSecondary import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper @@ -36,6 +33,7 @@ import code.name.monkey.retromusic.service.MusicService import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.ViewUtil +import code.name.monkey.retromusic.util.color.MediaNotificationProcessor import kotlinx.android.synthetic.main.fragment_peak_control_player.* /** @@ -85,9 +83,20 @@ class PeakPlayerControlFragment : AbsPlayerControlsFragment() { override fun hide() { } - override fun setDark(color: Int) { - val colorBg = ATHUtil.resolveColor(requireContext(), android.R.attr.colorBackground) - if (ColorUtil.isColorLight(colorBg)) { + fun setDark(color: MediaNotificationProcessor) { + val controlsColor = + if (PreferenceUtil.getInstance(requireContext()).adaptiveColor) { + color.secondaryTextColor + } else { + ThemeStore.accentColor(requireContext()) + } + ViewUtil.setProgressDrawable(progressSlider, controlsColor, true) + volumeFragment?.setTintableColor(controlsColor) + playPauseButton.setColorFilter(controlsColor, PorterDuff.Mode.SRC_IN) + nextButton.setColorFilter(controlsColor, PorterDuff.Mode.SRC_IN) + previousButton.setColorFilter(controlsColor, PorterDuff.Mode.SRC_IN) + + if (!ATHUtil.isWindowBackgroundDark(requireContext())) { lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(requireContext(), true) lastDisabledPlaybackControlsColor = @@ -98,20 +107,11 @@ class PeakPlayerControlFragment : AbsPlayerControlsFragment() { lastDisabledPlaybackControlsColor = MaterialValueHelper.getPrimaryDisabledTextColor(requireContext(), false) } - - val colorFinal = if (PreferenceUtil.getInstance(requireContext()).adaptiveColor) { - lastPlaybackControlsColor = color - color - } else { - textColorSecondary(requireContext()) - }.ripAlpha() - - ViewUtil.setProgressDrawable(progressSlider, colorFinal, true) - volumeFragment?.setTintableColor(colorFinal) - playPauseButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN) updateRepeatState() updateShuffleState() - updatePrevNextColor() + } + + override fun setDark(color: Int) { } private fun updatePlayPauseDrawableState() { @@ -228,4 +228,6 @@ class PeakPlayerControlFragment : AbsPlayerControlsFragment() { override fun onShuffleModeChanged() { updateShuffleState() } + + } \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerFragment.kt index ea5748e4..74e233cc 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerFragment.kt @@ -101,7 +101,6 @@ class PeakPlayerFragment : AbsPlayerFragment() { get() = lastColor override fun onColorChanged(color: MediaNotificationProcessor) { - controlsFragment.setDark(color.primaryTextColor) lastColor = color.primaryTextColor callbacks?.onPaletteColorChanged() } @@ -127,7 +126,7 @@ class PeakPlayerFragment : AbsPlayerFragment() { .build() .into(object : RetroMusicColoredTarget(playerImage) { override fun onColorReady(colors: MediaNotificationProcessor) { - controlsFragment.setDark(colors.primaryTextColor) + controlsFragment.setDark(colors) } }) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt index 070f0429..0457f6b6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt @@ -25,7 +25,6 @@ class TinyPlaybackControlsFragment : AbsPlayerControlsFragment() { } override fun setDark(color: Int) { - if (ColorUtil.isColorLight(color)) { lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(requireContext(), true)