From e082e74c2d1578b3c095f616b753d8391e9bff59 Mon Sep 17 00:00:00 2001
From: Yang <ychescale9@gmail.com>
Date: Sat, 26 Aug 2023 17:16:51 +1000
Subject: [PATCH] Replace `systemuicontroller` with `enableEdgeToEdge()`, add
 splash theme.

---
 android/app/build.gradle.kts                  |  4 ----
 android/app/src/main/AndroidManifest.xml      |  2 +-
 .../kstreamlined/android/KSActivity.kt        | 19 ++++++++++++++-----
 .../kstreamlined/android/theme/Theme.kt       | 14 --------------
 .../app/src/main/res/values-night/themes.xml  | 11 ++++++-----
 android/app/src/main/res/values/themes.xml    | 13 ++++++++-----
 gradle/libs.versions.toml                     |  1 -
 7 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 2a25e7ef..7577b7d9 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -241,10 +241,6 @@ dependencies {
     implementation(libs.androidx.coreSplashscreen)
     implementation(libs.androidx.profileinstaller)
 
-    // TODO move to design module
-    // Compose companion libraries
-    implementation(libs.accompanist.systemUiController)
-
     // Hilt
     implementation(libs.hilt.android)
     kapt(libs.hilt.compiler)
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 194c5a74..0adc2599 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.KS">
+        android:theme="@style/Theme.KS.Splash">
 
         <profileable
             android:shell="true"
diff --git a/android/app/src/main/java/io/github/reactivecircus/kstreamlined/android/KSActivity.kt b/android/app/src/main/java/io/github/reactivecircus/kstreamlined/android/KSActivity.kt
index 5862b545..2bc661c1 100644
--- a/android/app/src/main/java/io/github/reactivecircus/kstreamlined/android/KSActivity.kt
+++ b/android/app/src/main/java/io/github/reactivecircus/kstreamlined/android/KSActivity.kt
@@ -3,11 +3,15 @@ package io.github.reactivecircus.kstreamlined.android
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.toArgb
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.core.view.WindowCompat
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.reactivecircus.kstreamlined.android.theme.KSTheme
 
@@ -15,15 +19,20 @@ import io.github.reactivecircus.kstreamlined.android.theme.KSTheme
 class KSActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
         installSplashScreen()
 
-        // configure edge-to-edge window insets
-        WindowCompat.setDecorFitsSystemWindows(window, false)
+        super.onCreate(savedInstanceState)
+
+        enableEdgeToEdge()
 
         setContent {
             KSTheme {
+                val darkTheme = isSystemInDarkTheme()
+                val navigationBarColor = MaterialTheme.colorScheme.background.toArgb()
+                LaunchedEffect(darkTheme) {
+                    window.navigationBarColor = navigationBarColor
+                }
+
                 Surface(
                     modifier = Modifier.fillMaxSize(),
                 ) {
diff --git a/android/app/src/main/java/io/github/reactivecircus/kstreamlined/android/theme/Theme.kt b/android/app/src/main/java/io/github/reactivecircus/kstreamlined/android/theme/Theme.kt
index 149933b6..30d16a7f 100644
--- a/android/app/src/main/java/io/github/reactivecircus/kstreamlined/android/theme/Theme.kt
+++ b/android/app/src/main/java/io/github/reactivecircus/kstreamlined/android/theme/Theme.kt
@@ -5,10 +5,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalInspectionMode
-import com.google.accompanist.systemuicontroller.rememberSystemUiController
 
 // TODO define color scheme
 
@@ -40,15 +37,4 @@ fun KSTheme(
         colorScheme = colorScheme,
         content = content,
     )
-
-    if (!LocalInspectionMode.current) {
-        val useDarkIcons = !darkTheme
-        val systemUiController = rememberSystemUiController()
-        SideEffect {
-            systemUiController.apply {
-                setStatusBarColor(Color.Transparent, darkIcons = useDarkIcons)
-                setNavigationBarColor(colorScheme.background, darkIcons = useDarkIcons)
-            }
-        }
-    }
 }
diff --git a/android/app/src/main/res/values-night/themes.xml b/android/app/src/main/res/values-night/themes.xml
index e7d88c03..4057d164 100644
--- a/android/app/src/main/res/values-night/themes.xml
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -1,7 +1,8 @@
-<resources>
-    <!-- Base application theme. -->
-    <style name="KS" parent="android:Theme.Material.NoActionBar">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
+<resources  xmlns:tools="http://schemas.android.com/tools">
+    <style name="Theme.KS.Splash" parent="Theme.SplashScreen">
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="27">false</item>>
+        <item name="windowSplashScreenBackground">#070426</item>
+        <item name="postSplashScreenTheme">@style/Theme.KS</item>
     </style>
 </resources>
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index 9f5dcab6..67dd70bc 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -1,7 +1,10 @@
-<resources>
-    <!-- Base application theme. -->
-    <style name="Theme.KS" parent="android:Theme.Material.Light.NoActionBar">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <style name="Theme.KS" parent="android:Theme.Material.Light.NoActionBar"/>
+
+    <style name="Theme.KS.Splash" parent="Theme.SplashScreen">
+        <item name="android:windowLightStatusBar" >true</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>>
+        <item name="windowSplashScreenBackground">#E7DBFF</item>
+        <item name="postSplashScreenTheme">@style/Theme.KS</item>
     </style>
 </resources>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fa4084f6..7106652d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -113,7 +113,6 @@ androidx-espresso-intents = { module = "androidx.test.espresso:espresso-intents"
 accompanist-insetsUi = { module = "com.google.accompanist:accompanist-insets-ui", version.ref = "accompanist" }
 accompanist-placeholder = { module = "com.google.accompanist:accompanist-placeholder-material", version.ref = "accompanist" }
 accompanist-swipeRefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" }
-accompanist-systemUiController = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
 accompanist-navigationAnimation = { module = "com.google.accompanist:accompanist-navigation-animation", version.ref = "accompanist" }
 accompanist-navigationMaterial = { module = "com.google.accompanist:accompanist-navigation-material", version.ref = "accompanist" }
 accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" }