Merge code

app/src/main/AndroidManifest.xml

@@ -24,7 +24,7 @@
             android:value="93" />
 
         <activity
-            android:name=".ui.MainActivity"
+            android:name=".ui.activity.MainActivity"
             android:exported="true"
             android:screenOrientation="behind">
             <intent-filter>
@@ -39,7 +39,7 @@
             android:exported="true"
             android:label="@string/app_name"
             android:screenOrientation="behind"
-            android:targetActivity=".ui.MainActivity">
+            android:targetActivity=".ui.activity.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -48,7 +48,7 @@
         </activity-alias>
 
         <activity
-            android:name=".ui.ConfigureActivity"
+            android:name=".ui.activity.ConfigureActivity"
             android:exported="false"
             android:screenOrientation="behind" />
     </application>

app/src/main/java/com/fankes/coloros/notify/ui/activity/ConfigureActivity.kt

@@ -22,7 +22,7 @@
  */
 @file:Suppress("SetTextI18n", "InflateParams", "DEPRECATION")
 
-package com.fankes.coloros.notify.ui
+package com.fankes.coloros.notify.ui.activity
 
 import android.app.ProgressDialog
 import android.os.Bundle
@@ -47,11 +47,11 @@ import com.fankes.coloros.notify.hook.factory.isAppNotifyHookOf
 import com.fankes.coloros.notify.hook.factory.putAppNotifyHookAllOf
 import com.fankes.coloros.notify.hook.factory.putAppNotifyHookOf
 import com.fankes.coloros.notify.param.IconPackParams
-import com.fankes.coloros.notify.ui.base.BaseActivity
+import com.fankes.coloros.notify.ui.activity.base.BaseActivity
+import com.fankes.coloros.notify.ui.view.MaterialSwitch
 import com.fankes.coloros.notify.utils.factory.*
 import com.fankes.coloros.notify.utils.tool.ClientRequestTool
 import com.fankes.coloros.notify.utils.tool.SystemUITool
-import com.fankes.coloros.notify.view.MaterialSwitch
 import com.google.android.material.radiobutton.MaterialRadioButton
 import com.google.android.material.textfield.TextInputEditText
 import com.highcapable.yukihookapi.hook.factory.modulePrefs

app/src/main/java/com/fankes/coloros/notify/ui/activity/MainActivity.kt

@@ -22,7 +22,7 @@
  */
 @file:Suppress("SetTextI18n")
 
-package com.fankes.coloros.notify.ui
+package com.fankes.coloros.notify.ui.activity
 
 import android.content.ComponentName
 import android.content.Intent
@@ -45,7 +45,7 @@ import com.fankes.coloros.notify.hook.HookConst.REMOVE_CHANGECP_NOTIFY
 import com.fankes.coloros.notify.hook.HookConst.REMOVE_DEV_NOTIFY
 import com.fankes.coloros.notify.hook.HookConst.REMOVE_DNDALERT_NOTIFY
 import com.fankes.coloros.notify.param.IconPackParams
-import com.fankes.coloros.notify.ui.base.BaseActivity
+import com.fankes.coloros.notify.ui.activity.base.BaseActivity
 import com.fankes.coloros.notify.utils.factory.*
 import com.fankes.coloros.notify.utils.tool.SystemUITool
 import com.highcapable.yukihookapi.hook.factory.modulePrefs

app/src/main/java/com/fankes/coloros/notify/ui/activity/base/BaseActivity.kt

@@ -20,7 +20,7 @@
  *
  * This file is Created by fankes on 2022/1/30.
  */
-package com.fankes.coloros.notify.ui.base
+package com.fankes.coloros.notify.ui.activity.base
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity

app/src/main/java/com/fankes/coloros/notify/ui/view/MaterialSwitch.kt

@@ -22,7 +22,7 @@
  */
 @file:Suppress("SameParameterValue")
 
-package com.fankes.coloros.notify.view
+package com.fankes.coloros.notify.ui.view
 
 import android.content.Context
 import android.content.res.ColorStateList

app/src/main/res/layout/activity_config.xml

@@ -5,7 +5,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">
 
     <LinearLayout

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">
 
     <LinearLayout
@@ -171,7 +171,7 @@
                 android:paddingLeft="15dp"
                 android:paddingRight="15dp">
 
-                <com.fankes.coloros.notify.view.MaterialSwitch
+                <com.fankes.coloros.notify.ui.view.MaterialSwitch
                     android:id="@+id/module_enable_switch"
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
@@ -180,7 +180,7 @@
                     android:textColor="@color/colorTextGray"
                     android:textSize="15sp" />
 
-                <com.fankes.coloros.notify.view.MaterialSwitch
+                <com.fankes.coloros.notify.ui.view.MaterialSwitch
                     android:id="@+id/module_enable_log_switch"
                     android:layout_width="match_parent"
                     android:layout_height="35dp"
@@ -215,7 +215,7 @@
                 android:paddingLeft="15dp"
                 android:paddingRight="15dp">
 
-                <com.fankes.coloros.notify.view.MaterialSwitch
+                <com.fankes.coloros.notify.ui.view.MaterialSwitch
                     android:id="@+id/remove_dev_n_enable_switch"
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
@@ -234,7 +234,7 @@
                     android:textColor="@color/colorTextDark"
                     android:textSize="12sp" />
 
-                <com.fankes.coloros.notify.view.MaterialSwitch
+                <com.fankes.coloros.notify.ui.view.MaterialSwitch
                     android:id="@+id/remove_chargecp_n_enable_switch"
                     android:layout_width="match_parent"
                     android:layout_height="35dp"
@@ -253,7 +253,7 @@
                     android:textColor="@color/colorTextDark"
                     android:textSize="12sp" />
 
-                <com.fankes.coloros.notify.view.MaterialSwitch
+                <com.fankes.coloros.notify.ui.view.MaterialSwitch
                     android:id="@+id/remove_dndalert_n_enable_switch"
                     android:layout_width="match_parent"
                     android:layout_height="35dp"
@@ -288,7 +288,7 @@
                 android:paddingLeft="15dp"
                 android:paddingRight="15dp">
 
-                <com.fankes.coloros.notify.view.MaterialSwitch
+                <com.fankes.coloros.notify.ui.view.MaterialSwitch
                     android:id="@+id/a12_style_enable_switch"
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
@@ -324,7 +324,7 @@
                 android:paddingLeft="15dp"
                 android:paddingRight="15dp">
 
-                <com.fankes.coloros.notify.view.MaterialSwitch
+                <com.fankes.coloros.notify.ui.view.MaterialSwitch
                     android:id="@+id/notify_icon_fix_switch"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -385,7 +385,7 @@
                 android:paddingLeft="15dp"
                 android:paddingRight="15dp">
 
-                <com.fankes.coloros.notify.view.MaterialSwitch
+                <com.fankes.coloros.notify.ui.view.MaterialSwitch
                     android:id="@+id/hide_icon_in_launcher_switch"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"

app/src/main/res/layout/adapter_config.xml

@@ -68,7 +68,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <com.fankes.coloros.notify.view.MaterialSwitch
+        <com.fankes.coloros.notify.ui.view.MaterialSwitch
             android:id="@+id/adp_app_open_switch"
             android:layout_width="wrap_content"
             android:layout_height="30dp"
@@ -77,7 +77,7 @@
             android:textColor="@color/colorTextGray"
             android:textSize="13sp" />
 
-        <com.fankes.coloros.notify.view.MaterialSwitch
+        <com.fankes.coloros.notify.ui.view.MaterialSwitch
             android:id="@+id/adp_app_all_switch"
             android:layout_width="wrap_content"
             android:layout_height="30dp"