Simplify base app layout composeables

Author: SimonSchubert

android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/MainActivity.kt

@@ -5,15 +5,7 @@ import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.statusBarsPadding
-import androidx.compose.foundation.layout.systemBarsPadding
-import androidx.compose.material.MaterialTheme
-import androidx.compose.ui.Modifier
 import com.linuxcommandlibrary.app.App
-import com.linuxcommandlibrary.app.ui.theme.LinuxTheme
-import com.linuxcommandlibrary.app.ui.theme.LocalCustomColors
 
 /* Copyright 2022 Simon Schubert
  *
@@ -38,25 +30,8 @@ class MainActivity : AppCompatActivity() {
             navigationBarStyle = SystemBarStyle.dark(android.graphics.Color.TRANSPARENT),
         )
         super.onCreate(savedInstanceState)
-
-        val deeplink = intent?.data?.toString()
-
         setContent {
-            LinuxTheme {
-                Box(
-                    Modifier
-                        .background(MaterialTheme.colors.primary)
-                        .statusBarsPadding(),
-                ) {
-                    Box(
-                        Modifier
-                            .background(LocalCustomColors.current.navBarBackground)
-                            .systemBarsPadding(),
-                    ) {
-                        App(initialDeeplink = deeplink)
-                    }
-                }
-            }
+            App(initialDeeplink = intent?.data?.toString())
         }
     }
 }

composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/App.kt

@@ -6,18 +6,14 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.background
 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.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.windowInsetsBottomHeight
-import androidx.compose.foundation.layout.windowInsetsTopHeight
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.material.BottomNavigation
 import androidx.compose.material.BottomNavigationItem
 import androidx.compose.material.Icon
@@ -98,25 +94,16 @@ fun App(initialDeeplink: String? = null) {
     }
 
     LinuxTheme {
-        Column(modifier = Modifier.fillMaxSize()) {
-            // Status bar area with primary color
-            Spacer(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .windowInsetsTopHeight(WindowInsets.safeDrawing)
-                    .background(MaterialTheme.colors.primary),
-            )
-            // Main content
-            Box(modifier = Modifier.weight(1f)) {
-                LinuxApp(initialDeeplink = initialDeeplink)
-            }
-            // Navigation bar area with white/surface color
-            Spacer(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .windowInsetsBottomHeight(WindowInsets.safeDrawing)
-                    .background(LocalCustomColors.current.navBarBackground),
-            )
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(MaterialTheme.colors.primary)
+                .statusBarsPadding()
+                .background(LocalCustomColors.current.navBarBackground)
+                .navigationBarsPadding()
+                .background(MaterialTheme.colors.background),
+        ) {
+            LinuxApp(initialDeeplink = initialDeeplink)
         }
     }
 }