luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-05-03 13:14:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

make unsaved changes in SubtypeDialog survive screen orientation change

Browse source
This commit is contained in:
Helium314 2025-02-25 22:55:05 +01:00
parent f0689b00f6
commit aaa7fb2ad1
1 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
app/src/main/java/helium314/keyboard/settings/dialogs/SubtypeDialog.kt
View file

@ -82,13 +82,15 @@ fun SubtypeDialog(
initialSubtype: SettingsSubtype, initialSubtype: SettingsSubtype,
onConfirmed: (SettingsSubtype) -> Unit, onConfirmed: (SettingsSubtype) -> Unit,
) { ) {
// todo: make sure the values are always correct (e.g. if using rememberSaveable and rotating)
val ctx = LocalContext.current val ctx = LocalContext.current
val prefs = ctx.prefs() val prefs = ctx.prefs()
val b = (LocalContext.current.getActivity() as? SettingsActivity)?.prefChanged?.collectAsState() val b = (LocalContext.current.getActivity() as? SettingsActivity)?.prefChanged?.collectAsState()
if ((b?.value ?: 0) < 0) if ((b?.value ?: 0) < 0)
Log.v("irrelevant", "stupid way to trigger recomposition on preference change") Log.v("irrelevant", "stupid way to trigger recomposition on preference change")
var currentSubtype by remember { mutableStateOf(initialSubtype) } var currentSubtypeString by rememberSaveable { mutableStateOf(initialSubtype.toPref()) }
val currentSubtype = currentSubtypeString.toSettingsSubtype()
fun setCurrentSubtype(subtype: SettingsSubtype) { currentSubtypeString = subtype.toPref() }
val availableLocalesForScript = getAvailableSecondaryLocales(ctx, currentSubtype.locale).sortedBy { it.toLanguageTag() } val availableLocalesForScript = getAvailableSecondaryLocales(ctx, currentSubtype.locale).sortedBy { it.toLanguageTag() }
var showSecondaryLocaleDialog by remember { mutableStateOf(false) } var showSecondaryLocaleDialog by remember { mutableStateOf(false) }
var showKeyOrderDialog by remember { mutableStateOf(false) } var showKeyOrderDialog by remember { mutableStateOf(false) }
@ -114,7 +116,7 @@ fun SubtypeDialog(
modifier = Modifier.verticalScroll(scrollState), modifier = Modifier.verticalScroll(scrollState),
verticalArrangement = Arrangement.spacedBy(8.dp), verticalArrangement = Arrangement.spacedBy(8.dp),
) { ) {
MainLayoutRow(initialSubtype, currentSubtype, customMainLayouts) { currentSubtype = it } MainLayoutRow(initialSubtype, currentSubtype, customMainLayouts) { setCurrentSubtype(it) }
if (availableLocalesForScript.size > 1) { if (availableLocalesForScript.size > 1) {
WithSmallTitle(stringResource(R.string.secondary_locale)) { WithSmallTitle(stringResource(R.string.secondary_locale)) {
TextButton(onClick = { showSecondaryLocaleDialog = true }) { TextButton(onClick = { showSecondaryLocaleDialog = true }) {
@ -129,14 +131,14 @@ fun SubtypeDialog(
TextButton(onClick = { showKeyOrderDialog = true }, Modifier.weight(1f)) TextButton(onClick = { showKeyOrderDialog = true }, Modifier.weight(1f))
{ Text(stringResource(R.string.popup_order), style = MaterialTheme.typography.bodyLarge) } { Text(stringResource(R.string.popup_order), style = MaterialTheme.typography.bodyLarge) }
DefaultButton(currentSubtype.getExtraValueOf(ExtraValue.POPUP_ORDER) == null) { DefaultButton(currentSubtype.getExtraValueOf(ExtraValue.POPUP_ORDER) == null) {
currentSubtype = currentSubtype.without(ExtraValue.POPUP_ORDER) setCurrentSubtype(currentSubtype.without(ExtraValue.POPUP_ORDER))
} }
} }
Row { Row {
TextButton(onClick = { showHintOrderDialog = true }, Modifier.weight(1f)) TextButton(onClick = { showHintOrderDialog = true }, Modifier.weight(1f))
{ Text(stringResource(R.string.hint_source), style = MaterialTheme.typography.bodyLarge) } { Text(stringResource(R.string.hint_source), style = MaterialTheme.typography.bodyLarge) }
DefaultButton(currentSubtype.getExtraValueOf(ExtraValue.HINT_ORDER) == null) { DefaultButton(currentSubtype.getExtraValueOf(ExtraValue.HINT_ORDER) == null) {
currentSubtype = currentSubtype.without(ExtraValue.HINT_ORDER) setCurrentSubtype(currentSubtype.without(ExtraValue.HINT_ORDER))
} }
} }
if (currentSubtype.locale.script() == SCRIPT_LATIN) { if (currentSubtype.locale.script() == SCRIPT_LATIN) {
@ -147,7 +149,7 @@ fun SubtypeDialog(
TextButton(onClick = { showMorePopupsDialog = true }, Modifier.weight(1f)) TextButton(onClick = { showMorePopupsDialog = true }, Modifier.weight(1f))
{ Text(stringResource(morePopupKeysResId(value))) } { Text(stringResource(morePopupKeysResId(value))) }
DefaultButton(explicitValue == null) { DefaultButton(explicitValue == null) {
currentSubtype = currentSubtype.without(ExtraValue.MORE_POPUPS) setCurrentSubtype(currentSubtype.without(ExtraValue.MORE_POPUPS))
} }
} }
} }
@ -159,11 +161,11 @@ fun SubtypeDialog(
Switch( Switch(
checked = checked ?: prefs.getBoolean(Settings.PREF_LOCALIZED_NUMBER_ROW, Defaults.PREF_LOCALIZED_NUMBER_ROW), checked = checked ?: prefs.getBoolean(Settings.PREF_LOCALIZED_NUMBER_ROW, Defaults.PREF_LOCALIZED_NUMBER_ROW),
onCheckedChange = { onCheckedChange = {
currentSubtype = currentSubtype.with(ExtraValue.LOCALIZED_NUMBER_ROW, it.toString()) setCurrentSubtype(currentSubtype.with(ExtraValue.LOCALIZED_NUMBER_ROW, it.toString()))
} }
) )
DefaultButton(checked == null) { DefaultButton(checked == null) {
currentSubtype = currentSubtype.without(ExtraValue.LOCALIZED_NUMBER_ROW) setCurrentSubtype(currentSubtype.without(ExtraValue.LOCALIZED_NUMBER_ROW))
} }
} }
} }
@ -180,10 +182,10 @@ fun SubtypeDialog(
items = defaultLayouts + customLayouts, items = defaultLayouts + customLayouts,
selectedItem = layout, selectedItem = layout,
onSelected = { onSelected = {
currentSubtype = currentSubtype.withLayout(type, it) setCurrentSubtype(currentSubtype.withLayout(type, it))
}, },
extraButton = { DefaultButton(explicitLayout == null) { extraButton = { DefaultButton(explicitLayout == null) {
currentSubtype = currentSubtype.withoutLayout(type) setCurrentSubtype(currentSubtype.withoutLayout(type))
} }, } },
) { ) {
val displayName = if (LayoutUtilsCustom.isCustomLayout(it)) LayoutUtilsCustom.getDisplayName(it) val displayName = if (LayoutUtilsCustom.isCustomLayout(it)) LayoutUtilsCustom.getDisplayName(it)
@ -215,8 +217,10 @@ fun SubtypeDialog(
onDismissRequest = { showSecondaryLocaleDialog = false }, onDismissRequest = { showSecondaryLocaleDialog = false },
onConfirmed = { locales -> onConfirmed = { locales ->
val newValue = locales.joinToString(Separators.KV) { it.toLanguageTag() } val newValue = locales.joinToString(Separators.KV) { it.toLanguageTag() }
currentSubtype = if (newValue.isEmpty()) currentSubtype.without(ExtraValue.SECONDARY_LOCALES) setCurrentSubtype(
else currentSubtype.with(ExtraValue.SECONDARY_LOCALES, newValue) if (newValue.isEmpty()) currentSubtype.without(ExtraValue.SECONDARY_LOCALES)
else currentSubtype.with(ExtraValue.SECONDARY_LOCALES, newValue)
)
}, },
title = { Text(stringResource(R.string.locales_with_dict)) }, title = { Text(stringResource(R.string.locales_with_dict)) },
items = availableLocalesForScript, items = availableLocalesForScript,
@ -232,8 +236,10 @@ fun SubtypeDialog(
title = stringResource(R.string.popup_order), title = stringResource(R.string.popup_order),
showDefault = setting != null, showDefault = setting != null,
onConfirmed = { onConfirmed = {
currentSubtype = if (it == null) currentSubtype.without(ExtraValue.POPUP_ORDER) setCurrentSubtype(
if (it == null) currentSubtype.without(ExtraValue.POPUP_ORDER)
else currentSubtype.with(ExtraValue.POPUP_ORDER, it) else currentSubtype.with(ExtraValue.POPUP_ORDER, it)
)
} }
) )
} }
@ -245,8 +251,10 @@ fun SubtypeDialog(
title = stringResource(R.string.hint_source), title = stringResource(R.string.hint_source),
showDefault = setting != null, showDefault = setting != null,
onConfirmed = { onConfirmed = {
currentSubtype = if (it == null) currentSubtype.without(ExtraValue.HINT_ORDER) setCurrentSubtype(
if (it == null) currentSubtype.without(ExtraValue.HINT_ORDER)
else currentSubtype.with(ExtraValue.HINT_ORDER, it) else currentSubtype.with(ExtraValue.HINT_ORDER, it)
)
} }
) )
} }
@ -259,7 +267,7 @@ fun SubtypeDialog(
items = items, items = items,
getItemName = { stringResource(morePopupKeysResId(it)) }, getItemName = { stringResource(morePopupKeysResId(it)) },
selectedItem = value, selectedItem = value,
onItemSelected = { currentSubtype = currentSubtype.with(ExtraValue.MORE_POPUPS, it) } onItemSelected = { setCurrentSubtype(currentSubtype.with(ExtraValue.MORE_POPUPS, it)) }
) )
} }
} }