Make settings screens fully usable on Android 15 (#1484)

enable edge to edge in settings for all Android versions to avoid minor glitches and have more consistent appearance

app/src/main/java/helium314/keyboard/settings/SearchScreen.kt

@@ -6,9 +6,14 @@ import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.ime
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.union
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.rememberScrollState
@@ -20,6 +25,7 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
@@ -58,7 +64,11 @@ fun SearchSettingsScreen(
         content = {
             if (content != null) content()
             else {
-                Column(Modifier.verticalScroll(rememberScrollState())) {
+                Scaffold(contentWindowInsets = WindowInsets.systemBars.union(WindowInsets.ime)) { innerPadding ->
+                    Column(
+                        Modifier.verticalScroll(rememberScrollState())
+                            .then(Modifier.padding(bottom = innerPadding.calculateBottomPadding()))
+                    ) {
                         settings.forEach {
                             if (it is Int) {
                                 PreferenceCategory(stringResource(it))
@@ -78,16 +88,17 @@ fun SearchSettingsScreen(
                     // so for now: just use "normal" Column
                     //  even though it takes up to ~50% longer to load it's much better UX
                     //  and the missing appear animations could be added
-//                LazyColumn {
+    //                LazyColumn {
-//                    items(prefs.filterNotNull(), key = { it }) {
+    //                    items(prefs.filterNotNull(), key = { it }) {
-//                        Box(Modifier.animateItem()) {
+    //                        Box(Modifier.animateItem()) {
-//                            if (it is Int)
+    //                            if (it is Int)
-//                                PreferenceCategory(stringResource(it))
+    //                                PreferenceCategory(stringResource(it))
-//                            else
+    //                            else
-//                                SettingsActivity.settingsContainer[it]!!.Preference()
+    //                                SettingsActivity.settingsContainer[it]!!.Preference()
-//                        }
+    //                        }
-//                    }
+    //                    }
-//                }
+    //                }
+                }
             }
         },
         filteredItems = { SettingsActivity.settingsContainer.filter(it) },
@@ -195,7 +206,8 @@ fun <T: Any?> SearchScreen(
                 }
             } else {
                 val items = filteredItems(searchText.text)
-                LazyColumn {
+                Scaffold(contentWindowInsets = WindowInsets.systemBars.union(WindowInsets.ime)) { innerPadding ->
+                    LazyColumn(contentPadding = PaddingValues.Absolute(bottom = innerPadding.calculateBottomPadding())) {
                         items(items) {
                             itemContent(it)
                         }
@@ -203,6 +215,7 @@ fun <T: Any?> SearchScreen(
                 }
             }
         }
+    }
 }
 
 // from StreetComplete

app/src/main/java/helium314/keyboard/settings/SettingsActivity.kt

@@ -12,7 +12,14 @@ import android.view.WindowInsets.Type
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import androidx.activity.ComponentActivity
+import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.ime
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.union
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.collectAsState
@@ -20,6 +27,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
 import androidx.core.view.ViewCompat
 import helium314.keyboard.compat.locale
@@ -98,10 +106,12 @@ class SettingsActivity : ComponentActivity(), SharedPreferences.OnSharedPreferen
                                 || !UncachedInputMethodManagerUtils.isThisImeEnabled(this, imm)
                     ) }
                     if (spellchecker)
-                        Column { // lazy way of implementing spell checker settings
+                        Scaffold(contentWindowInsets = WindowInsets.systemBars.union(WindowInsets.ime)) { innerPadding ->
+                            Column(Modifier.padding(innerPadding)) { // lazy way of implementing spell checker settings
                                 settingsContainer[Settings.PREF_USE_CONTACTS]!!.Preference()
                                 settingsContainer[Settings.PREF_BLOCK_POTENTIALLY_OFFENSIVE]!!.Preference()
                             }
+                        }
                     else
                         SettingsNavHost(onClickBack = { this.finish() })
                     if (dictUri != null) {
@@ -143,6 +153,8 @@ class SettingsActivity : ComponentActivity(), SharedPreferences.OnSharedPreferen
             }
             intent = null
         }
+
+        enableEdgeToEdge()
     }
 
     override fun onStart() {

app/src/main/java/helium314/keyboard/settings/screens/MainSettingsScreen.kt

@@ -2,8 +2,14 @@
 package helium314.keyboard.settings.screens
 
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.ime
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.union
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -42,7 +48,11 @@ fun MainSettingsScreen(
         settings = emptyList(),
     ) {
         val enabledSubtypes = SubtypeSettings.getEnabledSubtypes(true)
-        Column(Modifier.verticalScroll(rememberScrollState())) {
+        Scaffold(contentWindowInsets = WindowInsets.systemBars.union(WindowInsets.ime)) { innerPadding ->
+            Column(
+                Modifier.verticalScroll(rememberScrollState())
+                    .then(Modifier.padding(bottom = innerPadding.calculateBottomPadding()))
+            ) {
                 Preference(
                     name = stringResource(R.string.language_and_layouts_title),
                     description = enabledSubtypes.joinToString(", ") { it.displayName(ctx) },
@@ -97,6 +107,7 @@ fun MainSettingsScreen(
                 ) { NextScreenIcon() }
             }
         }
+    }
 }
 
 @Preview

app/src/main/java/helium314/keyboard/settings/screens/PersonalDictionaryScreen.kt

@@ -10,7 +10,9 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.ExtendedFloatingActionButton
@@ -177,6 +179,7 @@ fun PersonalDictionaryScreen(
         text = { Text(stringResource(R.string.user_dict_add_word_button)) },
         icon = { Icon(painter = painterResource(R.drawable.ic_edit), stringResource(R.string.user_dict_add_word_button)) },
         modifier = Modifier.wrapContentSize(Alignment.BottomEnd).padding(all = 12.dp)
+            .then(Modifier.systemBarsPadding().imePadding())
     )
 }
 

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

@@ -4,8 +4,12 @@ import android.content.Context
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.ime
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.union
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -13,6 +17,7 @@ import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
@@ -140,8 +145,10 @@ fun SubtypeScreen(
         itemContent = { },
         filteredItems = { emptyList<String>() }
     ) {
+        Scaffold(contentWindowInsets = WindowInsets.systemBars.union(WindowInsets.ime)) { innerPadding ->
             Column(
-            modifier = Modifier.verticalScroll(scrollState).padding(horizontal = 12.dp),
+                modifier = Modifier.verticalScroll(scrollState).padding(horizontal = 12.dp)
+                    .then(Modifier.padding(bottom = innerPadding.calculateBottomPadding())),
                 verticalArrangement = Arrangement.spacedBy(8.dp),
             ) {
                 MainLayoutRow(currentSubtype, customMainLayouts) { setCurrentSubtype(it) }
@@ -172,7 +179,10 @@ fun SubtypeScreen(
                 if (currentSubtype.locale.script() == ScriptUtils.SCRIPT_LATIN) {
                     WithSmallTitle(stringResource(R.string.show_popup_keys_title)) {
                         val explicitValue = currentSubtype.getExtraValueOf(ExtraValue.MORE_POPUPS)
-                    val value = explicitValue ?: prefs.getString(Settings.PREF_MORE_POPUP_KEYS, Defaults.PREF_MORE_POPUP_KEYS)!!
+                        val value = explicitValue ?: prefs.getString(
+                            Settings.PREF_MORE_POPUP_KEYS,
+                            Defaults.PREF_MORE_POPUP_KEYS
+                        )!!
                         Row {
                             TextButton(onClick = { showMorePopupsDialog = true }, Modifier.weight(1f))
                             { Text(stringResource(morePopupKeysResId(value))) }
@@ -187,7 +197,10 @@ fun SubtypeScreen(
                         val checked = currentSubtype.getExtraValueOf(ExtraValue.LOCALIZED_NUMBER_ROW)?.toBoolean()
                         Text(stringResource(R.string.localized_number_row), Modifier.weight(1f))
                         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 = {
                                 setCurrentSubtype(currentSubtype.with(ExtraValue.LOCALIZED_NUMBER_ROW, it.toString()))
                             }
@@ -198,7 +211,10 @@ fun SubtypeScreen(
                     }
                 }
                 HorizontalDivider()
-            Text(stringResource(R.string.settings_screen_secondary_layouts), style = MaterialTheme.typography.titleMedium)
+                Text(
+                    stringResource(R.string.settings_screen_secondary_layouts),
+                    style = MaterialTheme.typography.titleMedium
+                )
                 LayoutType.entries.forEach { type ->
                     if (type == LayoutType.MAIN) return@forEach
                     WithSmallTitle(stringResource(type.displayNameId)) {
@@ -212,11 +228,14 @@ fun SubtypeScreen(
                             onSelected = {
                                 setCurrentSubtype(currentSubtype.withLayout(type, it))
                             },
-                        extraButton = { DefaultButton(explicitLayout == null) {
+                            extraButton = {
+                                DefaultButton(explicitLayout == null) {
                                     setCurrentSubtype(currentSubtype.withoutLayout(type))
-                        } },
+                                }
+                            },
                         ) {
-                        val displayName = if (LayoutUtilsCustom.isCustomLayout(it)) LayoutUtilsCustom.getDisplayName(it)
+                            val displayName =
+                                if (LayoutUtilsCustom.isCustomLayout(it)) LayoutUtilsCustom.getDisplayName(it)
                                 else it.getStringResourceOrName("layout_", ctx)
                             var showLayoutEditDialog by remember { mutableStateOf(false) }
                             Row(
@@ -226,7 +245,14 @@ fun SubtypeScreen(
                             ) {
                                 Text(displayName)
                                 if (LayoutUtilsCustom.isCustomLayout(it))
-                                IconButton({ showLayoutEditDialog = true }) { Icon(painterResource(R.drawable.ic_edit), stringResource(R.string.edit_layout)) }
+                                    IconButton({
+                                        showLayoutEditDialog = true
+                                    }) {
+                                        Icon(
+                                            painterResource(R.drawable.ic_edit),
+                                            stringResource(R.string.edit_layout)
+                                        )
+                                    }
                             }
                             if (showLayoutEditDialog)
                                 LayoutEditDialog(
@@ -260,7 +286,10 @@ fun SubtypeScreen(
             val setting = currentSubtype.getExtraValueOf(ExtraValue.POPUP_ORDER)
             PopupOrderDialog(
                 onDismissRequest = { showKeyOrderDialog = false },
-            initialValue = setting ?: prefs.getString(Settings.PREF_POPUP_KEYS_ORDER, Defaults.PREF_POPUP_KEYS_ORDER)!!,
+                initialValue = setting ?: prefs.getString(
+                    Settings.PREF_POPUP_KEYS_ORDER,
+                    Defaults.PREF_POPUP_KEYS_ORDER
+                )!!,
                 title = stringResource(R.string.popup_order),
                 showDefault = setting != null,
                 onConfirmed = {
@@ -275,7 +304,10 @@ fun SubtypeScreen(
             val setting = currentSubtype.getExtraValueOf(ExtraValue.HINT_ORDER)
             PopupOrderDialog(
                 onDismissRequest = { showHintOrderDialog = false },
-            initialValue = setting ?: prefs.getString(Settings.PREF_POPUP_KEYS_LABELS_ORDER, Defaults.PREF_POPUP_KEYS_LABELS_ORDER)!!,
+                initialValue = setting ?: prefs.getString(
+                    Settings.PREF_POPUP_KEYS_LABELS_ORDER,
+                    Defaults.PREF_POPUP_KEYS_LABELS_ORDER
+                )!!,
                 title = stringResource(R.string.hint_source),
                 showDefault = setting != null,
                 onConfirmed = {
@@ -298,6 +330,7 @@ fun SubtypeScreen(
                 onItemSelected = { setCurrentSubtype(currentSubtype.with(ExtraValue.MORE_POPUPS, it)) }
             )
         }
+    }
 }