#1686 fix: do not show some screens behind system bars on the left/right side of the device.

Author: sds100

CHANGELOG.md

@@ -5,6 +5,7 @@
 ## Bug fixes
 
 - Do not automatically select the key mapper keyboard when the accessibility service starts.
+- #1686 do not show some screens behind system bars on the left/right side of the device.
 
 ## [3.1.0](https://github.com/sds100/KeyMapper/releases/tag/v3.1.0)
 

app/src/main/java/io/github/sds100/keymapper/home/HomeKeyMapListScreen.kt

@@ -17,6 +17,7 @@ import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.safeDrawing
+import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -172,7 +173,9 @@ fun HomeKeyMapListScreen(
         },
         listContent = {
             KeyMapList(
-                modifier = Modifier.animateContentSize(),
+                modifier = Modifier
+                    .windowInsetsPadding(WindowInsets.systemBars.only(sides = WindowInsetsSides.Horizontal))
+                    .animateContentSize(),
                 lazyListState = rememberLazyListState(),
                 listItems = state.listItems,
                 footerText = stringResource(R.string.home_key_map_list_footer_text),

app/src/main/java/io/github/sds100/keymapper/home/KeyMapListAppBar.kt

@@ -21,13 +21,17 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
@@ -394,6 +398,7 @@ private fun RootGroupAppBar(
         Surface(color = appBarContainerColor) {
             GroupRow(
                 modifier = Modifier
+                    .windowInsetsPadding(WindowInsets.systemBars.only(sides = WindowInsetsSides.Horizontal))
                     .padding(horizontal = 8.dp)
                     .fillMaxWidth(),
                 groups = state.subGroups,
@@ -405,6 +410,7 @@ private fun RootGroupAppBar(
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun ChildGroupAppBar(
     modifier: Modifier = Modifier,
@@ -439,7 +445,7 @@ private fun ChildGroupAppBar(
             Column {
                 Row(
                     Modifier
-                        .statusBarsPadding()
+                        .windowInsetsPadding(TopAppBarDefaults.windowInsets)
                         .fillMaxWidth()
                         .heightIn(min = 48.dp)
                         .padding(vertical = 8.dp)

app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/ConfigKeyMapFragment.kt

@@ -4,7 +4,12 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.only
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.fragment.app.Fragment
@@ -65,7 +70,9 @@ class ConfigKeyMapFragment : Fragment() {
                 setContent {
                     KeyMapperTheme {
                         ConfigKeyMapScreen(
-                            modifier = Modifier.fillMaxSize(),
+                            modifier = Modifier
+                                .windowInsetsPadding(WindowInsets.systemBars.only(sides = WindowInsetsSides.Horizontal))
+                                .fillMaxSize(),
                             viewModel = viewModel,
                             navigateBack = findNavController()::navigateUp,
                         )