From 07c52eb10a87172604c5357b6b65091bcad33d70 Mon Sep 17 00:00:00 2001
From: Fankesyooni <qzmmcn@163.com>
Date: Sat, 19 Mar 2022 01:40:28 +0800
Subject: [PATCH] Merge code

---
 app/src/main/AndroidManifest.xml                 |  4 ++--
 .../tsbattery/ui/{ => activity}/MainActivity.kt  |  2 +-
 .../tsbattery/{ => ui}/view/MaterialSwitch.kt    |  2 +-
 app/src/main/res/layout/activity_main.xml        | 16 ++++++++--------
 4 files changed, 12 insertions(+), 12 deletions(-)
 rename app/src/main/java/com/fankes/tsbattery/ui/{ => activity}/MainActivity.kt (99%)
 rename app/src/main/java/com/fankes/tsbattery/{ => ui}/view/MaterialSwitch.kt (98%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 92d4885..10671ea 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -33,7 +33,7 @@
             android:value="93" />
 
         <activity
-            android:name="com.fankes.tsbattery.ui.MainActivity"
+            android:name="com.fankes.tsbattery.ui.activity.MainActivity"
             android:exported="true"
             android:screenOrientation="behind">
 
@@ -49,7 +49,7 @@
             android:exported="true"
             android:label="@string/app_name"
             android:screenOrientation="behind"
-            android:targetActivity="com.fankes.tsbattery.ui.MainActivity">
+            android:targetActivity="com.fankes.tsbattery.ui.activity.MainActivity">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/fankes/tsbattery/ui/MainActivity.kt b/app/src/main/java/com/fankes/tsbattery/ui/activity/MainActivity.kt
similarity index 99%
rename from app/src/main/java/com/fankes/tsbattery/ui/MainActivity.kt
rename to app/src/main/java/com/fankes/tsbattery/ui/activity/MainActivity.kt
index ea321e3..b836393 100644
--- a/app/src/main/java/com/fankes/tsbattery/ui/MainActivity.kt
+++ b/app/src/main/java/com/fankes/tsbattery/ui/activity/MainActivity.kt
@@ -21,7 +21,7 @@
  */
 @file:Suppress("SetTextI18n", "LocalVariableName", "SameParameterValue")
 
-package com.fankes.tsbattery.ui
+package com.fankes.tsbattery.ui.activity
 
 import android.content.ComponentName
 import android.content.Intent
diff --git a/app/src/main/java/com/fankes/tsbattery/view/MaterialSwitch.kt b/app/src/main/java/com/fankes/tsbattery/ui/view/MaterialSwitch.kt
similarity index 98%
rename from app/src/main/java/com/fankes/tsbattery/view/MaterialSwitch.kt
rename to app/src/main/java/com/fankes/tsbattery/ui/view/MaterialSwitch.kt
index 824cbe8..fe8acd3 100644
--- a/app/src/main/java/com/fankes/tsbattery/view/MaterialSwitch.kt
+++ b/app/src/main/java/com/fankes/tsbattery/ui/view/MaterialSwitch.kt
@@ -21,7 +21,7 @@
  */
 @file:Suppress("SameParameterValue")
 
-package com.fankes.tsbattery.view
+package com.fankes.tsbattery.ui.view
 
 import android.content.Context
 import android.content.res.ColorStateList
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index e59204b..e9e4b33 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:background="@color/colorThemeBackground"
     android:orientation="vertical"
-    tools:context=".ui.MainActivity"
+    tools:context=".ui.activity.MainActivity"
     tools:ignore="HardcodedText,UseCompoundDrawables,ContentDescription,TooManyViews">
 
     <LinearLayout
@@ -324,7 +324,7 @@
                         android:textSize="12sp" />
                 </LinearLayout>
 
-                <com.fankes.tsbattery.view.MaterialSwitch
+                <com.fankes.tsbattery.ui.view.MaterialSwitch
                     android:id="@+id/qqtim_protect_mode_switch"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -342,7 +342,7 @@
                     android:textColor="@color/colorTextDark"
                     android:textSize="12sp" />
 
-                <com.fankes.tsbattery.view.MaterialSwitch
+                <com.fankes.tsbattery.ui.view.MaterialSwitch
                     android:id="@+id/shut_core_sv_qqtim_switch"
                     android:layout_width="match_parent"
                     android:layout_height="35dp"
@@ -361,7 +361,7 @@
                     android:textColor="@color/colorTextDark"
                     android:textSize="12sp" />
 
-                <com.fankes.tsbattery.view.MaterialSwitch
+                <com.fankes.tsbattery.ui.view.MaterialSwitch
                     android:id="@+id/shut_core_sv_kn_qqtim_switch"
                     android:layout_width="match_parent"
                     android:layout_height="35dp"
@@ -414,7 +414,7 @@
                         android:textSize="12sp" />
                 </LinearLayout>
 
-                <com.fankes.tsbattery.view.MaterialSwitch
+                <com.fankes.tsbattery.ui.view.MaterialSwitch
                     android:id="@+id/disable_wechat_sv_switch"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -526,7 +526,7 @@
                 android:paddingLeft="15dp"
                 android:paddingRight="15dp">
 
-                <com.fankes.tsbattery.view.MaterialSwitch
+                <com.fankes.tsbattery.ui.view.MaterialSwitch
                     android:id="@+id/notify_module_notify_tip_switch"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -544,7 +544,7 @@
                     android:textColor="@color/colorTextDark"
                     android:textSize="12sp" />
 
-                <com.fankes.tsbattery.view.MaterialSwitch
+                <com.fankes.tsbattery.ui.view.MaterialSwitch
                     android:id="@+id/notify_module_info_switch"
                     android:layout_width="match_parent"
                     android:layout_height="35dp"
@@ -577,7 +577,7 @@
                 android:paddingLeft="15dp"
                 android:paddingRight="15dp">
 
-                <com.fankes.tsbattery.view.MaterialSwitch
+                <com.fankes.tsbattery.ui.view.MaterialSwitch
                     android:id="@+id/hide_icon_in_launcher_switch"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"