refactor(m3): remove accompanist systemuicontroller.

GerardPaligot · Oct 12, 2023 · b614092 · b614092
1 parent b672b1c
commit b614092
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 42 deletions.
diff --git a/androidApp/src/main/java/org/gdglille/devfest/android/MainActivity.kt b/androidApp/src/main/java/org/gdglille/devfest/android/MainActivity.kt
@@ -5,8 +5,12 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
-import androidx.appcompat.app.AppCompatActivity
+import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.ui.res.stringResource
 import androidx.core.app.ShareCompat
 import androidx.core.content.FileProvider
@@ -42,7 +46,7 @@ import java.util.Locale
 @FlowPreview
 @ExperimentalSettingsApi
 @ExperimentalCoroutinesApi
-class MainActivity : AppCompatActivity() {
+class MainActivity : ComponentActivity() {
     private lateinit var navController: NavHostController
 
     override fun onNewIntent(intent: Intent?) {
@@ -52,6 +56,7 @@ class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
         val baseUrl = BuildConfig.BASE_URL
         val db = DatabaseWrapper(context = this).createDb()
         val platform = Platform(AndroidContext(this.applicationContext))
@@ -94,6 +99,17 @@ class MainActivity : AppCompatActivity() {
         )
         val openFeedbackState = (application as MainApplication).openFeedbackConfig
         setContent {
+            val inDarkTheme = isSystemInDarkTheme()
+            DisposableEffect(inDarkTheme) {
+                enableEdgeToEdge(
+                    statusBarStyle = SystemBarStyle.auto(
+                        android.graphics.Color.TRANSPARENT,
+                        android.graphics.Color.TRANSPARENT,
+                    ) { inDarkTheme },
+                    navigationBarStyle = SystemBarStyle.auto(lightScrim, darkScrim) { inDarkTheme },
+                )
+                onDispose {}
+            }
             navController = rememberNavController()
             val exportSubject = stringResource(id = R.string.text_export_subject)
             val reportSubject = stringResource(id = R.string.text_report_subject)
@@ -155,6 +171,18 @@ class MainActivity : AppCompatActivity() {
     }
 
     companion object {
+        /**
+         * The default light scrim, as defined by androidx and the platform:
+         * https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:activity/activity/src/main/java/androidx/activity/EdgeToEdge.kt;l=35-38;drc=27e7d52e8604a080133e8b842db10c89b4482598
+         */
+        private val lightScrim = android.graphics.Color.argb(0xe6, 0xFF, 0xFF, 0xFF)
+
+        /**
+         * The default dark scrim, as defined by androidx and the platform:
+         * https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:activity/activity/src/main/java/androidx/activity/EdgeToEdge.kt;l=40-44;drc=27e7d52e8604a080133e8b842db10c89b4482598
+         */
+        private val darkScrim = android.graphics.Color.argb(0x80, 0x1b, 0x1b, 0x1b)
+
         fun create(context: Context) = Intent(context, MainActivity::class.java).apply {
             flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
         }

diff --git a/androidApp/src/main/res/values-night/styles.xml b/androidApp/src/main/res/values-night/styles.xml
@@ -1,11 +1,5 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimary">@color/grey800</item>
-        <item name="colorPrimaryDark">@color/grey800</item>
-        <item name="android:windowBackground">@color/grey800</item>
-        <item name="android:navigationBarColor">@color/grey800</item>
-        <item name="isLightTheme">false</item>
-    </style>
+    <style name="AppTheme" parent="android:Theme.Material.NoActionBar" />
 
 </resources>
diff --git a/androidApp/src/main/res/values/colors.xml b/androidApp/src/main/res/values/colors.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="black">#191919</color>
-    <color name="grey800">#001F24</color>
-    <color name="grey50">#F6FEFF</color>
-    <color name="pink">#E6147C</color>
-    <color name="blue">#03B7D5</color>
 </resources>
diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Devfest Lille</string>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_name" tools:ignore="MissingTranslation">Devfest Lille</string>
 </resources>
diff --git a/androidApp/src/main/res/values/styles.xml b/androidApp/src/main/res/values/styles.xml
@@ -1,12 +1,5 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimary">@color/grey50</item>
-        <item name="colorPrimaryDark">@color/grey50</item>
-        <item name="android:windowBackground">@color/grey50</item>
-        <item name="android:navigationBarColor">@color/grey50</item>
-        <item name="android:statusBarColor">@color/grey50</item>
-        <item name="isLightTheme">true</item>
-    </style>
+    <style name="AppTheme" parent="android:Theme.Material.Light.NoActionBar" />
 
 </resources>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -16,7 +16,7 @@ androidxCamera = "1.2.3"
 androidxProfile = "1.3.1"
 composeBom = "2023.09.00"
 composeCompiler = "1.4.8"
-composeActivity = "1.7.2"
+composeActivity = "1.8.0"
 composeNavigation = "2.7.2"
 composeFont = "1.0.0"
 composeRichText = "0.11.0"
@@ -94,7 +94,6 @@ compose-openfeedback-m3 = { group = "io.openfeedback", name = "feedback-android-
 
 accompanist-placeholder = { group = "com.google.accompanist", name = "accompanist-placeholder-material", version.ref = "accompanist" }
 accompanist-permissions = { group = "com.google.accompanist", name = "accompanist-permissions", version.ref = "accompanist" }
-accompanist-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "accompanist" }
 
 coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" }
 coil-svg = { group = "io.coil-kt", name = "coil-svg", version.ref = "coil" }

diff --git a/theme-m3/main/build.gradle.kts b/theme-m3/main/build.gradle.kts
@@ -28,7 +28,5 @@ dependencies {
     implementation(libs.androidx.compose.runtime)
     implementation(libs.androidx.compose.navigation)
 
-    implementation(libs.accompanist.systemuicontroller)
-
     implementation(libs.kotlinx.collections)
 }
diff --git a/theme-m3/main/src/main/kotlin/org/gdglille/devfest/android/theme/Main.kt b/theme-m3/main/src/main/kotlin/org/gdglille/devfest/android/theme/Main.kt
@@ -1,9 +1,6 @@
 package org.gdglille.devfest.android.theme
 
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.collectAsState
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavHostController
@@ -12,22 +9,21 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.navArgument
 import androidx.navigation.navDeepLink
-import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import io.openfeedback.android.OpenFeedbackConfig
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.FlowPreview
 import org.gdglille.devfest.AlarmScheduler
-import org.gdglille.devfest.android.theme.m3.infos.feature.TicketQrCodeScanner
-import org.gdglille.devfest.android.theme.m3.networking.feature.VCardQrCodeScanner
-import org.gdglille.devfest.android.theme.m3.schedules.feature.AgendaFiltersVM
 import org.gdglille.devfest.android.theme.m3.events.feature.EventListVM
+import org.gdglille.devfest.android.theme.m3.infos.feature.TicketQrCodeScanner
 import org.gdglille.devfest.android.theme.m3.main.Home
-import org.gdglille.devfest.android.theme.m3.partners.feature.PartnerDetailVM
+import org.gdglille.devfest.android.theme.m3.main.HomeResultKey
 import org.gdglille.devfest.android.theme.m3.networking.feature.ProfileInputVM
+import org.gdglille.devfest.android.theme.m3.networking.feature.VCardQrCodeScanner
+import org.gdglille.devfest.android.theme.m3.partners.feature.PartnerDetailVM
+import org.gdglille.devfest.android.theme.m3.schedules.feature.AgendaFiltersVM
 import org.gdglille.devfest.android.theme.m3.schedules.feature.ScheduleDetailVM
 import org.gdglille.devfest.android.theme.m3.speakers.feature.SpeakerDetailVM
 import org.gdglille.devfest.android.theme.m3.style.Conferences4HallTheme
-import org.gdglille.devfest.android.theme.m3.main.HomeResultKey
 import org.gdglille.devfest.models.ExportNetworkingUi
 import org.gdglille.devfest.repositories.AgendaRepository
 import org.gdglille.devfest.repositories.EventRepository
@@ -58,12 +54,6 @@ fun Main(
 ) {
     val rootUri = "c4h://event"
     Conferences4HallTheme {
-        val systemUiController = rememberSystemUiController()
-        val useDarkIcons = !isSystemInDarkTheme()
-        val statusBarColor = MaterialTheme.colorScheme.surface
-        SideEffect {
-            systemUiController.setSystemBarsColor(color = statusBarColor, darkIcons = useDarkIcons)
-        }
         val uiState = viewModel.uiState.collectAsState()
         when (uiState.value) {
             is MainUiState.Success -> {