fix: _hide_candidate didn't actually hide candidate bar

feat: add `_hide_bar`, which playing the same role of `_hide_candidate`
osfans · Feb 2, 2024 · 92fd2eb · 92fd2eb
1 parent 6e4fdee
commit 92fd2eb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/app/src/main/java/com/osfans/trime/ime/core/InputView.kt b/app/src/main/java/com/osfans/trime/ime/core/InputView.kt
@@ -220,8 +220,10 @@ class InputView(
                     "_hide_comment" -> {
                         quickBar.oldCandidateBar.candidates.setShowComment(!it.value)
                     }
-                    "_hide_candidate" -> {
-                        quickBar.oldCandidateBar.root.visibility =
+                    "_hide_bar",
+                    "_hide_candidate",
+                    -> {
+                        quickBar.view.visibility =
                             if (it.value) View.GONE else View.VISIBLE
                     }
                     "_hide_key_hint" -> keyboardWindow.oldMainInputView.mainKeyboardView.setShowHint(!it.value)

diff --git a/app/src/main/java/com/osfans/trime/ime/core/Trime.kt b/app/src/main/java/com/osfans/trime/ime/core/Trime.kt
@@ -368,7 +368,12 @@ open class Trime : LifecycleInputMethodService() {
         if (mCandidateRoot != null) {
             loadBackground(true)
             setShowComment(!Rime.getOption("_hide_comment"))
-            mCandidateRoot!!.visibility = if (!Rime.getOption("_hide_candidate")) View.VISIBLE else View.GONE
+            inputView?.quickBar?.view?.visibility =
+                if (!Rime.getOption("_hide_candidate") || !Rime.getOption("_hide_bar")) {
+                    View.VISIBLE
+                } else {
+                    View.GONE
+                }
             mCandidate!!.reset()
             mCompositionPopupWindow!!.isPopupWindowEnabled = (
                 prefs.keyboard.popupWindowEnabled &&

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
@@ -232,7 +232,9 @@ class TextInputManager private constructor() :
                         trime.inputFeedbackManager?.ttsLanguage =
                             locales[if (value) 1 else 0]
                     }
-                    "_hide_candidate" -> {
+                    "_hide_bar",
+                    "_hide_candidate",
+                    -> {
                         trime.setCandidatesViewShown(isComposable && !value)
                     }
                     "_liquid_keyboard" -> trime.selectLiquidKeyboard(0)