refactor: Key.java to kotlin

osfans · Jan 25, 2024 · 89593e3 · 89593e3
1 parent f053f45
commit 89593e3
Show file tree

Hide file tree

Showing 9 changed files with 610 additions and 684 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
@@ -110,7 +110,7 @@ class Theme private constructor(isDarkMode: Boolean) {
                 Timber.d("Fetching done")
                 generalStyle = fullThemeConfigMap!!["style"] as Map<String, Any?>?
                 fallbackColors = fullThemeConfigMap!!["fallback_colors"] as Map<String, String>?
-                Key.presetKeys = fullThemeConfigMap!!["preset_keys"] as Map<String?, Map<String?, Any?>?>?
+                Key.presetKeys = fullThemeConfigMap!!["preset_keys"] as Map<String, Map<String, Any?>?>?
                 presetColorSchemes = fullThemeConfigMap!!["preset_color_schemes"] as Map<String, Map<String, Any>?>?
                 presetKeyboards = fullThemeConfigMap!!["preset_keyboards"] as Map<String, Any?>?
                 liquidKeyboard = fullThemeConfigMap!!["liquid_keyboard"] as Map<String, Any?>?
@@ -176,7 +176,7 @@ class Theme private constructor(isDarkMode: Boolean) {
         }
 
         fun getColor(
-            m: Map<String?, Any?>,
+            m: Map<String, Any?>,
             key: String?,
         ): Int? {
             var value = theme.getColorValue(m[key] as String?)
@@ -199,7 +199,7 @@ class Theme private constructor(isDarkMode: Boolean) {
 
         // API 2.0
         fun getDrawable(
-            m: Map<String?, Any?>,
+            m: Map<String, Any?>,
             key: String,
         ): Drawable? {
             var value = theme.getColorValue(m[key] as String?)

diff --git a/app/src/main/java/com/osfans/trime/ime/enums/Keycode.kt b/app/src/main/java/com/osfans/trime/ime/enums/Keycode.kt
@@ -484,14 +484,14 @@ enum class Keycode {
         ): String =
             if (isStdKey(keyCode)) {
                 // Android keycode区域
-                if (Key.getKcm().isPrintingKey(keyCode)) {
+                if (Key.kcm.isPrintingKey(keyCode)) {
                     val event = KeyEvent(0, 0, KeyEvent.ACTION_DOWN, keyCode, 0, mask)
                     val charCode = event.getUnicodeChar(mask)
                     Timber.d("getDisplayLabel(): keycode=$keyCode, mask=$mask, charCode=$charCode")
                     if (charCode > 0) {
                         charCode.toChar().toString()
                     } else {
-                        Key.getKcm().getDisplayLabel(keyCode).lowercase()
+                        Key.kcm.getDisplayLabel(keyCode).lowercase()
                     }
                 } else {
                     keyNameOf(keyCode)

diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/Event.java b/app/src/main/java/com/osfans/trime/ime/keyboard/Event.java
@@ -72,7 +72,7 @@ public Event(Keyboard keyboard, @NonNull String s) {
     }
     if (Key.presetKeys.containsKey(s)) {
       // todo 把presetKeys缓存为presetKeyEvents，减少重新载入
-      Map<String, Object> presetKey = Key.presetKeys.get(s);
+      Map<String, Object> presetKey = (Map<String, Object>) Key.presetKeys.get(s);
       command = CollectionUtils.obtainString(presetKey, "command", "");
       option = CollectionUtils.obtainString(presetKey, "option", "");
       select = CollectionUtils.obtainString(presetKey, "select", "");
@@ -104,7 +104,7 @@ public Event(Keyboard keyboard, @NonNull String s) {
 
     shiftLabel = label;
     if (Keycode.Companion.isStdKey(code)) { // Android keycode区域
-      if (Key.getKcm().isPrintingKey(code)) {
+      if (Key.kcm.isPrintingKey(code)) {
         int mMask = KeyEvent.META_SHIFT_ON | mask;
         KeyEvent event = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, code, 0, mMask);
         int k = event.getUnicodeChar(mMask);