From d8e137abf93d3f76707eb1957205a464dc1ed2ed Mon Sep 17 00:00:00 2001
From: Myzel394 <50424412+Myzel394@users.noreply.github.com>
Date: Thu, 10 Aug 2023 22:49:49 +0200
Subject: [PATCH] fix: Fix status bar color on scroll; Closes #13

---
 .../java/app/myzel394/alibi/MainActivity.kt   |  7 +++++--
 .../java/app/myzel394/alibi/ui/theme/Theme.kt | 20 ++++++-------------
 app/src/main/res/values/themes.xml            |  8 +++++++-
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/app/myzel394/alibi/MainActivity.kt b/app/src/main/java/app/myzel394/alibi/MainActivity.kt
index e34bd8c..4e277c9 100644
--- a/app/src/main/java/app/myzel394/alibi/MainActivity.kt
+++ b/app/src/main/java/app/myzel394/alibi/MainActivity.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.WindowCompat
 import androidx.datastore.dataStore
 import app.myzel394.alibi.db.AppSettingsSerializer
 import app.myzel394.alibi.ui.Navigation
@@ -16,9 +16,12 @@ val Context.dataStore by dataStore(
     serializer = AppSettingsSerializer()
 )
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+
         setContent {
             AlibiTheme {
                 Navigation()
diff --git a/app/src/main/java/app/myzel394/alibi/ui/theme/Theme.kt b/app/src/main/java/app/myzel394/alibi/ui/theme/Theme.kt
index 004f30b..cd7d180 100644
--- a/app/src/main/java/app/myzel394/alibi/ui/theme/Theme.kt
+++ b/app/src/main/java/app/myzel394/alibi/ui/theme/Theme.kt
@@ -57,21 +57,13 @@ fun AlibiTheme(
     if (!view.isInEditMode) {
         SideEffect {
             val window = (view.context as Activity).window
-            WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
 
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                window.navigationBarColor = colorScheme.background.toArgb()
-                window.statusBarColor = colorScheme.background.toArgb()
-                WindowCompat.getInsetsController(
-                    window,
-                    view
-                ).isAppearanceLightStatusBars = !darkTheme
-                WindowCompat.getInsetsController(
-                    window,
-                    view
-                ).isAppearanceLightNavigationBars = !darkTheme
-            }
+            window.navigationBarColor = colorScheme.background.toArgb()
+            WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = !darkTheme
+            WindowCompat.getInsetsController(
+                window,
+                view
+            ).isAppearanceLightNavigationBars = !darkTheme
         }
     }
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index b10a564..7b1b56d 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <style name="Theme.Alibi" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
+        <!-- Required for transparent status bar -->
+        <!-- Taken from: https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:compose/integration-tests/material-catalog/src/main/res/values/themes.xml -->
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
+
         <item name="android:windowActionModeOverlay">true</item>
         <item name="android:windowContentOverlay">@color/windowBackground</item>
         <item name="android:windowBackground">@color/windowBackground</item>