From 5ca161629f1896e3fa9dbb64ffe5d65f5363b36b Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Sun, 17 Dec 2023 13:00:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80=EF=BC=9A=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=BE=AE=E8=B0=83=20&=20=E5=8E=BB=E9=99=A4=E4=B8=8D=E5=B8=B8?=
 =?UTF-8?q?=E7=94=A8=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sms/forwarder/activity/MainActivity.kt    | 13 ++-
 .../main/res/layout/fragment_rules_edit.xml   | 68 +++++++-------
 .../fragment_tasks_action_notification.xml    | 88 ++++++++++---------
 app/src/main/res/layout/item_add_sender.xml   | 12 ++-
 4 files changed, 101 insertions(+), 80 deletions(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/activity/MainActivity.kt b/app/src/main/java/com/idormy/sms/forwarder/activity/MainActivity.kt
index 3ab5ec32..4c17026a 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/activity/MainActivity.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/activity/MainActivity.kt
@@ -14,6 +14,8 @@ import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.appcompat.widget.Toolbar
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager.widget.ViewPager
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.WorkManager
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.hjq.permissions.OnPermissionCallback
@@ -32,6 +34,7 @@ import com.idormy.sms.forwarder.utils.*
 import com.idormy.sms.forwarder.utils.sdkinit.XUpdateInit
 import com.idormy.sms.forwarder.widget.GuideTipsDialog.Companion.showTips
 import com.idormy.sms.forwarder.widget.GuideTipsDialog.Companion.showTipsForce
+import com.idormy.sms.forwarder.workers.LoadAppListWorker
 import com.jeremyliao.liveeventbus.LiveEventBus
 import com.xuexiang.xaop.annotation.SingleClick
 import com.xuexiang.xhttp2.XHttp
@@ -199,7 +202,15 @@ class MainActivity : BaseActivity<ActivityMainBinding?>(),
                         }
                     }
 
-                    R.id.nav_app_list -> openNewPage(AppListFragment::class.java)
+                    R.id.nav_app_list -> {
+                        if (App.UserAppList.isEmpty() && App.SystemAppList.isEmpty()) {
+                            XToastUtils.info(getString(R.string.loading_app_list))
+                            val request = OneTimeWorkRequestBuilder<LoadAppListWorker>().build()
+                            WorkManager.getInstance(this).enqueue(request)
+                            Thread.sleep(2000)
+                        }
+                        openNewPage(AppListFragment::class.java)
+                    }
                     //R.id.nav_logcat -> openNewPage(LogcatFragment::class.java)
                     R.id.nav_help -> AgentWebActivity.goWeb(this, getString(R.string.url_help))
                     R.id.nav_about -> openNewPage(AboutFragment::class.java)
diff --git a/app/src/main/res/layout/fragment_rules_edit.xml b/app/src/main/res/layout/fragment_rules_edit.xml
index c08ffacb..353f6388 100644
--- a/app/src/main/res/layout/fragment_rules_edit.xml
+++ b/app/src/main/res/layout/fragment_rules_edit.xml
@@ -50,11 +50,6 @@
 
                 </LinearLayout>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?attr/xui_config_color_separator_light" />
-
                 <LinearLayout
                     android:id="@+id/layout_Senders"
                     android:layout_width="match_parent"
@@ -65,40 +60,51 @@
                     android:id="@+id/layout_sender_logic"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal"
+                    android:orientation="vertical"
                     android:visibility="gone">
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/sender_logic"
-                        android:textStyle="bold" />
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:background="?attr/xui_config_color_separator_light" />
 
-                    <RadioGroup
-                        android:id="@+id/rg_sender_logic"
-                        style="@style/rg_style"
-                        android:layout_marginStart="5dp"
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
                         android:orientation="horizontal">
 
-                        <RadioButton
-                            android:id="@+id/rb_sender_logic_all"
-                            style="@style/rg_rb_style_wrap"
-                            android:checked="true"
-                            android:text="@string/sender_logic_all" />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/sender_logic"
+                            android:textStyle="bold" />
 
-                        <RadioButton
-                            android:id="@+id/rb_sender_logic_until_fail"
-                            style="@style/rg_rb_style_wrap"
-                            android:text="@string/sender_logic_until_fail" />
+                        <RadioGroup
+                            android:id="@+id/rg_sender_logic"
+                            style="@style/rg_style"
+                            android:layout_marginStart="5dp"
+                            android:orientation="horizontal">
 
-                        <RadioButton
-                            android:id="@+id/rb_sender_logic_until_success"
-                            style="@style/rg_rb_style_wrap"
-                            android:text="@string/sender_logic_until_success" />
+                            <RadioButton
+                                android:id="@+id/rb_sender_logic_all"
+                                style="@style/rg_rb_style"
+                                android:checked="true"
+                                android:text="@string/sender_logic_all" />
 
-                    </RadioGroup>
+                            <RadioButton
+                                android:id="@+id/rb_sender_logic_until_fail"
+                                style="@style/rg_rb_style"
+                                android:text="@string/sender_logic_until_fail" />
+
+                            <RadioButton
+                                android:id="@+id/rb_sender_logic_until_success"
+                                style="@style/rg_rb_style"
+                                android:text="@string/sender_logic_until_success" />
+
+                        </RadioGroup>
+
+                    </LinearLayout>
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_tasks_action_notification.xml b/app/src/main/res/layout/fragment_tasks_action_notification.xml
index 8b1390b9..809a38ff 100644
--- a/app/src/main/res/layout/fragment_tasks_action_notification.xml
+++ b/app/src/main/res/layout/fragment_tasks_action_notification.xml
@@ -17,23 +17,23 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
+            android:gravity="center_horizontal"
             android:orientation="vertical">
 
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                android:layout_margin="10dp"
+                android:contentDescription="@string/task_notification"
+                app:srcCompat="@drawable/auto_task_icon_sender"
+                tools:ignore="ImageContrastCheck" />
+
             <LinearLayout
+                style="@style/ruleBarStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:gravity="center_horizontal"
                 android:orientation="vertical">
 
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:layout_width="120dp"
-                    android:layout_height="120dp"
-                    android:layout_margin="10dp"
-                    android:contentDescription="@string/task_notification"
-                    app:srcCompat="@drawable/auto_task_icon_sender"
-                    tools:ignore="ImageContrastCheck" />
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -59,11 +59,6 @@
 
                 </LinearLayout>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="?attr/xui_config_color_separator_light" />
-
                 <LinearLayout
                     android:id="@+id/layout_Senders"
                     android:layout_width="match_parent"
@@ -74,40 +69,51 @@
                     android:id="@+id/layout_sender_logic"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal"
+                    android:orientation="vertical"
                     android:visibility="gone">
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/sender_logic"
-                        android:textStyle="bold" />
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:background="?attr/xui_config_color_separator_light" />
 
-                    <RadioGroup
-                        android:id="@+id/rg_sender_logic"
-                        style="@style/rg_style"
-                        android:layout_marginStart="5dp"
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
                         android:orientation="horizontal">
 
-                        <RadioButton
-                            android:id="@+id/rb_sender_logic_all"
-                            style="@style/rg_rb_style_wrap"
-                            android:checked="true"
-                            android:text="@string/sender_logic_all" />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/sender_logic"
+                            android:textStyle="bold" />
 
-                        <RadioButton
-                            android:id="@+id/rb_sender_logic_until_fail"
-                            style="@style/rg_rb_style_wrap"
-                            android:text="@string/sender_logic_until_fail" />
+                        <RadioGroup
+                            android:id="@+id/rg_sender_logic"
+                            style="@style/rg_style"
+                            android:layout_marginStart="5dp"
+                            android:orientation="horizontal">
 
-                        <RadioButton
-                            android:id="@+id/rb_sender_logic_until_success"
-                            style="@style/rg_rb_style_wrap"
-                            android:text="@string/sender_logic_until_success" />
+                            <RadioButton
+                                android:id="@+id/rb_sender_logic_all"
+                                style="@style/rg_rb_style"
+                                android:checked="true"
+                                android:text="@string/sender_logic_all" />
 
-                    </RadioGroup>
+                            <RadioButton
+                                android:id="@+id/rb_sender_logic_until_fail"
+                                style="@style/rg_rb_style"
+                                android:text="@string/sender_logic_until_fail" />
+
+                            <RadioButton
+                                android:id="@+id/rb_sender_logic_until_success"
+                                style="@style/rg_rb_style"
+                                android:text="@string/sender_logic_until_success" />
+
+                        </RadioGroup>
+
+                    </LinearLayout>
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout/item_add_sender.xml b/app/src/main/res/layout/item_add_sender.xml
index 190ae6ef..bd6f7b02 100644
--- a/app/src/main/res/layout/item_add_sender.xml
+++ b/app/src/main/res/layout/item_add_sender.xml
@@ -6,10 +6,13 @@
     android:layout_height="match_parent"
     android:background="@color/xui_config_color_white"
     android:orientation="vertical"
-    android:paddingStart="5dp"
-    android:paddingEnd="5dp"
     tools:ignore="UseCompoundDrawables">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?attr/xui_config_color_separator_light" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -62,9 +65,4 @@
 
     </LinearLayout>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?attr/xui_config_color_separator_light" />
-
 </LinearLayout>
\ No newline at end of file