From e61294d281499f13512ee65a27d077f6321c66b9 Mon Sep 17 00:00:00 2001 From: Hemanth S Date: Tue, 12 May 2020 01:09:44 +0530 Subject: [PATCH] Fix album cover shrink --- .../monkey/retromusic/activities/MainActivity.java | 2 +- .../activities/base/AbsSlidingMusicPanelActivity.kt | 2 +- .../name/monkey/retromusic/glide/SongGlideRequest.java | 4 ++-- .../name/monkey/retromusic/service/MusicService.java | 1 - .../service/notification/PlayingNotificationImpl.kt | 10 +++------- .../name/monkey/retromusic/util/PreferenceUtil.java | 5 ----- app/src/main/res/layout/item_artist.xml | 6 +++--- 7 files changed, 10 insertions(+), 20 deletions(-) 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 a28a9a52..2b4b634a 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 @@ -373,7 +373,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity public void onSharedPreferenceChanged(final @NonNull SharedPreferences sharedPreferences, final @NonNull String key) { if (key.equals(PreferenceUtil.GENERAL_THEME) || key.equals(PreferenceUtil.BLACK_THEME) || - key.equals(PreferenceUtil.ADAPTIVE_COLOR_APP) || key.equals(PreferenceUtil.DOMINANT_COLOR) || + key.equals(PreferenceUtil.ADAPTIVE_COLOR_APP) || key.equals(PreferenceUtil.USER_NAME) || key.equals(PreferenceUtil.TOGGLE_FULL_SCREEN) || key.equals(PreferenceUtil.TOGGLE_VOLUME) || key.equals(PreferenceUtil.ROUND_CORNERS) || key.equals(PreferenceUtil.CAROUSEL_EFFECT) || key.equals(PreferenceUtil.NOW_PLAYING_SCREEN_ID) || diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt index 63afa385..01c85d61 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt @@ -222,7 +222,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), behavior.isHideable = true behavior.peekHeight = 0 bottomNavigationView.elevation = DensityUtil.dip2px(this, 10f).toFloat() - playerFragmentContainer.removeAllViews() + collapsePanel() } else { if (MusicPlayerRemote.playingQueue.isNotEmpty()) { slidingPanel.elevation = DensityUtil.dip2px(this, 10f).toFloat() diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/SongGlideRequest.java b/app/src/main/java/code/name/monkey/retromusic/glide/SongGlideRequest.java index 7e703dcc..fc718ebd 100644 --- a/app/src/main/java/code/name/monkey/retromusic/glide/SongGlideRequest.java +++ b/app/src/main/java/code/name/monkey/retromusic/glide/SongGlideRequest.java @@ -120,7 +120,7 @@ public class SongGlideRequest { return createBaseRequest(builder.requestManager, builder.song, builder.ignoreMediaStore) .asBitmap() .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) - .placeholder(DEFAULT_ERROR_IMAGE) + .error(DEFAULT_ERROR_IMAGE) .animate(DEFAULT_ANIMATION) .signature(createSignature(builder.song)); } @@ -141,7 +141,7 @@ public class SongGlideRequest { .asBitmap() .transcode(new BitmapPaletteTranscoder(context), BitmapPaletteWrapper.class) .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) - .placeholder(DEFAULT_ERROR_IMAGE) + .error(DEFAULT_ERROR_IMAGE) .animate(DEFAULT_ANIMATION) .signature(createSignature(builder.song)); } diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java index d5872c8a..c5a4a93e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java +++ b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java @@ -737,7 +737,6 @@ public class MusicService extends Service implements updateMediaSessionMetaData(); break; case PreferenceUtil.COLORED_NOTIFICATION: - case PreferenceUtil.DOMINANT_COLOR: updateNotification(); break; case PreferenceUtil.CLASSIC_NOTIFICATION: diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt index 3ad46be2..5b767da7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt +++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt @@ -41,6 +41,7 @@ import com.bumptech.glide.request.target.Target class PlayingNotificationImpl : PlayingNotification() { private var target: Target? = null + @Synchronized override fun update() { stopped = false @@ -83,13 +84,8 @@ class PlayingNotificationImpl : PlayingNotification() { glideAnimation: GlideAnimation ) { update( - resource.bitmap, when { - PreferenceUtil.getInstance(service).isDominantColor -> RetroColorUtil.getDominantColor( - resource.bitmap, - Color.TRANSPARENT - ) - else -> RetroColorUtil.getColor(resource.palette, Color.TRANSPARENT) - } + resource.bitmap, + RetroColorUtil.getColor(resource.palette, Color.TRANSPARENT) ) } diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java index 4f0a04a1..c79624c1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java +++ b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java @@ -95,8 +95,6 @@ public final class PreferenceUtil { public static final String TOGGLE_HEADSET = "toggle_headset"; - public static final String DOMINANT_COLOR = "dominant_color"; - public static final String GENERAL_THEME = "general_theme"; public static final String CIRCULAR_ALBUM_ART = "circular_album_art"; @@ -772,9 +770,6 @@ public final class PreferenceUtil { return mPreferences.getBoolean(NOW_PLAYING_SCREEN, false); } - public boolean isDominantColor() { - return mPreferences.getBoolean(DOMINANT_COLOR, false); - } public boolean isExtraControls() { return mPreferences.getBoolean(TOGGLE_ADD_CONTROLS, false); diff --git a/app/src/main/res/layout/item_artist.xml b/app/src/main/res/layout/item_artist.xml index 051d9e07..2c9d3e83 100644 --- a/app/src/main/res/layout/item_artist.xml +++ b/app/src/main/res/layout/item_artist.xml @@ -2,7 +2,7 @@