Owl is laid out edge-to-edge in 2 & 3-button navigation mode

android · Feb 19, 2024 · a1e7c59 · a1e7c59
1 parent c9fbab9
commit a1e7c59
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/Owl/app/src/main/java/com/example/owl/ui/MainActivity.kt b/Owl/app/src/main/java/com/example/owl/ui/MainActivity.kt
@@ -16,28 +16,13 @@
 
 package com.example.owl.ui
 
-import android.graphics.Color
-import android.os.Build
 import android.os.Bundle
 import androidx.activity.ComponentActivity
-import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
-import androidx.core.content.ContextCompat
-import com.example.owl.R
 
 class MainActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        enableEdgeToEdge(
-            statusBarStyle = SystemBarStyle.dark(
-                ContextCompat.getColor(this, R.color.immersive_sys_ui)
-            ),
-            navigationBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)
-        )
-        if (Build.VERSION.SDK_INT >= 29) {
-            window.isNavigationBarContrastEnforced = false
-        }
         super.onCreate(savedInstanceState)
 
         setContent {

diff --git a/Owl/app/src/main/java/com/example/owl/ui/theme/Theme.kt b/Owl/app/src/main/java/com/example/owl/ui/theme/Theme.kt
@@ -16,6 +16,9 @@
 
 package com.example.owl.ui.theme
 
+import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material.Colors
 import androidx.compose.material.MaterialTheme
@@ -26,7 +29,9 @@ import androidx.compose.material.lightColors
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
+import androidx.core.content.ContextCompat
 import com.example.owl.R
 
 private val YellowThemeLight = lightColors(
@@ -125,6 +130,17 @@ private fun OwlTheme(
     colors: Colors,
     content: @Composable () -> Unit
 ) {
+    val transparent = android.graphics.Color.TRANSPARENT
+    val activity = LocalContext.current as ComponentActivity
+    activity.enableEdgeToEdge(
+        statusBarStyle = SystemBarStyle.dark(
+            ContextCompat.getColor(activity, R.color.immersive_sys_ui)
+        ),
+        navigationBarStyle = if (darkTheme)
+            SystemBarStyle.dark(transparent)
+        else
+            SystemBarStyle.light(transparent, transparent)
+    )
     val elevation = if (darkTheme) DarkElevation else LightElevation
     val images = if (darkTheme) DarkImages else LightImages
     CompositionLocalProvider(