fix: custom key colors were transparent sometimes

Author: WhiredPlanck

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

@@ -35,14 +35,6 @@ object ColorManager {
 
     private var isNightMode = false
 
-    val presetColorSchemes: List<ColorScheme>
-        get() = theme.colorSchemes
-
-    private val customFallbackRules: Map<String, String>
-        get() = theme.fallbackColors
-
-    private val fullFallbackRules get() = customFallbackRules + defaultFallbackColors
-
     private lateinit var _activeColorScheme: ColorScheme
 
     var activeColorScheme: ColorScheme
@@ -65,7 +57,7 @@ object ColorManager {
 
     private var darkModeColorScheme: ColorScheme? = null
 
-    private val defaultFallbackColors =
+    private val BuiltinFallbackColors =
         mapOf(
             "candidate_text_color" to "text_color",
             "comment_text_color" to "candidate_text_color",
@@ -128,7 +120,7 @@ object ColorManager {
         onChangeListeners.forEach { it.onColorChange(theme) }
     }
 
-    private fun colorScheme(id: String) = presetColorSchemes.find { it.id == id }
+    private fun colorScheme(id: String) = theme.colorSchemes.find { it.id == id }
 
     fun init(configuration: Configuration) {
         isNightMode = configuration.isNightMode()
@@ -169,7 +161,7 @@ object ColorManager {
     }
 
     @ColorInt
-    fun resolveColor(
+    private fun resolveColor(
         key: String,
         putCache: Boolean = true,
     ): Int {
@@ -187,7 +179,7 @@ object ColorManager {
         return color
     }
 
-    fun resolveDrawable(
+    private fun resolveDrawable(
         key: String,
         putCache: Boolean = true,
     ): Drawable? {
@@ -210,20 +202,23 @@ object ColorManager {
         parser: (String) -> T,
     ): T {
         var currentKey = key
-        val visitedKeys = mutableSetOf<String>()
 
         while (true) {
-            when {
-                activeColorScheme.colors.containsKey(currentKey) -> {
-                    return parser(activeColorScheme.colors[currentKey]!!)
-                }
-                fullFallbackRules.containsKey(currentKey) -> {
-                    currentKey =
-                        fullFallbackRules[currentKey]!!.also {
-                            check(visitedKeys.add(it)) { "Circular fallback: $key" }
-                        }
-                }
-                else -> throw IllegalArgumentException("Color not found: $key")
+            val target = activeColorScheme.colors[currentKey]
+            if (!target.isNullOrEmpty()) {
+                Timber.d("current: $currentKey, origin: $key, target: $target")
+                return parser(target)
+            }
+            val fallback = theme.fallbackColors[currentKey]
+            if (!fallback.isNullOrEmpty()) {
+                currentKey = fallback
+                continue
+            }
+            val altFallback = BuiltinFallbackColors[currentKey]
+            if (!altFallback.isNullOrEmpty()) {
+                currentKey = altFallback
+            } else {
+                throw IllegalArgumentException("$key not found")
             }
         }
     }
@@ -276,16 +271,15 @@ object ColorManager {
     @ColorInt
     fun getColor(key: String): Int = colorCache[key] ?: resolveColor(key)
 
-    fun getDrawable(key: String): Drawable? = drawableCache[key] ?: resolveDrawable(key)
-
     fun getDrawable(
         colorKey: String,
         borderColorKey: String? = null,
         borderPx: Int = 0,
         cornerRadius: Float = 0f,
         alpha: Int = 255,
-    ): Drawable? =
-        when (val drawable = getDrawable(colorKey)) {
+    ): Drawable? {
+        val drawable = drawableCache[colorKey] ?: resolveDrawable(colorKey)
+        return when (drawable) {
             is BitmapDrawable -> drawable.also { it.alpha = MathUtils.clamp(alpha, 0, 255) }
             is GradientDrawable ->
                 drawable.also {
@@ -301,6 +295,7 @@ object ColorManager {
                 }
             else -> null
         }
+    }
 
     private val SUPPORTED_IMG_FORMATS = arrayOf(".png", ".webp", ".jpg", ".gif")
 }

app/src/main/java/com/osfans/trime/ime/keyboard/CommonKeyboardActionListener.kt

@@ -22,6 +22,7 @@ import com.osfans.trime.daemon.launchOnReady
 import com.osfans.trime.data.prefs.AppPrefs
 import com.osfans.trime.data.theme.ColorManager
 import com.osfans.trime.data.theme.KeyActionManager
+import com.osfans.trime.data.theme.ThemeManager
 import com.osfans.trime.ime.core.TrimeInputMethodService
 import com.osfans.trime.ime.dependency.InputScope
 import com.osfans.trime.ime.dialog.AvailableSchemaPickerDialog
@@ -210,7 +211,7 @@ class CommonKeyboardActionListener(
                                 }
                             }
                             "set_color_scheme" -> {
-                                val newScheme = ColorManager.presetColorSchemes.find { it.id == arg }
+                                val newScheme = ThemeManager.activeTheme.colorSchemes.find { it.id == arg }
                                 if (newScheme != null) ColorManager.setColorScheme(newScheme)
                             }
                             "broadcast" -> service.sendBroadcast(Intent(arg))

app/src/main/java/com/osfans/trime/ime/keyboard/Key.kt

@@ -4,6 +4,7 @@
 
 package com.osfans.trime.ime.keyboard
 
+import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.view.KeyEvent
 import com.osfans.trime.core.Rime.Companion.hasLeft
@@ -72,16 +73,26 @@ class Key(
     var keyPressOffsetX = 0
     var keyPressOffsetY = 0
 
-    private fun getColor(src: String): Int = ColorManager.resolveColor(src)
-
-    private fun getDrawable(src: String) = ColorManager.resolveDrawable(src)
-
-    private val keyBackColor by lazy { getDrawable(textKey.keyBackColor) }
-    private val keyTextColor by lazy { getColor(textKey.keyTextColor) }
-    private val keySymbolColor by lazy { getColor(textKey.keySymbolColor) }
-    private val hilitedKeyBackColor by lazy { getDrawable(textKey.hlKeyBackColor) }
-    private val hilitedKeyTextColor by lazy { getColor(textKey.hlKeyTextColor) }
-    private val hilitedKeySymbolColor by lazy { getColor(textKey.hlKeySymbolColor) }
+    private fun getColor(
+        src: String,
+        fallback: String,
+    ): Int =
+        ColorManager
+            .getColor(src)
+            .takeIf { it != Color.TRANSPARENT }
+            ?: ColorManager.getColor(fallback)
+
+    private fun getDrawable(
+        src: String,
+        fallback: String,
+    ) = ColorManager.getDrawable(src) ?: ColorManager.getDrawable(fallback)
+
+    private val keyBackColor by lazy { getDrawable(textKey.keyBackColor, "key_back_color") }
+    private val keyTextColor by lazy { getColor(textKey.keyTextColor, "key_text_color") }
+    private val keySymbolColor by lazy { getColor(textKey.keySymbolColor, "key_symbol_color") }
+    private val hilitedKeyBackColor by lazy { getDrawable(textKey.hlKeyBackColor, "hilited_key_back_color") }
+    private val hilitedKeyTextColor by lazy { getColor(textKey.hlKeyTextColor, "hilited_key_text_color") }
+    private val hilitedKeySymbolColor by lazy { getColor(textKey.hlKeySymbolColor, "hilited_key_symbol_color") }
 
     /**
      * Create an empty key with no attributes.

app/src/main/java/com/osfans/trime/ui/main/settings/ColorPickerDialog.kt

@@ -9,6 +9,7 @@ import android.content.Context
 import androidx.lifecycle.LifecycleCoroutineScope
 import com.osfans.trime.R
 import com.osfans.trime.data.theme.ColorManager
+import com.osfans.trime.data.theme.ThemeManager
 import kotlinx.coroutines.launch
 
 object ColorPickerDialog {
@@ -17,7 +18,7 @@ object ColorPickerDialog {
         context: Context,
         afterConfirm: (suspend () -> Unit)? = null,
     ): AlertDialog {
-        val presetSchemes = ColorManager.presetColorSchemes
+        val presetSchemes = ThemeManager.activeTheme.colorSchemes
         val currentScheme = ColorManager.activeColorScheme
         val currentIndex = presetSchemes.indexOfFirst { it.id == currentScheme.id }
         return AlertDialog