修复深色模式没有跟随系统切换

Author: rRemix

app/src/main/java/remix/myplayer/data/prefs/ThemePrefs.kt

@@ -2,7 +2,6 @@ package remix.myplayer.data.prefs
 
 import android.content.Context
 import android.content.res.Configuration
-import android.content.res.Resources
 import androidx.core.graphics.toColorInt
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
@@ -32,8 +31,12 @@ class ThemePrefs @Inject constructor(
 
   var coloredNaviBar by PrefsDelegate(sp, PrefKeys.Theme.COLOR_NAVIGATION, false)
 
-  fun resolveTheme(darkTheme: String, blackTheme: Boolean): String {
-    return if (darkTheme == ALWAYS_ON || (darkTheme == FOLLOW_SYSTEM && (Resources.getSystem().configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES)) {
+  fun resolveTheme(
+    darkTheme: String,
+    blackTheme: Boolean,
+    uiMode: Int = context.resources.configuration.uiMode
+  ): String {
+    return if (darkTheme == ALWAYS_ON || (darkTheme == FOLLOW_SYSTEM && (uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES)) {
       if (blackTheme) {
         BLACK
       } else {

app/src/main/java/remix/myplayer/ui/activity/ComposeActivity.kt

@@ -100,7 +100,7 @@ class ComposeActivity : BaseMusicActivity() {
 
   override fun onConfigurationChanged(newConfig: Configuration) {
     super.onConfigurationChanged(newConfig)
-    themeController.onSystemThemeChanged()
+    themeController.onSystemThemeChanged(newConfig.uiMode)
   }
 
   private fun handleIntent() {

app/src/main/java/remix/myplayer/ui/theme/ThemeController.kt

@@ -21,7 +21,7 @@ interface ThemeController {
 
   var black: Boolean
 
-  fun onSystemThemeChanged()
+  fun onSystemThemeChanged(uiMode: Int)
 
   fun setColoredNaviBar(colored: Boolean)
 
@@ -70,11 +70,11 @@ class ThemeControllerImpl @Inject constructor(private val storage: ThemePrefs) :
       )
     }
 
-  override fun onSystemThemeChanged() {
+  override fun onSystemThemeChanged(uiMode: Int) {
     if (storage.darkTheme != FOLLOW_SYSTEM) {
       return
     }
-    val resolved = storage.resolveTheme(storage.darkTheme, storage.blackTheme)
+    val resolved = storage.resolveTheme(storage.darkTheme, storage.blackTheme, uiMode)
     if (_currentTheme.value.theme == resolved) {
       return
     }
@@ -96,4 +96,4 @@ class ThemeControllerImpl @Inject constructor(private val storage: ThemePrefs) :
     _currentTheme.value = _currentTheme.value.copy(secondary = color)
   }
 
-}
+}