From 4cc1c0f68b009e255453c9c140acc6d2bf94f268 Mon Sep 17 00:00:00 2001
From: FatttSnake <fatttsnake@gmail.com>
Date: Tue, 26 Mar 2024 18:52:18 +0800
Subject: [PATCH] Optimize - NavigationBarStyle - remove navigation bar white
 background

---
 .../top/fatweb/oxygen/toolbox/MainActivity.kt | 20 +------------------
 .../oxygen/toolbox/ui/OxygenAppState.kt       |  4 ++--
 .../oxygen/toolbox/ui/util/ResourcesUtils.kt  |  2 ++
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/MainActivity.kt b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/MainActivity.kt
index 7e7ac44..4220e0d 100644
--- a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/MainActivity.kt
+++ b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/MainActivity.kt
@@ -2,7 +2,6 @@ package top.fatweb.oxygen.toolbox
 
 import android.content.Context
 import android.os.Bundle
-import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
@@ -96,9 +95,7 @@ class MainActivity : ComponentActivity() {
                         android.graphics.Color.TRANSPARENT,
                         android.graphics.Color.TRANSPARENT
                     ) { darkTheme },
-                    navigationBarStyle = SystemBarStyle.auto(
-                        lightScrim, darkScrim
-                    ) { darkTheme }
+                    navigationBarStyle = SystemBarStyle.dark(android.graphics.Color.TRANSPARENT)
                 )
             }
 
@@ -122,10 +119,7 @@ class MainActivity : ComponentActivity() {
                     OxygenApp(appState)
                 }
             }
-            Log.d(TAG, "onCreate: C")
         }
-
-        Log.d(TAG, "onCreate: D")
     }
 
     @EntryPoint
@@ -189,15 +183,3 @@ private fun whatLaunchPage(
     MainActivityUiState.Loading -> LaunchPageConfig.TOOLS
     is MainActivityUiState.Success -> uiState.userData.launchPageConfig
 }
-
-/**
- * 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)
diff --git a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/OxygenAppState.kt b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/OxygenAppState.kt
index 757b465..afae84d 100644
--- a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/OxygenAppState.kt
+++ b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/OxygenAppState.kt
@@ -63,6 +63,8 @@ class OxygenAppState(
     val navController: NavHostController,
     val launchPageConfig: LaunchPageConfig
 ) {
+    val topLevelDestinations: List<TopLevelDestination> = TopLevelDestination.entries
+
     val currentDestination: NavDestination?
         @Composable get() = navController
             .currentBackStackEntryAsState().value?.destination
@@ -88,8 +90,6 @@ class OxygenAppState(
             started = SharingStarted.WhileSubscribed(5.seconds.inWholeMilliseconds)
         )
 
-    val topLevelDestinations: List<TopLevelDestination> = TopLevelDestination.entries
-
     val currentTimeZone = timeZoneMonitor.currentTimeZone
         .stateIn(
             scope = coroutineScope,
diff --git a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/util/ResourcesUtils.kt b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/util/ResourcesUtils.kt
index 33b164b..ec589fb 100644
--- a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/util/ResourcesUtils.kt
+++ b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/util/ResourcesUtils.kt
@@ -13,6 +13,7 @@ object ResourcesUtils {
 
     fun getDisplayMetrics(context: Context) = context.resources.displayMetrics
 
+    @Suppress("DEPRECATION")
     fun getAppLocale(context: Context): Locale =
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) getConfiguration(context).locales.get(0)
         else getConfiguration(context).locale
@@ -27,6 +28,7 @@ object ResourcesUtils {
             "Unknown"
         }
 
+    @Suppress("DEPRECATION")
     fun getAppVersionCode(context: Context): Long =
         try {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)