fix: color would be repeatedly updated on some custom ROMs

Co-authored-by: nopdan <[email protected]>

Author: WhiredPlanck

app/src/main/java/com/osfans/trime/data/theme/Theme.kt

@@ -108,7 +108,7 @@ class Theme(private var isDarkMode: Boolean) {
         }.getOrElse {
             Timber.e("Failed to parse the theme: ${it.message}")
             if (appPrefs.themeAndColor.selectedTheme != DEFAULT_THEME_NAME) {
-                ThemeManager.switchTheme(DEFAULT_THEME_NAME)
+                appPrefs.themeAndColor.selectedTheme = DEFAULT_THEME_NAME
                 init()
             }
         }

app/src/main/java/com/osfans/trime/data/theme/ThemeManager.kt

@@ -4,10 +4,15 @@ import android.content.res.Configuration
 import androidx.annotation.Keep
 import com.osfans.trime.data.AppPrefs
 import com.osfans.trime.data.DataManager
+import com.osfans.trime.util.WeakHashSet
 import com.osfans.trime.util.isNightMode
 import java.io.File
 
 object ThemeManager {
+    fun interface OnThemeChangeListener {
+        fun onThemeChange(theme: Theme)
+    }
+
     /**
      * Update sharedThemes and userThemes.
      */
@@ -28,11 +33,6 @@ object ThemeManager {
             ?.toMutableList() ?: mutableListOf()
     }
 
-    @JvmStatic
-    fun switchTheme(theme: String) {
-        AppPrefs.defaultInstance().themeAndColor.selectedTheme = theme
-    }
-
     val sharedThemes: MutableList<String> = listThemes(DataManager.sharedDataDir)
 
     val userThemes: MutableList<String> = listThemes(DataManager.userDataDir)
@@ -60,15 +60,32 @@ object ThemeManager {
         private set(value) {
             if (_activeTheme == value) return
             _activeTheme = value
+            fireChange()
         }
 
     private var isNightMode = false
 
+    private val onChangeListeners = WeakHashSet<OnThemeChangeListener>()
+
+    @JvmStatic
+    fun addOnChangedListener(listener: OnThemeChangeListener) {
+        onChangeListeners.add(listener)
+    }
+
+    @JvmStatic
+    fun removeOnChangedListener(listener: OnThemeChangeListener) {
+        onChangeListeners.remove(listener)
+    }
+
+    private fun fireChange() {
+        onChangeListeners.forEach { it.onThemeChange(_activeTheme) }
+    }
+
     val prefs = AppPrefs.defaultInstance().themeAndColor
 
     fun setNormalTheme(name: String) {
         AppPrefs.defaultInstance().themeAndColor.selectedTheme = name
-        _activeTheme = evalActiveTheme()
+        activeTheme = evalActiveTheme()
     }
 
     private fun evalActiveTheme(): Theme {
@@ -87,11 +104,9 @@ object ThemeManager {
 
     @JvmStatic
     fun onSystemNightModeChange(isNight: Boolean) {
+        if (isNightMode == isNight) return
         isNightMode = isNight
-        if (::_activeTheme.isInitialized) {
-            activeTheme.systemChangeColor(isNightMode)
-        } else {
-            activeTheme = evalActiveTheme()
-        }
+        _activeTheme.systemChangeColor(isNightMode)
+        fireChange()
     }
 }

app/src/main/java/com/osfans/trime/ime/core/Trime.kt

@@ -40,6 +40,7 @@ import android.view.inputmethod.CursorAnchorInfo
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.ExtractedTextRequest
 import android.widget.FrameLayout
+import androidx.annotation.Keep
 import androidx.core.view.updateLayoutParams
 import com.osfans.trime.BuildConfig
 import com.osfans.trime.R
@@ -107,6 +108,12 @@ open class Trime : LifecycleInputMethodService() {
     private var mCompositionPopupWindow: CompositionPopupWindow? = null
     private var candidateExPage = false
 
+    @Keep
+    private val onThemeChangeListener =
+        ThemeManager.OnThemeChangeListener {
+            initKeyboard()
+        }
+
     fun hasCandidateExPage(): Boolean {
         return candidateExPage
     }
@@ -227,6 +234,7 @@ open class Trime : LifecycleInputMethodService() {
             //  and lead to a crash loop
             Timber.d("onCreate")
             val context: InputMethodService = this
+            ThemeManager.addOnChangedListener(onThemeChangeListener)
             RimeWrapper.startup {
                 Timber.d("Running Trime.onCreate")
                 ThemeManager.init(resources.configuration)
@@ -405,6 +413,7 @@ open class Trime : LifecycleInputMethodService() {
         if (mCompositionPopupWindow != null) {
             mCompositionPopupWindow!!.destroy()
         }
+        ThemeManager.removeOnChangedListener(onThemeChangeListener)
         super.onDestroy()
         self = null
     }