From f0c2ac566f4e90d09e1deb0490ab1c8b1e3786aa Mon Sep 17 00:00:00 2001
From: Patrick Goldinger <patrick@patrickgold.dev>
Date: Sat, 13 Aug 2022 14:44:55 +0200
Subject: [PATCH] Move Smartbar display mode pref from Typing to Smartbar
 screen

---
 .../florisboard/app/settings/smartbar/SmartbarScreen.kt   | 8 ++++++++
 .../florisboard/app/settings/typing/TypingScreen.kt       | 7 -------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/smartbar/SmartbarScreen.kt b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/smartbar/SmartbarScreen.kt
index 07b70abd..d0bb8a0e 100644
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/smartbar/SmartbarScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/smartbar/SmartbarScreen.kt
@@ -18,6 +18,7 @@ package dev.patrickgold.florisboard.app.settings.smartbar
 
 import androidx.compose.runtime.Composable
 import dev.patrickgold.florisboard.R
+import dev.patrickgold.florisboard.ime.smartbar.CandidatesDisplayMode
 import dev.patrickgold.florisboard.ime.smartbar.ExtendedActionsPlacement
 import dev.patrickgold.florisboard.ime.smartbar.SmartbarLayout
 import dev.patrickgold.florisboard.lib.compose.FlorisScreen
@@ -45,6 +46,13 @@ fun SmartbarScreen() = FlorisScreen {
         )
 
         PreferenceGroup(title = stringRes(R.string.pref__smartbar__group_layout_specific__label)) {
+            ListPreference(
+                prefs.suggestion.displayMode,
+                title = stringRes(R.string.pref__suggestion__display_mode__label),
+                entries = CandidatesDisplayMode.listEntries(),
+                enabledIf = { prefs.smartbar.enabled isEqualTo true },
+                visibleIf = { prefs.smartbar.layout isNotEqualTo SmartbarLayout.ACTIONS_ONLY },
+            )
             SwitchPreference(
                 prefs.smartbar.flipToggles,
                 title = stringRes(R.string.pref__smartbar__flip_toggles__label),
diff --git a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/typing/TypingScreen.kt b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/typing/TypingScreen.kt
index 8d78475e..8e92a41e 100644
--- a/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/typing/TypingScreen.kt
+++ b/app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/typing/TypingScreen.kt
@@ -28,7 +28,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import dev.patrickgold.florisboard.R
 import dev.patrickgold.florisboard.ime.nlp.SpellingLanguageMode
-import dev.patrickgold.florisboard.ime.smartbar.CandidatesDisplayMode
 import dev.patrickgold.florisboard.lib.android.AndroidVersion
 import dev.patrickgold.florisboard.lib.compose.FlorisErrorCard
 import dev.patrickgold.florisboard.lib.compose.FlorisHyperlinkText
@@ -63,12 +62,6 @@ fun TypingScreen() = FlorisScreen {
                 title = stringRes(R.string.pref__suggestion__enabled__label),
                 summary = stringRes(R.string.pref__suggestion__enabled__summary),
             )
-            ListPreference(
-                prefs.suggestion.displayMode,
-                title = stringRes(R.string.pref__suggestion__display_mode__label),
-                entries = CandidatesDisplayMode.listEntries(),
-                enabledIf = { prefs.suggestion.enabled isEqualTo true },
-            )
             SwitchPreference(
                 prefs.suggestion.blockPossiblyOffensive,
                 title = stringRes(R.string.pref__suggestion__block_possibly_offensive__label),