From 329b34132532791734a4f6da53e04aafab70d2e6 Mon Sep 17 00:00:00 2001
From: Super12138 <70494801+Super12138@users.noreply.github.com>
Date: Sun, 19 May 2024 20:09:35 +0800
Subject: [PATCH] Enable edge to edge

---
 .../cn/super12138/todo/views/BaseActivity.kt     |  6 ++++--
 app/src/main/res/values-v23/themes.xml           | 16 ----------------
 app/src/main/res/values/themes.xml               | 12 +++++++++++-
 3 files changed, 15 insertions(+), 19 deletions(-)
 delete mode 100644 app/src/main/res/values-v23/themes.xml

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 cd5be81..443667b 100644
--- a/app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt
@@ -3,6 +3,8 @@ package cn.super12138.todo.views
 import android.os.Build
 import android.os.Bundle
 import android.view.WindowManager
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import cn.super12138.todo.constant.GlobalValues
@@ -11,8 +13,8 @@ open class BaseActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         /*if (GlobalValues.springFestivalTheme) {
             setTheme(R.style.Theme_SpringFestival)
-        }
-        enableEdgeToEdge()*/
+        }*/
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
         // 深色模式
diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml
deleted file mode 100644
index 137b0d1..0000000
--- a/app/src/main/res/values-v23/themes.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<resources>
-
-    <style name="Theme.ToDo" parent="Base.Theme.ToDo">
-        <!-- Transparent system bars for edge-to-edge. -->
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
-    </style>
-
-    <style name="Theme.SpringFestival" parent="Base.Theme.SpringFestival">
-        <!-- Transparent system bars for edge-to-edge. -->
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index cdbce79..820e500 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -53,7 +53,11 @@
         <item name="alertDialogTheme">@style/ToDo.M3AlertDialog</item>
     </style>
 
-    <style name="Theme.ToDo" parent="Base.Theme.ToDo" />
+    <style name="Theme.ToDo" parent="Base.Theme.ToDo">
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
+    </style>
 
     <style name="AppPreferenceThemeOverlay" parent="@style/PreferenceThemeOverlay">
         <item name="switchPreferenceCompatStyle">@style/AppSwitchPreference</item>
@@ -122,4 +126,10 @@
         <item name="preferenceTheme">@style/AppPreferenceThemeOverlay</item>
         <item name="alertDialogTheme">@style/ToDo.M3AlertDialog</item>
     </style>
+    <!--<style name="Theme.SpringFestival" parent="Base.Theme.SpringFestival">
+        &lt;!&ndash; Transparent system bars for edge-to-edge. &ndash;&gt;
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
+    </style>-->
 </resources>
\ No newline at end of file