luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-06-10 00:27:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't create unnecessary additional subtypes when manually selecting qwerty

Browse source
This commit is contained in:
Helium314 2025-05-24 16:46:18 +02:00
parent ed540466e9
commit 154f7c3a1e
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/helium314/keyboard/settings/screens/SubtypeScreen.kt
View file

@ -393,8 +393,12 @@ private fun MainLayoutRow(
DropDownField( DropDownField(
items = appLayouts + customLayouts, items = appLayouts + customLayouts,
selectedItem = currentSubtype.mainLayoutName() ?: SubtypeLocaleUtils.QWERTY, selectedItem = currentSubtype.mainLayoutName() ?: SubtypeLocaleUtils.QWERTY,
onSelected = { onSelected = { layout ->
setCurrentSubtype(currentSubtype.withLayout(LayoutType.MAIN, it)) // if the locale defaults to qwerty, use it as implicit default to avoid creating unnecessary additional subtypes
if (layout == SubtypeLocaleUtils.QWERTY
&& SubtypeSettings.getResourceSubtypesForLocale(currentSubtype.locale).any { it.mainLayoutName() == null })
setCurrentSubtype(currentSubtype.withoutLayout(LayoutType.MAIN))
else setCurrentSubtype(currentSubtype.withLayout(LayoutType.MAIN, layout))
}, },
extraButton = { extraButton = {
IconButton({ showAddLayoutDialog = true }) IconButton({ showAddLayoutDialog = true })