fix: wrong functional key back color

osfans · Jan 23, 2024 · d097e87 · d097e87
1 parent fd8873d
commit d097e87
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 21 deletions.
diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/Key.java b/app/src/main/java/com/osfans/trime/ime/keyboard/Key.java
@@ -329,23 +329,31 @@ public int getKey_offset_y() {
     return pressed ? key_press_offset_y : 0;
   }
 
-  private boolean isNormal(int[] drawableState) {
-    return (drawableState == KEY_STATE_NORMAL || drawableState == KEY_STATE_NORMAL_OFF);
-  }
-
   public Drawable getBackColorForState(int[] drawableState) {
-    if (isNormal(drawableState)) return key_back_color;
-    else return hilited_key_back_color;
+    if (drawableState == KEY_STATE_NORMAL) {
+      return key_back_color;
+    } else if (drawableState == KEY_STATE_PRESSED) {
+      return hilited_key_back_color;
+    }
+    return null;
   }
 
   public Integer getTextColorForState(int[] drawableState) {
-    if (isNormal(drawableState)) return key_text_color;
-    else return hilited_key_text_color;
+    if (drawableState == KEY_STATE_NORMAL) {
+      return key_text_color;
+    } else if (drawableState == KEY_STATE_PRESSED) {
+      return hilited_key_text_color;
+    }
+    return null;
   }
 
   public Integer getSymbolColorForState(int[] drawableState) {
-    if (isNormal(drawableState)) return key_symbol_color;
-    else return hilited_key_symbol_color;
+    if (drawableState == KEY_STATE_NORMAL) {
+      return key_symbol_color;
+    } else if (drawableState == KEY_STATE_PRESSED) {
+      return hilited_key_symbol_color;
+    }
+    return null;
   }
 
   /**

diff --git a/app/src/main/java/com/osfans/trime/util/CollectionUtils.kt b/app/src/main/java/com/osfans/trime/util/CollectionUtils.kt
@@ -14,7 +14,7 @@ object CollectionUtils {
         map: Map<String, Any?>?,
         vararg: String?,
     ): Any? {
-        if (map.isNullOrEmpty() || vararg == null) return null
+        if (map.isNullOrEmpty() || vararg == null || !map.containsKey(vararg)) return null
         val keys = vararg.split('/')
         var v: Any? = map
         for (key in keys) {
@@ -34,7 +34,7 @@ object CollectionUtils {
         key: String,
         defValue: String = "",
     ): String {
-        if (map.isNullOrEmpty() || key.isEmpty()) return defValue
+        if (map.isNullOrEmpty() || key.isEmpty() || !map.containsKey(key)) return defValue
         val v = obtainValue(map, key)
         return v?.toString() ?: defValue
     }
@@ -45,11 +45,10 @@ object CollectionUtils {
         key: String,
         defValue: Int = 0,
     ): Int {
-        if (map.isNullOrEmpty() || key.isEmpty()) return defValue
+        if (map.isNullOrEmpty() || key.isEmpty() || !map.containsKey(key)) return defValue
         val nm = obtainString(map, key)
-        return runCatching {
-            if (nm.isNotEmpty()) java.lang.Long.decode(nm).toInt() else defValue
-        }.getOrDefault(defValue)
+        return runCatching { if (nm.isNotEmpty()) java.lang.Long.decode(nm).toInt() else defValue }
+            .getOrDefault(defValue)
     }
 
     @JvmStatic
@@ -58,11 +57,9 @@ object CollectionUtils {
         key: String,
         defValue: Float = 0f,
     ): Float {
-        if (map.isNullOrEmpty() || key.isEmpty()) return defValue
+        if (map.isNullOrEmpty() || key.isEmpty() || !map.containsKey(key)) return defValue
         val s = obtainString(map, key)
-        return runCatching {
-            if (s.isNotEmpty()) s.toFloat() else defValue
-        }.getOrDefault(defValue)
+        return runCatching { if (s.isNotEmpty()) s.toFloat() else defValue }.getOrDefault(defValue)
     }
 
     @JvmStatic
@@ -71,6 +68,10 @@ object CollectionUtils {
         key: String,
         defValue: Boolean = false,
     ): Boolean {
-        return if (map.isNullOrEmpty() || key.isEmpty()) defValue else obtainString(map, key).toBoolean()
+        return if (map.isNullOrEmpty() || key.isEmpty() || !map.containsKey(key)) {
+            defValue
+        } else {
+            obtainString(map, key).toBoolean()
+        }
     }
 }