refactor(android): drop Accompanist SystemUI Controller dependency

android/build.gradle.kts

@@ -64,7 +64,6 @@ whetstone {
 dependencies {
   implementation(platform(libs.androidx.compose.bom))
   implementation(platform(libs.okhttp.bom))
-  implementation(libs.accompanist.sysuicontroller)
   implementation(libs.androidx.activity.compose)
   implementation(libs.androidx.compose.material)
   implementation(libs.androidx.compose.material.icons.extended)

android/src/main/kotlin/dev/msfjarvis/claw/android/MainActivity.kt

@@ -11,14 +11,16 @@ import android.net.Uri
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
 import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
+import androidx.compose.ui.platform.LocalUriHandler
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.core.view.WindowCompat
 import com.deliveryhero.whetstone.Whetstone
 import com.deliveryhero.whetstone.activity.ContributesActivityInjector
 import dev.msfjarvis.claw.android.ui.LobstersApp
 import dev.msfjarvis.claw.common.comments.HTMLConverter
+import dev.msfjarvis.claw.common.theme.LobstersTheme
 import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
 import javax.inject.Inject
 
@@ -34,10 +36,13 @@ class MainActivity : ComponentActivity() {
     super.onCreate(savedInstanceState)
     installSplashScreen()
     Whetstone.inject(this)
-    WindowCompat.setDecorFitsSystemWindows(window, false)
+    enableEdgeToEdge()
     setContent {
       val windowSizeClass = calculateWindowSizeClass(this)
-
+      LobstersTheme(
+        dynamicColor = true,
+        providedValues = arrayOf(LocalUriHandler provides urlLauncher),
+      ) {
         LobstersApp(
           urlLauncher = urlLauncher,
           htmlConverter = htmlConverter,
@@ -46,6 +51,7 @@ class MainActivity : ComponentActivity() {
         )
       }
     }
+  }
 
   override fun onProvideAssistContent(outContent: AssistContent?) {
     super.onProvideAssistContent(outContent)

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt

@@ -39,7 +39,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTagsAsResourceId
@@ -58,7 +57,6 @@ import dev.msfjarvis.claw.android.ui.datatransfer.DataTransferScreen
 import dev.msfjarvis.claw.android.ui.decorations.ClawNavigationBar
 import dev.msfjarvis.claw.android.ui.decorations.ClawNavigationRail
 import dev.msfjarvis.claw.android.ui.decorations.NavigationItem
-import dev.msfjarvis.claw.android.ui.decorations.TransparentSystemBars
 import dev.msfjarvis.claw.android.ui.lists.DatabasePosts
 import dev.msfjarvis.claw.android.ui.lists.NetworkPosts
 import dev.msfjarvis.claw.android.ui.lists.SearchList
@@ -68,7 +66,6 @@ import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
 import dev.msfjarvis.claw.api.LobstersApi
 import dev.msfjarvis.claw.common.comments.CommentsPage
 import dev.msfjarvis.claw.common.comments.HTMLConverter
-import dev.msfjarvis.claw.common.theme.LobstersTheme
 import dev.msfjarvis.claw.common.ui.decorations.ClawAppBar
 import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
 import dev.msfjarvis.claw.common.user.UserProfile
@@ -104,10 +101,6 @@ fun LobstersApp(
 
   val navigationType = ClawNavigationType.fromSize(windowSizeClass.widthSizeClass)
 
-  LobstersTheme(
-    dynamicColor = true,
-    providedValues = arrayOf(LocalUriHandler provides urlLauncher),
-  ) {
   val navItems =
     persistentListOf(
       NavigationItem(
@@ -144,8 +137,6 @@ fun LobstersApp(
       },
     )
 
-    TransparentSystemBars()
-
   Scaffold(
     topBar = {
       if (currentDestination != Destinations.Search.route) {
@@ -295,4 +286,3 @@ fun LobstersApp(
     }
   }
 }
-}

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/TransparentSystemBars.kt

@@ -1,25 +0,0 @@
-/*
- * Copyright © 2023 Harsh Shandilya.
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE file or at
- * https://opensource.org/licenses/MIT.
- */
-package dev.msfjarvis.claw.android.ui.decorations
-
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.ui.graphics.Color
-import com.google.accompanist.systemuicontroller.rememberSystemUiController
-
-@Composable
-fun TransparentSystemBars() {
-  val systemUiController = rememberSystemUiController()
-  val useDarkIcons = !isSystemInDarkTheme()
-
-  DisposableEffect(systemUiController, useDarkIcons) {
-    systemUiController.setSystemBarsColor(color = Color.Transparent, darkIcons = useDarkIcons)
-
-    onDispose {}
-  }
-}

android/src/main/res/values-night/bools.xml

@@ -1,9 +0,0 @@
-<!--
- ~ Copyright © 2021-2023 Harsh Shandilya.
- ~ Use of this source code is governed by an MIT-style
- ~ license that can be found in the LICENSE file or at
- ~ https://opensource.org/licenses/MIT.
- -->
-<resources>
-  <bool name="use_light_status_bar">false</bool>
-</resources>

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

@@ -1,9 +0,0 @@
-<!--
- ~ Copyright © 2021-2023 Harsh Shandilya.
- ~ Use of this source code is governed by an MIT-style
- ~ license that can be found in the LICENSE file or at
- ~ https://opensource.org/licenses/MIT.
- -->
-<resources>
-  <bool name="use_light_status_bar">true</bool>
-</resources>

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

@@ -19,7 +19,5 @@
     <item name="android:windowActionModeOverlay">true</item>
   </style>
 
-  <style name="Theme.Claw" parent="Base.Theme.Claw">
+  <style name="Theme.Claw" parent="Base.Theme.Claw" />
-    <item name="android:windowLightStatusBar">@bool/use_light_status_bar</item>
-  </style>
 </resources>

gradle/libs.versions.toml

@@ -1,5 +1,4 @@
 [versions]
-accompanist = "0.33.0-alpha"
 agp = "8.2.0-alpha16"
 benchmark = "1.2.0-beta03"
 coil = "2.4.0"
@@ -18,8 +17,7 @@ whetstone = "0.6.0"
 workmanager = "2.9.0-alpha02"
 
 [libraries]
-accompanist-sysuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
+androidx-activity-compose = "androidx.activity:activity-compose:1.8.0-alpha06"
-androidx-activity-compose = "androidx.activity:activity-compose:1.7.2"
 androidx-benchmark-macro-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "benchmark" }
 androidx-browser = "androidx.browser:browser:1.6.0"
 androidx-compose-animation = { module = "androidx.compose.animation:animation" }