refactor: improve landscape layout handling

Author: Lennoard

app/src/main/kotlin/com/androidvip/sysctlgui/ui/main/MainScreen.kt

@@ -14,6 +14,7 @@ import androidx.compose.animation.slideOutHorizontally
 import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
@@ -119,7 +120,9 @@ private fun MainScreenContent(
                 }
 
                 AppNavHost(
-                    modifier = Modifier.weight(1f),
+                    modifier = Modifier
+                        .weight(1f)
+                        .then(if (isLandscape) Modifier.navigationBarsPadding() else Modifier),
                     innerPadding = innerPadding,
                     navController = navController,
                     startDestination = startDestination

app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamLandscapeContent.kt

@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.displayCutoutPadding
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
@@ -86,6 +87,7 @@ internal fun EditParamLandscapeContent(
         modifier = Modifier
             .fillMaxSize()
             .background(MaterialTheme.colorScheme.background)
+            .displayCutoutPadding()
             .padding(16.dp),
         horizontalArrangement = Arrangement.spacedBy(16.dp)
     ) {

app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/edit/EditParamScreen.kt

@@ -96,7 +96,7 @@ fun EditParamScreen(
     onNavigateBack: () -> Unit
 ) {
     val context = LocalContext.current
-    val state = viewModel.uiState.collectAsStateWithLifecycle()
+    val state by viewModel.uiState.collectAsStateWithLifecycle()
     val taskerListOptions = stringArrayResource(R.array.tasker_lists).toList()
     var showSelectTaskerListDialog by rememberSaveable { mutableStateOf(false) }
     var selectedOptionIndex by rememberSaveable {
@@ -154,7 +154,7 @@ fun EditParamScreen(
 
     if (isLandscape()) {
         EditParamLandscapeContent(
-            state = state.value,
+            state = state,
             showError = showError,
             errorMessage = errorMessage,
             onValueApply = {
@@ -177,7 +177,7 @@ fun EditParamScreen(
         )
     } else {
         EditParamContent(
-            state = state.value,
+            state = state,
             showError = showError,
             errorMessage = errorMessage,
             onValueApply = {

app/src/main/kotlin/com/androidvip/sysctlgui/ui/presets/ImportPresetScreen.kt

@@ -17,10 +17,12 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.displayCutoutPadding
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -254,6 +256,7 @@ private fun IncomingPresetsContent(
             modifier = Modifier
                 .fillMaxWidth()
                 .background(MaterialTheme.colorScheme.surfaceContainer)
+                .navigationBarsPadding()
                 .padding(16.dp),
             horizontalArrangement = Arrangement.spacedBy(16.dp, Alignment.CenterHorizontally)
         ) {
@@ -286,7 +289,9 @@ private fun IncomingPresetsLandscapeContent(
     onCancelPressed: () -> Unit
 ) {
     Row(
-        modifier = Modifier.fillMaxSize(),
+        modifier = Modifier
+            .fillMaxSize()
+            .displayCutoutPadding(),
         horizontalArrangement = Arrangement.spacedBy(16.dp)
     ) {
         LazyColumn(

app/src/main/kotlin/com/androidvip/sysctlgui/ui/search/SearchScreen.kt

@@ -11,6 +11,10 @@ import androidx.compose.animation.shrinkHorizontally
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.calculateStartPadding
+import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.offset
@@ -41,6 +45,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
@@ -160,6 +165,12 @@ private fun SearchScreenContent(
                         onSearch = onSearch,
                         expanded = searchActive,
                         onExpandedChange = onActiveChange,
+                        modifier = Modifier.padding(
+                            start = WindowInsets.displayCutout.asPaddingValues()
+                                .calculateStartPadding(
+                                    LocalLayoutDirection.current
+                                )
+                        ),
                         placeholder = { Text(stringResource(R.string.search_title)) },
                         leadingIcon = {
                             AnimatedContent(
@@ -193,9 +204,7 @@ private fun SearchScreenContent(
                                 enter = expandHorizontally(expandFrom = Alignment.Start) + fadeIn(),
                                 exit = shrinkHorizontally(shrinkTowards = Alignment.Start) + fadeOut()
                             ) {
-                                IconButton(onClick = {
-                                    onSearchQueryChange("")
-                                }) {
+                                IconButton(onClick = { onSearchQueryChange("") }) {
                                     Icon(
                                         painter = painterResource(R.drawable.ic_close),
                                         contentDescription = stringResource(R.string.clear_search)
@@ -266,7 +275,12 @@ private fun SearchViewContent(
 
     LazyVerticalGrid(
         columns = hintItemColumns,
-        modifier = Modifier.fillMaxWidth()
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(
+                start = WindowInsets.displayCutout.asPaddingValues()
+                    .calculateStartPadding(LocalLayoutDirection.current)
+            )
     ) {
         if (historyHints.isNotEmpty()) {
             item(