update layout and theming

Author: MadFlasheroo7

app/src/main/java/pro/jayeshseth/animations/MainActivity.kt

@@ -2,43 +2,22 @@ package pro.jayeshseth.animations
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
-import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
-import androidx.core.view.WindowCompat
 import pro.jayeshseth.animations.navigation.NavGraph
 import pro.jayeshseth.animations.ui.theme.AnimationsTheme
-import com.google.accompanist.systemuicontroller.rememberSystemUiController
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        enableEdgeToEdge(
-            statusBarStyle = SystemBarStyle.auto(
-                android.graphics.Color.TRANSPARENT,
-                android.graphics.Color.TRANSPARENT,
-            ) {
-                true
-            }
-        )
-        WindowCompat.setDecorFitsSystemWindows(window, false)
+        enableEdgeToEdge()
         setContent {
             AnimationsTheme {
-                val systemUiController = rememberSystemUiController()
-                val color = MaterialTheme.colorScheme.background.copy(alpha = 0.8f)
-                systemUiController.setStatusBarColor(
-                    color = color,
-                    darkIcons = false,
-                )
-                systemUiController.setNavigationBarColor(
-                    color = color,
-                    navigationBarContrastEnforced = false
-                )
                 Surface(
                     modifier = Modifier
                         .fillMaxSize(),
@@ -49,31 +28,4 @@ class MainActivity : ComponentActivity() {
             }
         }
     }
-}
-//class NavActivity : ComponentActivity() {
-//    override fun onCreate(savedInstanceState: Bundle?) {
-//        super.onCreate(savedInstanceState)
-//
-//        WindowCompat.setDecorFitsSystemWindows(window, false)
-//        setContent {
-//            AnimationsTheme {
-//                val systemUiController = rememberSystemUiController()
-//                val color = MaterialTheme.colorScheme.background.copy(alpha = 0.8f)
-//                systemUiController.setStatusBarColor(
-//                    color = color,
-//                )
-//                systemUiController.setNavigationBarColor(
-//                    color = color,
-//                    navigationBarContrastEnforced = false
-//                )
-//                Surface(
-//                    modifier = Modifier
-//                        .fillMaxSize(),
-//                    color = MaterialTheme.colorScheme.background
-//                ) {
-//                    NavGraph()
-//                }
-//            }
-//        }
-//    }
-//}
+}

app/src/main/java/pro/jayeshseth/animations/ui/screens/HomeScreen.kt

@@ -1,20 +1,20 @@
 package pro.jayeshseth.animations.ui.screens
 
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import pro.jayeshseth.commoncomponents.HomeScaffold
 import pro.jayeshseth.commoncomponents.InteractiveButton
+import pro.jayeshseth.commoncomponents.StatusBarAwareThemedColumn
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -28,23 +28,24 @@ fun HomeScreen(
     navToBouncyRopes: () -> Unit,
     navToAnimateValueAsState: () -> Unit
 ) {
-    Column {
-        CenterAlignedTopAppBar(
-            title = {
-                Text(
-                    text = "Animations in Jetpack Compose",
-                    fontWeight = FontWeight.Bold
-                )
-            },
-            colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
-                containerColor = Color.Transparent
-            ),
-        )
-        Column(
+    val scrollState = rememberScrollState()
+    val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())
+    HomeScaffold(
+        innerScrollState = scrollState,
+        topAppBarScrollBehavior = scrollBehavior,
+        title = {
+            Text(
+                text = "Animations in Jetpack Compose",
+                fontSize = 25.sp,
+                fontWeight = FontWeight.Bold
+            )
+        }
+    ) {
+        StatusBarAwareThemedColumn(
+            statusBarColor = Color.Transparent,
             modifier = Modifier
-                .verticalScroll(rememberScrollState())
+                .padding(it)
                 .navigationBarsPadding()
-                .padding(horizontal = 20.dp)
         ) {
             InteractiveButton(
                 text = "Animate Visibility",

app/src/main/java/pro/jayeshseth/animations/ui/theme/Theme.kt

@@ -9,7 +9,8 @@ import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.core.view.WindowCompat
@@ -54,9 +55,15 @@ fun AnimationsTheme(
     }
     val view = LocalView.current
     if (!view.isInEditMode) {
-        SideEffect {
+        DisposableEffect(key1 = darkTheme) {
             val window = (view.context as Activity).window
+            window.statusBarColor = colorScheme.surface.copy(0.5f).toArgb()
+            window.navigationBarColor = colorScheme.surface.copy(0.5f).toArgb()
             WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = !darkTheme
+            WindowCompat.getInsetsController(window, view).isAppearanceLightNavigationBars =
+                !darkTheme
+
+            onDispose {}
         }
     }