feat(event): add command set_color_scheme

osfans · May 11, 2024 · 8d676c8 · 8d676c8
1 parent 46cd745
commit 8d676c8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/app/src/main/assets/rime/trime.yaml b/app/src/main/assets/rime/trime.yaml
@@ -936,6 +936,7 @@ preset_keys:
   liquid_keyboard_exit: {label: 返回, send: function, command: liquid_keyboard, option: "-1"}  #退出liquidkeyboard
   liquid_keyboard_emoji: { label: 🙂, send: function, command: liquid_keyboard, option: "emoji" }
   liquid_keyboard_clipboard: { label: 剪贴, send: function, command: liquid_keyboard, option: "剪贴" }
+  set_color_ink: { label: 切换到ink配色, send: function, command: set_color_scheme, option: "ink" }
   # trime設定
   IME_switch: { label: 🌐, send: LANGUAGE_SWITCH } #彈出對話框選擇輸入法
   IME_last: { label: 上一輸入法, send: LANGUAGE_SWITCH, select: .last } #直接切換到上一輸入法

diff --git a/app/src/main/java/com/osfans/trime/ime/text/TextInputManager.kt b/app/src/main/java/com/osfans/trime/ime/text/TextInputManager.kt
@@ -15,6 +15,7 @@ import com.osfans.trime.daemon.RimeSession
 import com.osfans.trime.daemon.launchOnReady
 import com.osfans.trime.data.AppPrefs
 import com.osfans.trime.data.schema.SchemaManager
+import com.osfans.trime.data.theme.ColorManager
 import com.osfans.trime.data.theme.EventManager
 import com.osfans.trime.data.theme.ThemeManager
 import com.osfans.trime.ime.core.InputView
@@ -351,17 +352,15 @@ class TextInputManager(
                         )
                 }
 
-                if (event.command == "liquid_keyboard") {
-                    trime.selectLiquidKeyboard(arg)
-                } else if (event.command == "paste_by_char") {
-                    trime.pasteByChar()
-                } else {
-                    val textFromCommand =
-                        ShortcutUtils
-                            .call(trime, event.command, arg)
-                    if (textFromCommand != null) {
-                        trime.commitCharSequence(textFromCommand)
-                        trime.updateComposing()
+                when (event.command) {
+                    "liquid_keyboard" -> trime.selectLiquidKeyboard(arg)
+                    "paste_by_char" -> trime.pasteByChar()
+                    "set_color_scheme" -> ColorManager.setColorScheme(arg)
+                    else -> {
+                        ShortcutUtils.call(trime, event.command, arg)?.let {
+                            trime.commitCharSequence(it)
+                            trime.updateComposing()
+                        }
                     }
                 }
             }