Merge pull request #690 from ologe/feature/theme-fixes

Theme fixes

app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt

@@ -8,6 +8,7 @@ import android.view.KeyEvent
 import android.view.View
 import android.view.WindowManager
 import androidx.annotation.ColorInt
+import androidx.appcompat.app.AppCompatDelegate.setDefaultNightMode
 import androidx.core.content.ContextCompat
 import code.name.monkey.appthemehelper.ATH
 import code.name.monkey.appthemehelper.ThemeStore
@@ -19,14 +20,14 @@ import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.RetroUtil
-import code.name.monkey.retromusic.util.ThemeManager
+import code.name.monkey.retromusic.util.theme.ThemeManager
 
 abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
 
     private val handler = Handler()
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        setTheme(ThemeManager.getThemeResValue(this))
+        updateTheme()
         hideStatusBar()
         super.onCreate(savedInstanceState)
         setImmersiveFullscreen()
@@ -34,6 +35,11 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
         toggleScreenOn()
     }
 
+    private fun updateTheme() {
+        setTheme(ThemeManager.getThemeResValue(this))
+        setDefaultNightMode(ThemeManager.getNightMode(this))
+    }
+
     private fun toggleScreenOn() {
         if (PreferenceUtil.getInstance(this).isScreenOnEnabled) {
             window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)

app/src/main/java/code/name/monkey/retromusic/glide/AlbumGlideRequest.java

@@ -127,7 +127,7 @@ public class AlbumGlideRequest {
                     .asBitmap()
                     .transcode(new BitmapPaletteTranscoder(context), BitmapPaletteWrapper.class)
                     .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
-                    .error(DEFAULT_ERROR_IMAGE)
+                    .placeholder(DEFAULT_ERROR_IMAGE)
                     .animate(DEFAULT_ANIMATION)
                     .signature(createSignature(builder.song));
         }

app/src/main/java/code/name/monkey/retromusic/glide/ArtistGlideRequest.java

@@ -88,7 +88,7 @@ public class ArtistGlideRequest {
             //noinspection unchecked
             return createBaseRequest(requestManager, artist, noCustomImage, forceDownload)
                     .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
-                    .error(DEFAULT_ERROR_IMAGE)
+                    .placeholder(DEFAULT_ERROR_IMAGE)
                     .animate(DEFAULT_ANIMATION)
                     .priority(Priority.LOW)
                     .override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
@@ -124,7 +124,6 @@ public class ArtistGlideRequest {
                     builder.forceDownload)
                     .asBitmap()
                     .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
-                    .error(DEFAULT_ERROR_IMAGE)
                     .animate(DEFAULT_ANIMATION)
                     .priority(Priority.LOW)
                     .override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
@@ -151,7 +150,6 @@ public class ArtistGlideRequest {
                     .transcode(new BitmapPaletteTranscoder(context), BitmapPaletteWrapper.class)
                     .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
                     .placeholder(DEFAULT_ERROR_IMAGE)
-                    .error(DEFAULT_ERROR_IMAGE)
                     .animate(DEFAULT_ANIMATION)
                     .priority(Priority.LOW)
                     .override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)

app/src/main/java/code/name/monkey/retromusic/glide/SongGlideRequest.java

@@ -102,7 +102,7 @@ public class SongGlideRequest {
             //noinspection unchecked
             return createBaseRequest(requestManager, song, ignoreMediaStore)
                     .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
-                    .error(DEFAULT_ERROR_IMAGE)
+                    .placeholder(DEFAULT_ERROR_IMAGE)
                     .animate(DEFAULT_ANIMATION)
                     .signature(createSignature(song));
         }
@@ -120,7 +120,7 @@ public class SongGlideRequest {
             return createBaseRequest(builder.requestManager, builder.song, builder.ignoreMediaStore)
                     .asBitmap()
                     .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
-                    .error(DEFAULT_ERROR_IMAGE)
+                    .placeholder(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)
-                    .error(DEFAULT_ERROR_IMAGE)
+                    .placeholder(DEFAULT_ERROR_IMAGE)
                     .animate(DEFAULT_ANIMATION)
                     .signature(createSignature(builder.song));
         }

app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java

@@ -57,6 +57,7 @@ import code.name.monkey.retromusic.transform.HorizontalFlipTransformation;
 import code.name.monkey.retromusic.transform.NormalPageTransformer;
 import code.name.monkey.retromusic.transform.VerticalFlipTransformation;
 import code.name.monkey.retromusic.transform.VerticalStackTransformer;
+import code.name.monkey.retromusic.util.theme.ThemeMode;
 
 public final class PreferenceUtil {
 
@@ -527,11 +528,20 @@ public final class PreferenceUtil {
     }
 
     @NonNull
-    public String getGeneralThemeValue() {
+    public ThemeMode getGeneralThemeValue() {
         if (isBlackMode()) {
-            return "black";
+            return ThemeMode.BLACK;
         } else {
-            return mPreferences.getString(GENERAL_THEME, "dark");
+            String themeMode = mPreferences.getString(GENERAL_THEME, "dark");
+            switch (themeMode) {
+                case "light":
+                    return ThemeMode.LIGHT;
+                case "dark":
+                    return ThemeMode.DARK;
+                case "auto":
+                default:
+                    return ThemeMode.AUTO;
+            }
         }
     }
 

app/src/main/java/code/name/monkey/retromusic/util/ThemeManager.kt

@@ -1,35 +0,0 @@
-package code.name.monkey.retromusic.util
-
-import android.content.Context
-import android.content.res.Configuration.UI_MODE_NIGHT_MASK
-import android.content.res.Configuration.UI_MODE_NIGHT_YES
-import android.os.PowerManager
-import androidx.annotation.StyleRes
-import code.name.monkey.retromusic.R
-
-/**
- * @author Paolo Valerdi
- */
-object ThemeManager {
-
-    @StyleRes
-    fun getThemeResValue(context: Context): Int =
-        when (PreferenceUtil.getInstance(context).generalThemeValue) {
-            "light" -> R.style.Theme_RetroMusic_Light
-            "dark" -> R.style.Theme_RetroMusic_Base
-            "auto" -> R.style.Theme_RetroMusic_FollowSystem
-            "black" -> R.style.Theme_RetroMusic_Black
-            else -> R.style.Theme_RetroMusic_FollowSystem
-        }
-
-    private fun isSystemDarkModeEnabled(context: Context): Boolean {
-        val isBatterySaverEnabled =
-            (context.getSystemService(Context.POWER_SERVICE) as PowerManager?)?.isPowerSaveMode
-                ?: false
-        val isDarkModeEnabled =
-            (context.resources.configuration.uiMode and UI_MODE_NIGHT_MASK) == UI_MODE_NIGHT_YES
-
-        return isBatterySaverEnabled or isDarkModeEnabled
-    }
-
-}

app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeManager.kt

@@ -0,0 +1,50 @@
+package code.name.monkey.retromusic.util.theme
+
+import android.content.Context
+import android.content.res.Configuration.UI_MODE_NIGHT_MASK
+import android.content.res.Configuration.UI_MODE_NIGHT_YES
+import android.os.PowerManager
+import androidx.annotation.StyleRes
+import androidx.appcompat.app.AppCompatDelegate
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.theme.ThemeMode.*
+
+/**
+ * @author Paolo Valerdi
+ */
+object ThemeManager {
+
+    @StyleRes
+    fun getThemeResValue(
+        context: Context
+    ): Int = when (context.generalThemeValue) {
+        LIGHT -> R.style.Theme_RetroMusic_Light
+        DARK -> R.style.Theme_RetroMusic_Base
+        BLACK -> R.style.Theme_RetroMusic_Black
+        AUTO -> R.style.Theme_RetroMusic_FollowSystem
+    }
+
+    fun getNightMode(
+        context: Context
+    ): Int = when (context.generalThemeValue) {
+        LIGHT -> AppCompatDelegate.MODE_NIGHT_NO
+        DARK,
+        BLACK -> AppCompatDelegate.MODE_NIGHT_YES
+        AUTO -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+    }
+
+    private fun isSystemDarkModeEnabled(context: Context): Boolean {
+        val isBatterySaverEnabled =
+            (context.getSystemService(Context.POWER_SERVICE) as PowerManager?)?.isPowerSaveMode
+                ?: false
+        val isDarkModeEnabled =
+            (context.resources.configuration.uiMode and UI_MODE_NIGHT_MASK) == UI_MODE_NIGHT_YES
+
+        return isBatterySaverEnabled or isDarkModeEnabled
+    }
+
+}
+
+val Context.generalThemeValue: ThemeMode
+    get() = PreferenceUtil.getInstance(this).generalThemeValue

app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeMode.kt

@@ -0,0 +1,8 @@
+package code.name.monkey.retromusic.util.theme
+
+enum class ThemeMode {
+    LIGHT,
+    DARK,
+    BLACK,
+    AUTO
+}

app/src/main/res/values-night/colors.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="window_color">@android:color/black</color>
+
+</resources>

app/src/main/res/values-v21/styles.xml

@@ -16,12 +16,14 @@
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowSharedElementsUseOverlay">false</item>
         <item name="android:textViewStyle">@style/TextViewStyleIm</item>
+        <item name="android:windowBackground">@color/window_color_dark</item>
     </style>
 
     <style name="Theme.RetroMusic.FollowSystem" parent="Theme.RetroMusic.Base.Adaptive">
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowSharedElementsUseOverlay">false</item>
         <item name="android:textViewStyle">@style/TextViewStyleIm</item>
+        <item name="android:windowBackground">@color/window_color</item>
     </style>
 
     <style name="Theme.RetroMusic.Notification" parent="@android:style/TextAppearance.Material.Notification" />

app/src/main/res/values-v27/styles_parents.xml

@@ -56,7 +56,7 @@
         <item name="android:windowLightNavigationBar">false</item>
         <!--Manual setting colors-->
         <item name="colorSurface">@color/darkColorSurface</item>
-
+        <item name="android:windowBackground">@color/window_color_dark</item>
     </style>
 
     <style name="Theme.RetroMusic.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">

app/src/main/res/values/colors.xml

@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
+    <color name="window_color">@color/md_white_1000</color>
+    <color name="window_color_light">@color/md_white_1000</color>
+    <color name="window_color_dark">@android:color/black</color>
+
     <color name="twenty_percent_black_overlay">#34000000</color>
     <color name="eighty_percent_black_overlay">#80000000</color>
     <color name="app_shortcut_default_foreground">#607d8b</color>

app/src/main/res/values/styles.xml

@@ -2,11 +2,17 @@
 
     <style name="Theme.RetroMusic" parent="Theme.RetroMusic.Base" />
 
-    <style name="Theme.RetroMusic.Light" parent="Theme.RetroMusic.Base.Light" />
+    <style name="Theme.RetroMusic.Light" parent="Theme.RetroMusic.Base.Light" >
+        <item name="android:windowBackground">@color/window_color_light</item>
+    </style>
 
-    <style name="Theme.RetroMusic.Black" parent="Theme.RetroMusic.Base.Black" />
+    <style name="Theme.RetroMusic.Black" parent="Theme.RetroMusic.Base.Black" >
+        <item name="android:windowBackground">@color/window_color_dark</item>
+    </style>
 
-    <style name="Theme.RetroMusic.FollowSystem" parent="Theme.RetroMusic.Base.Adaptive" />
+    <style name="Theme.RetroMusic.FollowSystem" parent="Theme.RetroMusic.Base.Adaptive" >
+        <item name="android:windowBackground">@color/window_color</item>
+    </style>
 
     <style name="Theme.RetroMusic.Notification" parent="@android:style/TextAppearance.StatusBar.EventContent" />
 

app/src/main/res/values/styles_parents.xml

@@ -41,6 +41,7 @@
 
         <!--Manual setting colors-->
         <item name="colorSurface">@color/darkColorSurface</item>
+        <item name="android:windowBackground">@color/window_color_dark</item>
 
     </style>