fix: main keyboard view would disappear after switching schema

osfans · Nov 3, 2024 · 951b441 · 951b441
1 parent 28fa4c0
commit 951b441
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/src/main/java/com/osfans/trime/ime/core/TrimeInputMethodService.kt b/app/src/main/java/com/osfans/trime/ime/core/TrimeInputMethodService.kt
@@ -256,10 +256,6 @@ open class TrimeInputMethodService : LifecycleInputMethodService() {
 
     private fun handleRimeCallback(it: RimeCallback) {
         when (it) {
-            is RimeNotification.SchemaNotification -> {
-                recreateInputView(ThemeManager.activeTheme)
-            }
-
             is RimeNotification.OptionNotification -> {
                 val value = it.value.value
                 when (val option = it.value.option) {

diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardWindow.kt b/app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardWindow.kt
@@ -15,6 +15,7 @@ import androidx.core.content.ContextCompat
 import com.osfans.trime.R
 import com.osfans.trime.core.Rime
 import com.osfans.trime.core.RimeNotification.OptionNotification
+import com.osfans.trime.core.SchemaItem
 import com.osfans.trime.daemon.RimeSession
 import com.osfans.trime.data.prefs.AppPrefs
 import com.osfans.trime.data.schema.SchemaManager
@@ -234,6 +235,10 @@ class KeyboardWindow(
         dispatchCapsState(mainKeyboardView::setShifted)
     }
 
+    override fun onRimeSchemaUpdated(schema: SchemaItem) {
+        switchKeyboard(smartMatchKeyboard())
+    }
+
     override fun onRimeOptionUpdated(value: OptionNotification.Value) {
         when (val opt = value.option) {
             "ascii_mode" -> currentKeyboard?.currentAsciiMode = value.value