From 0594352859acca6682b121af4391d6a028370209 Mon Sep 17 00:00:00 2001
From: Fankesyooni <qzmmcn@163.com>
Date: Wed, 16 Feb 2022 03:35:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E8=B5=84=E6=BA=90=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |   1 +
 .../com/fankes/tsbattery/ui/MainActivity.kt   |   4 +-
 .../{dark_round.xml => bg_dark_round.xml}     |   0
 ...otion_round.xml => bg_permotion_round.xml} |   0
 .../{button_round.xml => bg_button_round.xml} |   0
 .../{dark_round.xml => bg_dark_round.xml}     |   0
 .../{green_round.xml => bg_green_round.xml}   |   0
 ...otion_round.xml => bg_permotion_round.xml} |   0
 .../{red_round.xml => bg_red_round.xml}       |   0
 .../{white_round.xml => bg_white_round.xml}   |   0
 app/src/main/res/layout/activity_main.xml     |  58 +++++++++---------
 .../{qr_pay.png => bg_qr_pay.png}             | Bin
 .../mipmap-xxhdpi/{about.png => ic_about.png} | Bin
 .../{qq_icon.png => ic_qq_icon.png}           | Bin
 .../{shot_icon.png => ic_shot_icon.png}       | Bin
 .../{succcess.png => ic_success.png}          | Bin
 .../{tim_icon.png => ic_tim_icon.png}         | Bin
 .../mipmap-xxhdpi/{warn.png => ic_warn.png}   | Bin
 .../{wechat_icon.png => ic_wechat_icon.png}   | Bin
 19 files changed, 32 insertions(+), 31 deletions(-)
 rename app/src/main/res/drawable-night/{dark_round.xml => bg_dark_round.xml} (100%)
 rename app/src/main/res/drawable-night/{permotion_round.xml => bg_permotion_round.xml} (100%)
 rename app/src/main/res/drawable/{button_round.xml => bg_button_round.xml} (100%)
 rename app/src/main/res/drawable/{dark_round.xml => bg_dark_round.xml} (100%)
 rename app/src/main/res/drawable/{green_round.xml => bg_green_round.xml} (100%)
 rename app/src/main/res/drawable/{permotion_round.xml => bg_permotion_round.xml} (100%)
 rename app/src/main/res/drawable/{red_round.xml => bg_red_round.xml} (100%)
 rename app/src/main/res/drawable/{white_round.xml => bg_white_round.xml} (100%)
 rename app/src/main/res/mipmap-xxhdpi/{qr_pay.png => bg_qr_pay.png} (100%)
 rename app/src/main/res/mipmap-xxhdpi/{about.png => ic_about.png} (100%)
 rename app/src/main/res/mipmap-xxhdpi/{qq_icon.png => ic_qq_icon.png} (100%)
 rename app/src/main/res/mipmap-xxhdpi/{shot_icon.png => ic_shot_icon.png} (100%)
 rename app/src/main/res/mipmap-xxhdpi/{succcess.png => ic_success.png} (100%)
 rename app/src/main/res/mipmap-xxhdpi/{tim_icon.png => ic_tim_icon.png} (100%)
 rename app/src/main/res/mipmap-xxhdpi/{warn.png => ic_warn.png} (100%)
 rename app/src/main/res/mipmap-xxhdpi/{wechat_icon.png => ic_wechat_icon.png} (100%)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index bc08671..496c263 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,6 +4,7 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="app/src/main/res/drawable-v24/dark_round.xml" value="0.4482051282051282" />
+        <entry key="app/src/main/res/drawable/bg_permotion_round.xml" value="0.2495" />
         <entry key="app/src/main/res/drawable/button_round.xml" value="0.44871794871794873" />
         <entry key="app/src/main/res/drawable/dark_round.xml" value="0.4482051282051282" />
         <entry key="app/src/main/res/drawable/permotion_round.xml" value="0.4482051282051282" />
diff --git a/app/src/main/java/com/fankes/tsbattery/ui/MainActivity.kt b/app/src/main/java/com/fankes/tsbattery/ui/MainActivity.kt
index 198bd2c..6333e14 100644
--- a/app/src/main/java/com/fankes/tsbattery/ui/MainActivity.kt
+++ b/app/src/main/java/com/fankes/tsbattery/ui/MainActivity.kt
@@ -85,8 +85,8 @@ class MainActivity : AppCompatActivity() {
         }
         /** 判断 Hook 状态 */
         if (isHooked()) {
-            findViewById<LinearLayout>(R.id.main_lin_status).setBackgroundResource(R.drawable.green_round)
-            findViewById<ImageFilterView>(R.id.main_img_status).setImageResource(R.mipmap.succcess)
+            findViewById<LinearLayout>(R.id.main_lin_status).setBackgroundResource(R.drawable.bg_green_round)
+            findViewById<ImageFilterView>(R.id.main_img_status).setImageResource(R.mipmap.ic_success)
             findViewById<TextView>(R.id.main_text_status).text = "模块已激活"
             /** 写入激活的模块版本 */
             modulePrefs.putString(ENABLE_MODULE_VERSION, moduleVersion)
diff --git a/app/src/main/res/drawable-night/dark_round.xml b/app/src/main/res/drawable-night/bg_dark_round.xml
similarity index 100%
rename from app/src/main/res/drawable-night/dark_round.xml
rename to app/src/main/res/drawable-night/bg_dark_round.xml
diff --git a/app/src/main/res/drawable-night/permotion_round.xml b/app/src/main/res/drawable-night/bg_permotion_round.xml
similarity index 100%
rename from app/src/main/res/drawable-night/permotion_round.xml
rename to app/src/main/res/drawable-night/bg_permotion_round.xml
diff --git a/app/src/main/res/drawable/button_round.xml b/app/src/main/res/drawable/bg_button_round.xml
similarity index 100%
rename from app/src/main/res/drawable/button_round.xml
rename to app/src/main/res/drawable/bg_button_round.xml
diff --git a/app/src/main/res/drawable/dark_round.xml b/app/src/main/res/drawable/bg_dark_round.xml
similarity index 100%
rename from app/src/main/res/drawable/dark_round.xml
rename to app/src/main/res/drawable/bg_dark_round.xml
diff --git a/app/src/main/res/drawable/green_round.xml b/app/src/main/res/drawable/bg_green_round.xml
similarity index 100%
rename from app/src/main/res/drawable/green_round.xml
rename to app/src/main/res/drawable/bg_green_round.xml
diff --git a/app/src/main/res/drawable/permotion_round.xml b/app/src/main/res/drawable/bg_permotion_round.xml
similarity index 100%
rename from app/src/main/res/drawable/permotion_round.xml
rename to app/src/main/res/drawable/bg_permotion_round.xml
diff --git a/app/src/main/res/drawable/red_round.xml b/app/src/main/res/drawable/bg_red_round.xml
similarity index 100%
rename from app/src/main/res/drawable/red_round.xml
rename to app/src/main/res/drawable/bg_red_round.xml
diff --git a/app/src/main/res/drawable/white_round.xml b/app/src/main/res/drawable/bg_white_round.xml
similarity index 100%
rename from app/src/main/res/drawable/white_round.xml
rename to app/src/main/res/drawable/bg_white_round.xml
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b7f33a2..a3ac5e9 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -36,7 +36,7 @@
         android:layout_marginTop="10dp"
         android:layout_marginRight="15dp"
         android:layout_marginBottom="5dp"
-        android:background="@drawable/dark_round"
+        android:background="@drawable/bg_dark_round"
         android:elevation="0dp"
         android:gravity="center">
 
@@ -46,7 +46,7 @@
             android:layout_height="25dp"
             android:layout_marginStart="25dp"
             android:layout_marginEnd="5dp"
-            android:src="@mipmap/warn"
+            android:src="@mipmap/ic_warn"
             android:tint="@color/white" />
 
         <LinearLayout
@@ -88,7 +88,7 @@
                     android:layout_width="15dp"
                     android:layout_height="15dp"
                     android:layout_marginEnd="5dp"
-                    android:src="@mipmap/qq_icon" />
+                    android:src="@mipmap/ic_qq_icon" />
 
                 <TextView
                     android:id="@+id/main_text_qq_noinstall"
@@ -96,7 +96,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="3dp"
                     android:alpha="0.8"
-                    android:background="@drawable/red_round"
+                    android:background="@drawable/bg_red_round"
                     android:paddingLeft="2dp"
                     android:paddingTop="1dp"
                     android:paddingRight="2dp"
@@ -138,7 +138,7 @@
                     android:layout_width="15dp"
                     android:layout_height="15dp"
                     android:layout_marginEnd="5dp"
-                    android:src="@mipmap/tim_icon" />
+                    android:src="@mipmap/ic_tim_icon" />
 
                 <TextView
                     android:id="@+id/main_text_tim_noinstall"
@@ -146,7 +146,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="3dp"
                     android:alpha="0.8"
-                    android:background="@drawable/red_round"
+                    android:background="@drawable/bg_red_round"
                     android:paddingLeft="2dp"
                     android:paddingTop="1dp"
                     android:paddingRight="2dp"
@@ -187,7 +187,7 @@
                     android:layout_width="15dp"
                     android:layout_height="15dp"
                     android:layout_marginEnd="5dp"
-                    android:src="@mipmap/wechat_icon" />
+                    android:src="@mipmap/ic_wechat_icon" />
 
                 <TextView
                     android:id="@+id/main_text_wechat_noinstall"
@@ -195,7 +195,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="3dp"
                     android:alpha="0.8"
-                    android:background="@drawable/red_round"
+                    android:background="@drawable/bg_red_round"
                     android:paddingLeft="2dp"
                     android:paddingTop="1dp"
                     android:paddingRight="2dp"
@@ -247,7 +247,7 @@
                 android:layout_marginLeft="15dp"
                 android:layout_marginTop="10dp"
                 android:layout_marginRight="15dp"
-                android:background="@drawable/permotion_round"
+                android:background="@drawable/bg_permotion_round"
                 android:elevation="0dp"
                 android:gravity="center"
                 android:orientation="horizontal"
@@ -258,7 +258,7 @@
                     android:layout_height="15dp"
                     android:layout_marginEnd="15dp"
                     android:alpha="0.85"
-                    android:src="@mipmap/about"
+                    android:src="@mipmap/ic_about"
                     android:tint="@color/colorTextDark" />
 
                 <TextView
@@ -278,7 +278,7 @@
                 android:layout_marginLeft="15dp"
                 android:layout_marginTop="10dp"
                 android:layout_marginRight="15dp"
-                android:background="@drawable/permotion_round"
+                android:background="@drawable/bg_permotion_round"
                 android:elevation="0dp"
                 android:gravity="center"
                 android:orientation="vertical"
@@ -294,13 +294,13 @@
                         android:layout_width="15dp"
                         android:layout_height="15dp"
                         android:layout_marginEnd="5dp"
-                        android:src="@mipmap/qq_icon" />
+                        android:src="@mipmap/ic_qq_icon" />
 
                     <ImageView
                         android:layout_width="15dp"
                         android:layout_height="15dp"
                         android:layout_marginEnd="10dp"
-                        android:src="@mipmap/tim_icon" />
+                        android:src="@mipmap/ic_tim_icon" />
 
                     <TextView
                         android:layout_width="match_parent"
@@ -372,7 +372,7 @@
                 android:layout_marginLeft="15dp"
                 android:layout_marginTop="10dp"
                 android:layout_marginRight="15dp"
-                android:background="@drawable/permotion_round"
+                android:background="@drawable/bg_permotion_round"
                 android:elevation="0dp"
                 android:gravity="center"
                 android:orientation="vertical"
@@ -388,7 +388,7 @@
                         android:layout_width="15dp"
                         android:layout_height="15dp"
                         android:layout_marginEnd="10dp"
-                        android:src="@mipmap/wechat_icon" />
+                        android:src="@mipmap/ic_wechat_icon" />
 
                     <TextView
                         android:layout_width="match_parent"
@@ -424,7 +424,7 @@
                 android:layout_marginLeft="15dp"
                 android:layout_marginTop="10dp"
                 android:layout_marginRight="15dp"
-                android:background="@drawable/permotion_round"
+                android:background="@drawable/bg_permotion_round"
                 android:elevation="0dp"
                 android:gravity="center"
                 android:orientation="vertical"
@@ -440,7 +440,7 @@
                         android:layout_width="15dp"
                         android:layout_height="15dp"
                         android:layout_marginEnd="10dp"
-                        android:src="@mipmap/shot_icon" />
+                        android:src="@mipmap/ic_shot_icon" />
 
                     <TextView
                         android:layout_width="match_parent"
@@ -462,7 +462,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginEnd="5dp"
                         android:layout_weight="1"
-                        android:background="@drawable/button_round"
+                        android:background="@drawable/bg_button_round"
                         android:gravity="center"
                         android:padding="10dp"
                         android:singleLine="true"
@@ -476,7 +476,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginEnd="5dp"
                         android:layout_weight="1"
-                        android:background="@drawable/button_round"
+                        android:background="@drawable/bg_button_round"
                         android:gravity="center"
                         android:padding="10dp"
                         android:singleLine="true"
@@ -489,7 +489,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:background="@drawable/button_round"
+                        android:background="@drawable/bg_button_round"
                         android:gravity="center"
                         android:padding="10dp"
                         android:singleLine="true"
@@ -505,7 +505,7 @@
                 android:layout_marginLeft="15dp"
                 android:layout_marginTop="15dp"
                 android:layout_marginRight="15dp"
-                android:background="@drawable/permotion_round"
+                android:background="@drawable/bg_permotion_round"
                 android:elevation="0dp"
                 android:gravity="center"
                 android:orientation="vertical"
@@ -537,7 +537,7 @@
                 android:layout_marginLeft="15dp"
                 android:layout_marginTop="15dp"
                 android:layout_marginRight="15dp"
-                android:background="@drawable/permotion_round"
+                android:background="@drawable/bg_permotion_round"
                 android:elevation="0dp"
                 android:gravity="center"
                 android:orientation="vertical"
@@ -569,7 +569,7 @@
                 android:layout_marginLeft="15dp"
                 android:layout_marginTop="15dp"
                 android:layout_marginRight="15dp"
-                android:background="@drawable/permotion_round"
+                android:background="@drawable/bg_permotion_round"
                 android:elevation="0dp"
                 android:gravity="center"
                 android:orientation="vertical"
@@ -586,7 +586,7 @@
                         android:layout_height="15dp"
                         android:layout_marginEnd="5dp"
                         android:alpha="0.85"
-                        android:src="@mipmap/about"
+                        android:src="@mipmap/ic_about"
                         android:tint="@color/colorTextGray" />
 
                     <TextView
@@ -686,7 +686,7 @@
                 android:layout_marginLeft="15dp"
                 android:layout_marginTop="15dp"
                 android:layout_marginRight="15dp"
-                android:background="@drawable/permotion_round"
+                android:background="@drawable/bg_permotion_round"
                 android:elevation="0dp"
                 android:gravity="center"
                 android:orientation="vertical"
@@ -703,7 +703,7 @@
                         android:layout_height="15dp"
                         android:layout_marginEnd="5dp"
                         android:alpha="0.85"
-                        android:src="@mipmap/about"
+                        android:src="@mipmap/ic_about"
                         android:tint="@color/colorTextGray" />
 
                     <TextView
@@ -733,7 +733,7 @@
                 android:layout_marginTop="15dp"
                 android:layout_marginRight="15dp"
                 android:layout_marginBottom="10dp"
-                android:background="@drawable/permotion_round"
+                android:background="@drawable/bg_permotion_round"
                 android:elevation="0dp"
                 android:gravity="center"
                 android:orientation="vertical"
@@ -762,7 +762,7 @@
                     <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:src="@mipmap/qr_pay" />
+                        android:src="@mipmap/bg_qr_pay" />
                 </androidx.cardview.widget.CardView>
 
                 <TextView
@@ -783,7 +783,7 @@
                 android:layout_marginRight="15dp"
                 android:layout_marginBottom="10dp"
                 android:autoLink="web"
-                android:background="@drawable/permotion_round"
+                android:background="@drawable/bg_permotion_round"
                 android:lineSpacingExtra="6dp"
                 android:padding="10dp"
                 android:text="此模块使用 YukiHookAPI 构建。\n点击这里了解更多 https://github.com/fankes/YukiHookAPI"
diff --git a/app/src/main/res/mipmap-xxhdpi/qr_pay.png b/app/src/main/res/mipmap-xxhdpi/bg_qr_pay.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/qr_pay.png
rename to app/src/main/res/mipmap-xxhdpi/bg_qr_pay.png
diff --git a/app/src/main/res/mipmap-xxhdpi/about.png b/app/src/main/res/mipmap-xxhdpi/ic_about.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/about.png
rename to app/src/main/res/mipmap-xxhdpi/ic_about.png
diff --git a/app/src/main/res/mipmap-xxhdpi/qq_icon.png b/app/src/main/res/mipmap-xxhdpi/ic_qq_icon.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/qq_icon.png
rename to app/src/main/res/mipmap-xxhdpi/ic_qq_icon.png
diff --git a/app/src/main/res/mipmap-xxhdpi/shot_icon.png b/app/src/main/res/mipmap-xxhdpi/ic_shot_icon.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/shot_icon.png
rename to app/src/main/res/mipmap-xxhdpi/ic_shot_icon.png
diff --git a/app/src/main/res/mipmap-xxhdpi/succcess.png b/app/src/main/res/mipmap-xxhdpi/ic_success.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/succcess.png
rename to app/src/main/res/mipmap-xxhdpi/ic_success.png
diff --git a/app/src/main/res/mipmap-xxhdpi/tim_icon.png b/app/src/main/res/mipmap-xxhdpi/ic_tim_icon.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/tim_icon.png
rename to app/src/main/res/mipmap-xxhdpi/ic_tim_icon.png
diff --git a/app/src/main/res/mipmap-xxhdpi/warn.png b/app/src/main/res/mipmap-xxhdpi/ic_warn.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/warn.png
rename to app/src/main/res/mipmap-xxhdpi/ic_warn.png
diff --git a/app/src/main/res/mipmap-xxhdpi/wechat_icon.png b/app/src/main/res/mipmap-xxhdpi/ic_wechat_icon.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/wechat_icon.png
rename to app/src/main/res/mipmap-xxhdpi/ic_wechat_icon.png