From af9baa8ce44bf59726c0cd2929ac4bcfd5e85d29 Mon Sep 17 00:00:00 2001
From: Lokesh Gidra <lokeshgidra@google.com>
Date: Thu, 9 Nov 2023 19:01:31 +0800
Subject: [PATCH] Convert to use enableEdgeToEdge

---
 .../main/kotlin/com/hippo/ehviewer/ui/ConfigureActivity.kt | 2 --
 app/src/main/kotlin/com/hippo/ehviewer/ui/EhActivity.kt    | 5 ++---
 app/src/main/kotlin/com/hippo/ehviewer/ui/MainActivity.kt  | 2 --
 app/src/main/res/values/themes.xml                         | 7 -------
 4 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/ConfigureActivity.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/ConfigureActivity.kt
index aa3ba6c4d..d1a5a0dda 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/ConfigureActivity.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/ConfigureActivity.kt
@@ -13,7 +13,6 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.core.view.WindowCompat
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.ui.destinations.BaseScreenDestination
@@ -29,7 +28,6 @@ import com.ramcosta.composedestinations.rememberNavHostEngine
 class ConfigureActivity : EhActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        WindowCompat.setDecorFitsSystemWindows(window, false)
         val rootNavGraphDefaultAnimations = RootNavGraphDefaultAnimations(
             enterTransition = { slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up, tween(200)) },
             exitTransition = { fadeOut(tween(200)) },
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/EhActivity.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/EhActivity.kt
index 2e48bdac9..2bfce2bcb 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/EhActivity.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/EhActivity.kt
@@ -17,9 +17,9 @@ package com.hippo.ehviewer.ui
 
 import android.content.res.Resources.Theme
 import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
 import androidx.annotation.StyleRes
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.WindowCompat
 import androidx.navigation.ActivityNavigator
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
@@ -43,8 +43,7 @@ abstract class EhActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars = !isNightMode()
-        WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightNavigationBars = !isNightMode()
+        enableEdgeToEdge()
     }
 
     override fun onResume() {
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/MainActivity.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/MainActivity.kt
index ecb2c9e22..f702195f4 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/MainActivity.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/MainActivity.kt
@@ -71,7 +71,6 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidViewBinding
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.ViewCompat
-import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavController
@@ -229,7 +228,6 @@ class MainActivity : EhActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         installSplashScreen()
         super.onCreate(savedInstanceState)
-        WindowCompat.setDecorFitsSystemWindows(window, false)
         setMD3Content {
             val configuration = LocalConfiguration.current
             val dialogState = LocalDialogState.current
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 41b5bcc2e..f7cbb69d8 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -28,13 +28,6 @@
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
 
-        <!-- Transparent Status Bar -->
-        <item name="android:statusBarColor">@android:color/transparent</item>
-
-        <!-- Transparent Navigation Bar -->
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item>
-
         <!-- Apply blur on Android 12 above -->
         <item name="materialCalendarTheme">@style/MaterialCalendarTheme</item>
         <item name="bottomSheetDialogTheme">@style/BottomSheetDialogTheme</item>