fix: color didn't refresh immediately when users change it

Co-authored-by: nopdan <xci@live.com>
osfans · Feb 2, 2024 · ff944c3 · ff944c3
1 parent 7f63473
commit ff944c3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/app/src/main/java/com/osfans/trime/data/theme/Theme.kt b/app/src/main/java/com/osfans/trime/data/theme/Theme.kt
@@ -102,7 +102,7 @@ class Theme(private var isDarkMode: Boolean) {
                 liquidKeyboard = fullThemeConfigMap!!["liquid_keyboard"] as Map<String, Any?>?
             }.also { Timber.d("Setting up all theme config map takes $it ms") }
             measureTimeMillis {
-                refreshColorCaches(isDarkMode)
+                systemChangeColor(isDarkMode)
             }.also { Timber.d("Initializing cache takes $it ms") }
             Timber.i("The theme is initialized")
         }.getOrElse {
@@ -330,15 +330,21 @@ class Theme(private var isDarkMode: Boolean) {
     }
 
     // 当切换暗黑模式时，刷新键盘配色方案
-    fun refreshColorCaches(isDarkMode: Boolean) {
+    fun systemChangeColor(isDarkMode: Boolean) {
         this.isDarkMode = isDarkMode
         currentColorSchemeId = getColorSchemeName()
         Timber.d(
-            "Caching color values (currentColorSchemeId=$currentColorSchemeId, isDarkMode=$isDarkMode) ...",
+            "System changing color, current ColorScheme: $currentColorSchemeId, isDarkMode=$isDarkMode",
         )
         refreshColorValues()
     }
 
+    fun fireChangeColor() {
+        currentColorSchemeId = getColorSchemeName()
+        Timber.d("Fire changing color, current color scheme: $currentColorSchemeId")
+        refreshColorValues()
+    }
+
     private fun refreshColorValues() {
         currentColors.clear()
         val colorMap = presetColorSchemes!![currentColorSchemeId]

diff --git a/app/src/main/java/com/osfans/trime/data/theme/ThemeManager.kt b/app/src/main/java/com/osfans/trime/data/theme/ThemeManager.kt
@@ -89,7 +89,7 @@ object ThemeManager {
     fun onSystemNightModeChange(isNight: Boolean) {
         isNightMode = isNight
         if (::_activeTheme.isInitialized) {
-            activeTheme.refreshColorCaches(isNightMode)
+            activeTheme.systemChangeColor(isNightMode)
         } else {
             activeTheme = evalActiveTheme()
         }

diff --git a/app/src/main/java/com/osfans/trime/ime/core/Trime.kt b/app/src/main/java/com/osfans/trime/ime/core/Trime.kt
@@ -372,6 +372,7 @@ open class Trime : LifecycleInputMethodService() {
         inputView!!.switchUiByState(KeyboardWindow.State.Main)
         loadConfig()
         val theme = ThemeManager.activeTheme
+        theme.fireChangeColor()
         SoundThemeManager.switchSound(theme.colors.getString("sound"))
         resetCandidate()
         KeyboardSwitcher.newOrReset()