fix: crash when selecting new theme/color

Author: MULE-FEHU-EOLIA-ARTONELICO

app/src/main/assets/shared/tongwenfeng.trime.yaml

@@ -109,6 +109,7 @@ fallback_colors:
 #  hilited_back_color: back_color
 #  hilited_candidate_text_color: hilited_text_color
 #  hilited_candidate_back_color: hilited_back_color
+#  hilited_candidate_button_color: hilited_candidate_back_color # 候选栏工具按钮高亮背景色
 #  hilited_label_color: hilited_candidate_text_color # 高亮候选序号 颜色
 #  hilited_comment_text_color: comment_text_color
 #  hilited_key_back_color: hilited_candidate_back_color

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

@@ -65,6 +65,7 @@ object ColorManager {
             "hilited_back_color" to "back_color",
             "hilited_candidate_text_color" to "hilited_text_color",
             "hilited_candidate_back_color" to "hilited_back_color",
+            "hilited_candidate_button_color" to "hilited_candidate_back_color",
             "hilited_label_color" to "hilited_candidate_text_color",
             "hilited_comment_text_color" to "comment_text_color",
             "hilited_key_back_color" to "hilited_candidate_back_color",
@@ -131,15 +132,10 @@ object ColorManager {
     }
 
     private fun evaluateActiveColorScheme(): ColorScheme =
-        if (followSystemDayNight) {
-            if (isNightMode) {
-                darkModeColorScheme
-            } else {
-                lightModeColorScheme
-            } ?: colorScheme(normalModeColor)!!
-        } else {
-            colorScheme(normalModeColor)!!
-        }
+        when {
+            followSystemDayNight -> if (isNightMode) darkModeColorScheme else lightModeColorScheme
+            else -> null
+        } ?: colorScheme(normalModeColor) ?: colorScheme("default")!!
 
     /** 每次切换主题后，都要调用此函数，初始化配色 */
     fun switchTheme(theme: Theme) {

app/src/main/java/com/osfans/trime/ime/bar/ui/ToolButton.kt

@@ -38,7 +38,7 @@ class ToolButton(
     ) : this(context) {
         image.imageTintList = ColorStateList.valueOf(ColorManager.getColor("comment_text_color"))
         setIcon(icon)
-        setPressHighlightColor(ColorManager.getColor("hilited_on_key_back_color"))
+        setPressHighlightColor(ColorManager.getColor("hilited_candidate_button_color"))
         add(image, lParams(wrapContent, wrapContent, gravityCenter))
     }