From 2bae36fdb9311c23539cc15c21e9d89a318e7f09 Mon Sep 17 00:00:00 2001
From: LittleTurtle2333 <841474544@qq.com>
Date: Fri, 18 Feb 2022 21:38:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7?=
 =?UTF-8?q?=E8=87=B31.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                          |  4 +--
 app/src/main/AndroidManifest.xml              |  1 +
 .../activity/SettingsActivity.kt              | 31 ++++++++++---------
 app/src/main/res/values-night/themes.xml      |  1 -
 app/src/main/res/values/styles.xml            | 10 ++++++
 app/src/main/res/values/themes.xml            |  1 -
 build.gradle.kts                              |  2 +-
 7 files changed, 30 insertions(+), 20 deletions(-)
 delete mode 100644 app/src/main/res/values-night/themes.xml
 create mode 100644 app/src/main/res/values/styles.xml
 delete mode 100644 app/src/main/res/values/themes.xml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d619b027..4fe573d9 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -12,8 +12,8 @@ android {
         applicationId = "com.lt2333.simplicitytools"
         minSdk = 30
         targetSdk = 32
-        versionCode = 10
-        versionName = "1.0.9"
+        versionCode = 11
+        versionName = "1.1.0"
     }
 
     buildTypes {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 612ac5b4..e9b21a37 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
+        android:theme="@style/AppTheme"
         android:supportsRtl="true" >
         <activity
             android:name=".activity.SettingsActivity"
diff --git a/app/src/main/java/com/lt2333/simplicitytools/activity/SettingsActivity.kt b/app/src/main/java/com/lt2333/simplicitytools/activity/SettingsActivity.kt
index 4022e3d0..fc51c49a 100644
--- a/app/src/main/java/com/lt2333/simplicitytools/activity/SettingsActivity.kt
+++ b/app/src/main/java/com/lt2333/simplicitytools/activity/SettingsActivity.kt
@@ -130,21 +130,6 @@ class SettingsActivity : MIUIActivity() {
 
     override fun menuItems(): ArrayList<BaseView> {
         return ArrayList<BaseView>().apply {
-            add(TextSummaryV(textId = R.string.reboot_ui, onClickListener = {
-                MIUIDialog(activity).apply {
-                    setTitle(R.string.Tips)
-                    setMessage("确定重启系统界面？")
-                    setLButton("取消") {
-                        dismiss()
-                    }
-                    setRButton("确定") {
-                        val command = arrayOf("killall com.android.systemui")
-                        ShellUtils.execCommand(command, true)
-                        dismiss()
-                    }
-                    show()
-                }
-            }))
             add(TextSummaryV(textId = R.string.reboot, onClickListener = {
                 MIUIDialog(activity).apply {
                     setTitle(R.string.Tips)
@@ -160,6 +145,22 @@ class SettingsActivity : MIUIActivity() {
                     show()
                 }
             }))
+            add(TextSummaryV(textId = R.string.reboot_ui, onClickListener = {
+                MIUIDialog(activity).apply {
+                    setTitle(R.string.Tips)
+                    setMessage("确定重启系统界面？")
+                    setLButton("取消") {
+                        dismiss()
+                    }
+                    setRButton("确定") {
+                        val command = arrayOf("killall com.android.systemui")
+                        ShellUtils.execCommand(command, true)
+                        dismiss()
+                    }
+                    show()
+                }
+            }))
+
         }
     }
 
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index 6a6931e9..00000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1 +0,0 @@
-<resources />
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
new file mode 100644
index 00000000..a9a49e44
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <style name="AppTheme" parent="android:Theme.Material.Light.NoActionBar">
+
+        <item name="android:textColor">@color/black</item>
+        <item name="android:statusBarColor">@color/white</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
+        <item name="android:forceDarkAllowed" tools:targetApi="Q">true</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
deleted file mode 100644
index 6a6931e9..00000000
--- a/app/src/main/res/values/themes.xml
+++ /dev/null
@@ -1 +0,0 @@
-<resources />
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 1062c4e5..3bf8fd8d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.0.4")
+        classpath("com.android.tools.build:gradle:7.1.1")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
 
         // NOTE: Do not place your application dependencies here; they belong