From 4b857f608861e4a054e8188a3185fb48190172bf Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Thu, 9 Dec 2021 21:56:16 +0530
Subject: [PATCH] [Now Playing] Default Album cover theme for Now playing
 themes

---
 .../retromusic/fragments/NowPlayingScreen.kt  | 38 ++++++++++---------
 .../monkey/retromusic/util/PreferenceUtil.kt  |  2 +
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt
index 12b514c3d..5cf112c03 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt
@@ -22,24 +22,26 @@ enum class NowPlayingScreen constructor(
     @param:StringRes @field:StringRes
     val titleRes: Int,
     @param:DrawableRes @field:DrawableRes val drawableResId: Int,
-    val id: Int
+    val id: Int,
+    val defaultCoverTheme: AlbumCoverStyle?
 ) {
+    // Some Now playing themes look better with particular Album cover theme
 
-    Adaptive(R.string.adaptive, R.drawable.np_adaptive, 10),
-    Blur(R.string.blur, R.drawable.np_blur, 4),
-    BlurCard(R.string.blur_card, R.drawable.np_blur_card, 9),
-    Card(R.string.card, R.drawable.np_card, 6),
-    Circle(R.string.circle, R.drawable.np_minimalistic_circle, 15),
-    Classic(R.string.classic, R.drawable.np_classic, 16),
-    Color(R.string.color, R.drawable.np_color, 5),
-    Fit(R.string.fit, R.drawable.np_fit, 12),
-    Flat(R.string.flat, R.drawable.np_flat, 1),
-    Full(R.string.full, R.drawable.np_full, 2),
-    Gradient(R.string.gradient, R.drawable.np_gradient, 17),
-    Material(R.string.material, R.drawable.np_material, 11),
-    Normal(R.string.normal, R.drawable.np_normal, 0),
-    Peak(R.string.peak, R.drawable.np_peak, 14),
-    Plain(R.string.plain, R.drawable.np_plain, 3),
-    Simple(R.string.simple, R.drawable.np_simple, 8),
-    Tiny(R.string.tiny, R.drawable.np_tiny, 7),
+    Adaptive(R.string.adaptive, R.drawable.np_adaptive, 10, AlbumCoverStyle.FullCard),
+    Blur(R.string.blur, R.drawable.np_blur, 4, AlbumCoverStyle.Normal),
+    BlurCard(R.string.blur_card, R.drawable.np_blur_card, 9, AlbumCoverStyle.Card),
+    Card(R.string.card, R.drawable.np_card, 6, AlbumCoverStyle.Full),
+    Circle(R.string.circle, R.drawable.np_minimalistic_circle, 15, null),
+    Classic(R.string.classic, R.drawable.np_classic, 16, AlbumCoverStyle.Full),
+    Color(R.string.color, R.drawable.np_color, 5, AlbumCoverStyle.Normal),
+    Fit(R.string.fit, R.drawable.np_fit, 12, AlbumCoverStyle.Full),
+    Flat(R.string.flat, R.drawable.np_flat, 1, AlbumCoverStyle.Flat),
+    Full(R.string.full, R.drawable.np_full, 2, AlbumCoverStyle.Full),
+    Gradient(R.string.gradient, R.drawable.np_gradient, 17, AlbumCoverStyle.Full),
+    Material(R.string.material, R.drawable.np_material, 11, AlbumCoverStyle.Normal),
+    Normal(R.string.normal, R.drawable.np_normal, 0, AlbumCoverStyle.Normal),
+    Peak(R.string.peak, R.drawable.np_peak, 14, AlbumCoverStyle.Normal),
+    Plain(R.string.plain, R.drawable.np_plain, 3, AlbumCoverStyle.Normal),
+    Simple(R.string.simple, R.drawable.np_simple, 8, AlbumCoverStyle.Normal),
+    Tiny(R.string.tiny, R.drawable.np_tiny, 7, null),
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt
index 00268bc6e..cdcc2216d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt
@@ -561,6 +561,8 @@ object PreferenceUtil {
         }
         set(value) = sharedPreferences.edit {
             putInt(NOW_PLAYING_SCREEN_ID, value.id)
+            // Also set a cover theme for that now playing
+            value.defaultCoverTheme?.let { coverTheme -> albumCoverStyle = coverTheme }
         }
 
     val albumCoverTransform: ViewPager.PageTransformer