mirror/florisboard
0
0
Fork 0
mirror of https://github.com/florisboard/florisboard.git synced 2024-09-19 19:42:20 +02:00
Code

Move Smartbar display mode pref from Typing to Smartbar screen

Browse Source
This commit is contained in:
Patrick Goldinger 2022-08-13 14:44:55 +02:00
parent 19224e5f18
commit f0c2ac566f
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/smartbar/SmartbarScreen.kt
View File

@ -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),

7
app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/typing/TypingScreen.kt
View File

@ -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),