feat: add setting to hide quick bar when always show candidates window

Author: WhiredPlanck

app/src/main/java/com/osfans/trime/data/prefs/AppPrefs.kt

@@ -190,10 +190,12 @@ class AppPrefs(
         companion object {
             const val MODE = "show_candidates_window"
             const val POSITION = "candidates_window_position"
+            const val HIDE_QUICK_BAR = "hide_quick_bar"
         }
 
         val mode = enum(R.string.show_candidates_window, MODE, PopupCandidatesMode.DISABLED)
         val position = enum(R.string.candidates_window_position, POSITION, PopupPosition.BOTTOM_LEFT)
+        val hideQuickBar = switch(R.string.hide_quick_bar_when_always_show, HIDE_QUICK_BAR, false)
     }
 
     /**

app/src/main/java/com/osfans/trime/data/prefs/PreferenceDelegateOwner.kt

@@ -61,6 +61,22 @@ abstract class PreferenceDelegateOwner(
         },
     )
 
+    protected fun switch(
+        @StringRes
+        title: Int,
+        key: String,
+        defaultValue: Boolean,
+        @StringRes
+        summary: Int? = null,
+        enableUiOn: (() -> Boolean)? = null,
+    ): PreferenceDelegate<Boolean> {
+        val pref = PreferenceDelegate(sharedPreferences, key, defaultValue)
+        val ui = PreferenceDelegateUi.Switch(title, key, defaultValue, summary, enableUiOn)
+        pref.register()
+        ui.registerUi()
+        return pref
+    }
+
     // TODO: replace all [enum] with this
     protected inline fun <reified T> enum(
         @StringRes title: Int,

app/src/main/java/com/osfans/trime/data/prefs/PreferenceDelegateUi.kt

@@ -8,6 +8,7 @@ import android.content.Context
 import androidx.annotation.StringRes
 import androidx.preference.ListPreference
 import androidx.preference.Preference
+import androidx.preference.SwitchPreference
 
 abstract class PreferenceDelegateUi<T : Preference>(
     val key: String,
@@ -17,6 +18,28 @@ abstract class PreferenceDelegateUi<T : Preference>(
 
     fun isEnabled() = enableUiOn?.invoke() ?: true
 
+    class Switch(
+        @StringRes
+        val title: Int,
+        key: String,
+        val defaultValue: Boolean,
+        @StringRes
+        val summary: Int? = null,
+        enableUiOn: (() -> Boolean)? = null,
+    ) : PreferenceDelegateUi<SwitchPreference>(key, enableUiOn) {
+        override fun createUi(context: Context) =
+            SwitchPreference(context).apply {
+                key = this@Switch.key
+                isIconSpaceReserved = false
+                isSingleLineTitle = false
+                setDefaultValue(defaultValue)
+                if (this@Switch.summary != null) {
+                    setSummary(this@Switch.summary)
+                }
+                setTitle(this@Switch.title)
+            }
+    }
+
     class StringList<T : Any>(
         @StringRes
         val title: Int,

app/src/main/java/com/osfans/trime/ime/bar/QuickBar.kt

@@ -54,6 +54,7 @@ class QuickBar(
     private val prefs = AppPrefs.defaultInstance()
 
     private val showSwitches by prefs.keyboard.showSchemaSwitches
+    private val hideQuickBar by prefs.candidates.hideQuickBar
 
     val themedHeight =
         theme.generalStyle.candidateViewHeight + theme.generalStyle.commentHeight
@@ -182,9 +183,7 @@ class QuickBar(
         ViewAnimator(context).apply {
             rime.launchOnReady {
                 visibility =
-                    if (it.getRuntimeOption("_hide_candidate") ||
-                        it.getRuntimeOption("_hide_bar")
-                    ) {
+                    if (hideQuickBar && candidatesMode == PopupCandidatesMode.ALWAYS_SHOW) {
                         View.GONE
                     } else {
                         View.VISIBLE
@@ -223,9 +222,6 @@ class QuickBar(
             "_hide_comment" -> {
                 // candidateUi.candidates.shouldShowComment = !value.value
             }
-            "_hide_candidate", "_hide_bar" -> {
-                view.visibility = if (value.value) View.GONE else View.VISIBLE
-            }
         }
         if (alwaysUi.currentState == AlwaysUi.State.Switches) {
             service.lifecycleScope.launch {

app/src/main/res/values-zh-rCN/strings.xml

@@ -233,4 +233,5 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <string name="candidates_window_position">候选词窗口位置</string>
     <string name="deploy_failure">部署失败</string>
     <string name="view_deploy_failure_log">部署失败。点此查看错误日志。</string>
+    <string name="hide_quick_bar_when_always_show">始终显示候选词窗口时隐藏快捷栏</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -233,4 +233,5 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <string name="candidates_window_position">候選詞視窗位置</string>
     <string name="deploy_failure">部署失敗</string>
     <string name="view_deploy_failure_log">部署失敗。點此檢視錯誤日誌。</string>
+    <string name="hide_quick_bar_when_always_show">始終顯示候選詞視窗時隱藏快捷欄</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -233,4 +233,5 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <string name="candidates_window_position">Candidates window position</string>
     <string name="deploy_failure">Deploy failure</string>
     <string name="view_deploy_failure_log">Deploy failure. Click here to view error log.</string>
+    <string name="hide_quick_bar_when_always_show">Hide quick bar when always show candidates window</string>
 </resources>