Fix system bars on Android.

android/build.gradle.kts

@@ -83,7 +83,6 @@ dependencies {
     implementation(libs.koin.android)
     implementation(libs.kotlinx.datetime)
     implementation(libs.coil.compose)
-    implementation(libs.accompanist.navigationAnimation)
     implementation(platform(libs.firebase.bom))
     implementation(libs.firebase.analytics)
     implementation(libs.firebase.crashlytics)

android/src/main/java/co/touchlab/droidcon/android/MainActivity.kt

@@ -7,6 +7,7 @@ import android.os.Build
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.Image
@@ -25,7 +26,6 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.core.view.WindowCompat
 import androidx.lifecycle.lifecycleScope
 import co.touchlab.droidcon.application.service.NotificationSchedulingService
 import co.touchlab.droidcon.domain.service.AnalyticsService
@@ -67,7 +67,7 @@ class MainActivity :
         splashScreen.setKeepOnScreenCondition { true }
 
         // Do the minimal setup needed for launching the app
-        WindowCompat.setDecorFitsSystemWindows(window, false)
+        enableEdgeToEdge()
 
         // Set up the UI immediately
         setContent {

android/src/main/res/values/themes.xml

@@ -12,7 +12,7 @@
         <item name="postSplashScreenTheme">@style/Theme.Droidcon</item>
     </style>
 
-    <style name="Theme.Droidcon" parent="Theme.Material.DayNight.NoActionBar"></style>
+    <style name="Theme.Droidcon" parent="Theme.Material.DayNight.NoActionBar"/>
 
     <style name="Theme.Material.DayNight.NoActionBar" parent="@android:style/Theme.Material.Light.NoActionBar" />
-</resources>
+</resources>

gradle/libs.versions.toml

@@ -30,10 +30,9 @@ gms-google-services = "4.4.2"
 # TODO: Update Compose libraries. There is currently a conflicing issue with the HorizontalPager
 compose-androidx-ui = "1.7.8"
 compose-compiler = "1.5.15"
-composeNavigation = "2.8.9"
+composeNavigation = "2.9.5"
 compose-jb = "1.7.3"
 
-accompanistNavigationAnimation = "0.36.0"
 splashscreen = "1.0.1"
 junit = "4.13.2"
 junitKtx = "1.2.1"
@@ -59,7 +58,6 @@ sqliter = { module = "co.touchlab:sqliter-driver", version.ref = "sqliter" }
 compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose-compiler" }
 androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "splashscreen" }
 
-accompanist-navigationAnimation = { module = "com.google.accompanist:accompanist-navigation-animation", version.ref = "accompanistNavigationAnimation" }
 firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebase-bom" }
 firebase-analytics = { module = "com.google.firebase:firebase-analytics-ktx", version = "_" }
 firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics-ktx", version = "_" }

shared-ui/src/androidMain/kotlin/co/touchlab/droidcon/ui/util/MainView.kt

@@ -1,12 +1,11 @@
 package co.touchlab.droidcon.ui.util
 
-import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import co.touchlab.droidcon.ui.MainComposeView
 import co.touchlab.droidcon.viewmodel.WaitForLoadedContextModel
 
 @Composable
 fun MainView(waitForLoadedContextModel: WaitForLoadedContextModel) {
-    MainComposeView(waitForLoadedContextModel = waitForLoadedContextModel, modifier = Modifier.systemBarsPadding())
+    MainComposeView(waitForLoadedContextModel = waitForLoadedContextModel, modifier = Modifier)
 }

shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/ui/BottomNavigationView.kt

@@ -59,8 +59,8 @@ internal fun BottomNavigationView(viewModel: ApplicationViewModel, currentConfer
                 }
             }
         },
-    ) { paddingValues ->
-        Box(modifier = Modifier.padding(bottom = paddingValues.calculateBottomPadding())) {
+    ) { innerPadding ->
+        Box(modifier = Modifier.padding(bottom = innerPadding.calculateBottomPadding())) {
             when (selectedTab) {
                 ApplicationViewModel.Tab.Schedule -> SessionListView(
                     viewModel = viewModel.schedule,

shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/ui/session/SessionListView.kt

@@ -78,12 +78,12 @@ internal fun SessionListView(viewModel: BaseSessionListViewModel, title: String,
                     scrollBehavior = scrollBehavior,
                 )
             },
-        ) { paddingValues ->
+        ) { innerPadding ->
             var size by remember { mutableStateOf(IntSize(0, 0)) }
             Column(
                 modifier = Modifier
                     .onSizeChanged { size = it }
-                    .padding(top = paddingValues.calculateTopPadding()),
+                    .padding(top = innerPadding.calculateTopPadding()),
             ) {
                 val days by viewModel.observeDays.observeAsState()
                 if (days?.isEmpty() != false) {

shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/ui/theme/Theme.kt

@@ -16,9 +16,10 @@ private val DarkColorScheme = darkColorScheme(
 
 @Composable
 internal fun DroidconTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit) {
-    val colorScheme = when {
-        darkTheme -> DarkColorScheme
-        else -> LightColorScheme
+    val colorScheme = if (darkTheme) {
+        DarkColorScheme
+    } else {
+        LightColorScheme
     }
 
     MaterialTheme(