Quellcode durchsuchen

tablet screen padding fix

Milan Jurkulak vor 3 Jahren
Ursprung
Commit
4d02ac782d

+ 1 - 6
app/src/main/kotlin/org/mjdev/tvapp/base/activity/ComposableActivity.kt

@@ -15,8 +15,6 @@ import androidx.activity.compose.setContent
 import androidx.annotation.CallSuper
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.navigationBarsPadding
-import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -71,10 +69,7 @@ open class ComposableActivity : ComponentActivity() {
                 )
             ) {
                 NavHostEx(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .navigationBarsPadding()
-                        .statusBarsPadding(),
+                    modifier = Modifier.fillMaxSize(),
                     navController = navController,
                     builder = navGraphBuilder
                 )

+ 1 - 0
app/src/main/kotlin/org/mjdev/tvapp/base/ui/components/navigation/NavHostEx.kt

@@ -53,6 +53,7 @@ fun NavHostEx(
     }
 ) {
     ScreenView(
+        modifier = modifier.recomposeHighlighter(),
         navController = navController,
     ) {
         NavHost(

+ 8 - 1
app/src/main/kotlin/org/mjdev/tvapp/base/ui/components/screen/ScreenView.kt

@@ -10,6 +10,8 @@ package org.mjdev.tvapp.base.ui.components.screen
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -23,11 +25,16 @@ import org.mjdev.tvapp.base.ui.components.navigation.Navigation
 @TvPreview
 @Composable
 fun ScreenView(
+    modifier: Modifier = Modifier,
     navController: NavHostControllerEx = rememberNavControllerEx(),
     content: @Composable () -> Unit = { EmptyScreen() }
 ) {
     Box(
-        modifier = Modifier.fillMaxSize().recomposeHighlighter(),
+        modifier = modifier
+            .fillMaxSize()
+            .recomposeHighlighter()
+            .navigationBarsPadding()
+            .statusBarsPadding(),
         contentAlignment = Alignment.TopStart,
     ) {
         if (navController.menuState.value) {