From e12cfb9617d8af8441a90fa78233291781e9fdaf Mon Sep 17 00:00:00 2001
From: Super12138 <70494801+Super12138@users.noreply.github.com>
Date: Sun, 9 Jun 2024 22:54:54 +0800
Subject: [PATCH] Edge to edge optimization

---
 .../main/kotlin/cn/super12138/todo/views/BaseActivity.kt | 9 ++++++++-
 .../cn/super12138/todo/views/crash/CrashActivity.kt      | 4 ----
 app/src/main/res/values/themes.xml                       | 1 +
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt b/app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt
index 98e1b14..e81727d 100644
--- a/app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt
@@ -3,11 +3,14 @@ package cn.super12138.todo.views
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
+import android.view.View
 import android.view.WindowManager
 import androidx.activity.SystemBarStyle
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
 import androidx.viewbinding.ViewBinding
 import cn.super12138.todo.constant.GlobalValues
 import com.google.android.material.internal.EdgeToEdgeUtils
@@ -18,8 +21,12 @@ abstract class BaseActivity<T : ViewBinding> : AppCompatActivity() {
         /*if (GlobalValues.springFestivalTheme) {
             setTheme(R.style.Theme_SpringFestival)
         }*/
-        enableEdgeToEdge(navigationBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT))
+        // enableEdgeToEdge(navigationBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT))
         super.onCreate(savedInstanceState)
+
+        // 确保 Navigation Bar 区域会被显示
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+
         binding = getViewBinding()
         setContentView(binding.root)
 
diff --git a/app/src/main/kotlin/cn/super12138/todo/views/crash/CrashActivity.kt b/app/src/main/kotlin/cn/super12138/todo/views/crash/CrashActivity.kt
index 46b6237..02790d8 100644
--- a/app/src/main/kotlin/cn/super12138/todo/views/crash/CrashActivity.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/views/crash/CrashActivity.kt
@@ -2,10 +2,6 @@ package cn.super12138.todo.views.crash
 
 import android.os.Build
 import android.os.Bundle
-import android.view.ViewGroup
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.updateLayoutParams
 import cn.super12138.todo.databinding.ActivityCrashBinding
 import cn.super12138.todo.utils.VersionUtils
 import cn.super12138.todo.utils.VibrationUtils
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 820e500..f64d98c 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -55,6 +55,7 @@
 
     <style name="Theme.ToDo" parent="Base.Theme.ToDo">
         <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentNavigation">true</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
     </style>