From ebcc4bbdbcc92dbf9c9ed45fe6c014bb2660d241 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Fri, 22 Dec 2023 23:50:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=C2=B7=E5=BF=AB=E6=8D=B7=E6=8C=87=E4=BB=A4=20?=
 =?UTF-8?q?=EF=BC=88=E5=BC=80=E5=8F=91=E4=B8=AD=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auto_task_icon_start_activity.xml         | 17 ++++++++++++----
 app/src/main/res/drawable/ic_app.xml          | 20 ++++++++++++-------
 .../adapter_call_card_view_list_item.xml      |  4 ++--
 .../adapter_frpcs_card_view_list_item.xml     |  6 +++---
 .../adapter_rules_card_view_list_item.xml     |  7 +++----
 .../adapter_senders_card_view_list_item.xml   |  8 ++++----
 .../adapter_sms_card_view_list_item.xml       |  4 ++--
 .../res/layout/adapter_task_setting_item.xml  |  6 +++---
 .../adapter_tasks_card_view_list_item.xml     |  9 +++------
 .../main/res/layout/fragment_tasks_edit.xml   | 12 +++++------
 app/src/main/res/values/dimens.xml            |  5 +++--
 11 files changed, 55 insertions(+), 43 deletions(-)

diff --git a/app/src/main/res/drawable/auto_task_icon_start_activity.xml b/app/src/main/res/drawable/auto_task_icon_start_activity.xml
index c0223832..0ff88ce0 100644
--- a/app/src/main/res/drawable/auto_task_icon_start_activity.xml
+++ b/app/src/main/res/drawable/auto_task_icon_start_activity.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector android:height="25.0dip" android:width="25.0dip" android:autoMirrored="true" android:viewportWidth="25.0" android:viewportHeight="25.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/auto_task_icon_light_blue" android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
-    <path android:fillColor="#ffffffff" android:pathData="M7.984,5.837C8.418,5.586 8.974,5.735 9.224,6.169L9.779,7.13C10.518,6.712 11.372,6.473 12.282,6.473C13.199,6.473 14.06,6.715 14.803,7.14L15.342,6.207C15.592,5.772 16.148,5.623 16.582,5.874C17.017,6.125 17.165,6.68 16.915,7.115L16.212,8.331C16.862,9.121 17.278,10.11 17.355,11.194H7.21C7.287,10.103 7.708,9.107 8.366,8.314L7.651,7.077C7.401,6.643 7.55,6.087 7.984,5.837ZM17.368,12.647H7.198V17.732C7.198,18.535 7.848,19.185 8.651,19.185H15.915C16.718,19.185 17.368,18.535 17.368,17.732V12.647Z" android:fillType="evenOdd" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25.0dip"
+    android:height="25.0dip"
+    android:autoMirrored="true"
+    android:viewportWidth="25.0"
+    android:viewportHeight="25.0">
+    <path
+        android:fillColor="@color/auto_task_icon_light_blue"
+        android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
+    <path
+        android:fillColor="#ffffffff"
+        android:fillType="evenOdd"
+        android:pathData="M7.984,5.837C8.418,5.586 8.974,5.735 9.224,6.169L9.779,7.13C10.518,6.712 11.372,6.473 12.282,6.473C13.199,6.473 14.06,6.715 14.803,7.14L15.342,6.207C15.592,5.772 16.148,5.623 16.582,5.874C17.017,6.125 17.165,6.68 16.915,7.115L16.212,8.331C16.862,9.121 17.278,10.11 17.355,11.194H7.21C7.287,10.103 7.708,9.107 8.366,8.314L7.651,7.077C7.401,6.643 7.55,6.087 7.984,5.837ZM17.368,12.647H7.198V17.732C7.198,18.535 7.848,19.185 8.651,19.185H15.915C16.718,19.185 17.368,18.535 17.368,17.732V12.647Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_app.xml b/app/src/main/res/drawable/ic_app.xml
index d287b28d..48847ef4 100644
--- a/app/src/main/res/drawable/ic_app.xml
+++ b/app/src/main/res/drawable/ic_app.xml
@@ -1,9 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="25.0dip"
+    android:height="25.0dip"
+    android:autoMirrored="true"
+    android:viewportWidth="25.0"
+    android:viewportHeight="25.0">
     <path
-        android:fillColor="?attr/colorControlNormal"
-        android:pathData="M4,8h4L8,4L4,4v4zM10,20h4v-4h-4v4zM4,20h4v-4L4,16v4zM4,14h4v-4L4,10v4zM10,14h4v-4h-4v4zM16,4v4h4L20,4h-4zM10,8h4L14,4h-4v4zM16,14h4v-4h-4v4zM16,20h4v-4h-4v4z" />
-</vector>
+        android:fillColor="@color/color_grey_primary_default"
+        android:pathData="M6.66,0.66L18.66,0.66A6,6 0,0 1,24.66 6.66L24.66,18.66A6,6 0,0 1,18.66 24.66L6.66,24.66A6,6 0,0 1,0.66 18.66L0.66,6.66A6,6 0,0 1,6.66 0.66z" />
+    <path
+        android:fillColor="#ffffffff"
+        android:fillType="evenOdd"
+        android:pathData="M7.984,5.837C8.418,5.586 8.974,5.735 9.224,6.169L9.779,7.13C10.518,6.712 11.372,6.473 12.282,6.473C13.199,6.473 14.06,6.715 14.803,7.14L15.342,6.207C15.592,5.772 16.148,5.623 16.582,5.874C17.017,6.125 17.165,6.68 16.915,7.115L16.212,8.331C16.862,9.121 17.278,10.11 17.355,11.194H7.21C7.287,10.103 7.708,9.107 8.366,8.314L7.651,7.077C7.401,6.643 7.55,6.087 7.984,5.837ZM17.368,12.647H7.198V17.732C7.198,18.535 7.848,19.185 8.651,19.185H15.915C16.718,19.185 17.368,18.535 17.368,17.732V12.647Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/adapter_call_card_view_list_item.xml b/app/src/main/res/layout/adapter_call_card_view_list_item.xml
index 32628090..28a835e6 100644
--- a/app/src/main/res/layout/adapter_call_card_view_list_item.xml
+++ b/app/src/main/res/layout/adapter_call_card_view_list_item.xml
@@ -22,8 +22,8 @@
 
         <ImageView
             android:id="@+id/iv_image"
-            android:layout_width="@dimen/card_view_image_size"
-            android:layout_height="@dimen/card_view_image_size"
+            android:layout_width="@dimen/card_view_icon_size"
+            android:layout_height="@dimen/card_view_icon_size"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_phone_missed"
             tools:ignore="ContentDescription,ImageContrastCheck" />
diff --git a/app/src/main/res/layout/adapter_frpcs_card_view_list_item.xml b/app/src/main/res/layout/adapter_frpcs_card_view_list_item.xml
index fe4a569d..94854a9c 100644
--- a/app/src/main/res/layout/adapter_frpcs_card_view_list_item.xml
+++ b/app/src/main/res/layout/adapter_frpcs_card_view_list_item.xml
@@ -26,8 +26,8 @@
 
             <ImageView
                 android:id="@+id/iv_image"
-                android:layout_width="@dimen/card_view_image_size"
-                android:layout_height="@dimen/card_view_image_size"
+                android:layout_width="@dimen/card_view_icon_size"
+                android:layout_height="@dimen/card_view_icon_size"
                 android:scaleType="fitCenter"
                 android:src="@drawable/ic_menu_frpc"
                 app:tint="#299EE3"
@@ -72,7 +72,7 @@
                     android:id="@+id/iv_play"
                     android:layout_width="@dimen/card_view_image_size"
                     android:layout_height="@dimen/card_view_image_size"
-                    android:padding="7dp"
+                    android:padding="5dp"
                     android:scaleType="fitCenter"
                     android:src="@drawable/ic_start"
                     app:tint="@color/colorStart"
diff --git a/app/src/main/res/layout/adapter_rules_card_view_list_item.xml b/app/src/main/res/layout/adapter_rules_card_view_list_item.xml
index cf9cf3d7..cc28780f 100644
--- a/app/src/main/res/layout/adapter_rules_card_view_list_item.xml
+++ b/app/src/main/res/layout/adapter_rules_card_view_list_item.xml
@@ -9,7 +9,7 @@
     android:layout_marginStart="@dimen/config_margin_5dp"
     android:layout_marginTop="@dimen/config_margin_5dp"
     android:layout_marginEnd="@dimen/config_margin_5dp"
-    android:padding="@dimen/config_padding_5dp">
+    android:padding="@dimen/config_padding_10dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -24,8 +24,8 @@
 
             <ImageView
                 android:id="@+id/iv_rule_image"
-                android:layout_width="@dimen/card_view_image_size"
-                android:layout_height="@dimen/card_view_image_size"
+                android:layout_width="@dimen/card_view_icon_size"
+                android:layout_height="@dimen/card_view_icon_size"
                 android:scaleType="fitCenter"
                 android:src="@drawable/ic_app"
                 tools:ignore="ContentDescription,ImageContrastCheck" />
@@ -42,7 +42,6 @@
 
         </LinearLayout>
 
-
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/adapter_senders_card_view_list_item.xml b/app/src/main/res/layout/adapter_senders_card_view_list_item.xml
index 3c1c7d9b..a01915a0 100644
--- a/app/src/main/res/layout/adapter_senders_card_view_list_item.xml
+++ b/app/src/main/res/layout/adapter_senders_card_view_list_item.xml
@@ -9,23 +9,23 @@
     android:layout_marginStart="@dimen/config_margin_5dp"
     android:layout_marginTop="@dimen/config_margin_5dp"
     android:layout_marginEnd="@dimen/config_margin_5dp"
-    android:padding="@dimen/config_padding_5dp">
+    android:padding="@dimen/config_padding_10dp">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:gravity="center_vertical"
         android:orientation="horizontal">
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
             android:orientation="vertical">
 
             <ImageView
                 android:id="@+id/iv_image"
-                android:layout_width="@dimen/card_view_image_size"
-                android:layout_height="@dimen/card_view_image_size"
+                android:layout_width="@dimen/card_view_icon_size"
+                android:layout_height="@dimen/card_view_icon_size"
                 android:scaleType="fitCenter"
                 android:src="@drawable/icon_sms"
                 tools:ignore="ContentDescription,ImageContrastCheck" />
diff --git a/app/src/main/res/layout/adapter_sms_card_view_list_item.xml b/app/src/main/res/layout/adapter_sms_card_view_list_item.xml
index 57eef045..c92797fd 100644
--- a/app/src/main/res/layout/adapter_sms_card_view_list_item.xml
+++ b/app/src/main/res/layout/adapter_sms_card_view_list_item.xml
@@ -22,8 +22,8 @@
 
         <ImageView
             android:id="@+id/iv_image"
-            android:layout_width="@dimen/card_view_image_size"
-            android:layout_height="@dimen/card_view_image_size"
+            android:layout_width="@dimen/card_view_icon_size"
+            android:layout_height="@dimen/card_view_icon_size"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_sms"
             tools:ignore="ContentDescription,ImageContrastCheck" />
diff --git a/app/src/main/res/layout/adapter_task_setting_item.xml b/app/src/main/res/layout/adapter_task_setting_item.xml
index c75888e7..8263db3d 100644
--- a/app/src/main/res/layout/adapter_task_setting_item.xml
+++ b/app/src/main/res/layout/adapter_task_setting_item.xml
@@ -18,8 +18,8 @@
 
         <ImageView
             android:id="@+id/iv_icon"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
+            android:layout_width="@dimen/card_view_icon_size"
+            android:layout_height="@dimen/card_view_icon_size"
             android:src="@drawable/ic_add"
             tools:ignore="ContentDescription,ImageContrastCheck" />
 
@@ -46,7 +46,7 @@
                 android:gravity="start"
                 android:maxLines="2"
                 android:text="@string/add_action_tips"
-                android:textSize="@dimen/text_size_small" />
+                android:textSize="@dimen/text_size_mini" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/adapter_tasks_card_view_list_item.xml b/app/src/main/res/layout/adapter_tasks_card_view_list_item.xml
index c611f89b..492bc71b 100644
--- a/app/src/main/res/layout/adapter_tasks_card_view_list_item.xml
+++ b/app/src/main/res/layout/adapter_tasks_card_view_list_item.xml
@@ -9,7 +9,7 @@
     android:layout_marginStart="@dimen/config_margin_5dp"
     android:layout_marginTop="@dimen/config_margin_5dp"
     android:layout_marginEnd="@dimen/config_margin_5dp"
-    android:padding="@dimen/config_padding_5dp">
+    android:padding="@dimen/config_padding_10dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -20,7 +20,7 @@
             android:id="@+id/layout_icons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/config_margin_5dp"
+            android:gravity="center_vertical"
             android:orientation="horizontal">
 
             <LinearLayout
@@ -49,8 +49,7 @@
                 android:id="@+id/sb_enable"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingTop="@dimen/config_padding_5dp"
-                android:paddingBottom="@dimen/config_padding_5dp"
+                android:padding="0dp"
                 tools:ignore="TouchTargetSizeCheck" />
 
         </LinearLayout>
@@ -66,7 +65,6 @@
                 android:id="@+id/layout_image"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/config_margin_10dp"
                 android:orientation="vertical"
                 android:visibility="gone">
 
@@ -91,7 +89,6 @@
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
                 android:layout_weight="1"
                 android:orientation="vertical">
 
diff --git a/app/src/main/res/layout/fragment_tasks_edit.xml b/app/src/main/res/layout/fragment_tasks_edit.xml
index 4cc525e1..86d6cf1d 100644
--- a/app/src/main/res/layout/fragment_tasks_edit.xml
+++ b/app/src/main/res/layout/fragment_tasks_edit.xml
@@ -103,8 +103,8 @@
                     android:paddingBottom="@dimen/config_padding_5dp">
 
                     <ImageView
-                        android:layout_width="36dp"
-                        android:layout_height="36dp"
+                        android:layout_width="@dimen/card_view_icon_size"
+                        android:layout_height="@dimen/card_view_icon_size"
                         android:src="@drawable/ic_add"
                         app:tint="@color/gray_text_light"
                         tools:ignore="ContentDescription,ImageContrastCheck" />
@@ -129,7 +129,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/add_condition_tips"
-                            android:textSize="@dimen/text_size_small" />
+                            android:textSize="@dimen/text_size_mini" />
 
                     </LinearLayout>
 
@@ -189,8 +189,8 @@
                     android:paddingBottom="@dimen/config_padding_5dp">
 
                     <ImageView
-                        android:layout_width="36dp"
-                        android:layout_height="36dp"
+                        android:layout_width="@dimen/card_view_icon_size"
+                        android:layout_height="@dimen/card_view_icon_size"
                         android:src="@drawable/ic_add"
                         app:tint="@color/gray_text_light"
                         tools:ignore="ContentDescription,ImageContrastCheck" />
@@ -215,7 +215,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/add_action_tips"
-                            android:textSize="@dimen/text_size_small" />
+                            android:textSize="@dimen/text_size_mini" />
 
                     </LinearLayout>
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 9c62f957..609a08f8 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -58,8 +58,9 @@
     <dimen name="config_padding_20dp">20dp</dimen>
     <dimen name="config_padding_24dp">24dp</dimen>
     <dimen name="config_padding_30dp">30dp</dimen>
-    <dimen name="card_view_image_size">32dp</dimen>
-    <dimen name="card_view_image_padding">4dp</dimen>
+    <dimen name="card_view_icon_size">36dp</dimen>
+    <dimen name="card_view_image_size">26dp</dimen>
+    <dimen name="card_view_image_padding">2dp</dimen>
 
     <dimen name="view_dimen_3">1.0899963dip</dimen>
     <dimen name="view_dimen_10">3.6399841dip</dimen>