From 673bac58545b927b6f3b35d82bad100e32e3e199 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Tue, 22 Feb 2022 16:36:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_setting.xml   |  2 +-
 .../layout/alert_dialog_setview_qywxapp.xml    | 18 ++++++++++--------
 .../res/layout/alert_dialog_setview_sms.xml    |  3 +--
 .../layout/alert_dialog_setview_webnotify.xml  |  9 ++++-----
 app/src/main/res/layout/edit_text_clear.xml    |  7 ++++---
 app/src/main/res/values/strings.xml            |  6 +++---
 6 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index 31f01ccf..9e9db791 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -202,7 +202,7 @@
                     <LinearLayout
                         android:id="@+id/layout_cancel_app_notify"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="25dp"
                         android:gravity="center_vertical"
                         android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/alert_dialog_setview_qywxapp.xml b/app/src/main/res/layout/alert_dialog_setview_qywxapp.xml
index 4dbc1f8e..341801d7 100644
--- a/app/src/main/res/layout/alert_dialog_setview_qywxapp.xml
+++ b/app/src/main/res/layout/alert_dialog_setview_qywxapp.xml
@@ -18,7 +18,7 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="80dp"
+                android:layout_width="70dp"
                 android:layout_height="wrap_content"
                 android:gravity="end"
                 android:text="@string/set_name"
@@ -28,6 +28,7 @@
                 android:id="@+id/editTextQYWXAppName"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
                 android:layout_weight="1"
                 android:importantForAutofill="no"
                 android:inputType="text"
@@ -51,7 +52,7 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="80dp"
+                android:layout_width="70dp"
                 android:layout_height="wrap_content"
                 android:gravity="end"
                 android:text="@string/Corp_ID"
@@ -76,9 +77,11 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="80dp"
+                android:layout_width="70dp"
                 android:layout_height="wrap_content"
+                android:ellipsize="end"
                 android:gravity="end"
+                android:maxLines="1"
                 android:text="@string/Agent_ID"
                 android:textStyle="bold" />
 
@@ -93,7 +96,6 @@
                 tools:ignore="LabelFor" />
         </LinearLayout>
 
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -102,7 +104,7 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="80dp"
+                android:layout_width="70dp"
                 android:layout_height="wrap_content"
                 android:gravity="end"
                 android:text="@string/App_Secret"
@@ -112,7 +114,7 @@
                 android:id="@+id/editTextQYWXAppSecret"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
+                android:layout_marginStart="5dp"
                 app:showEye="true" />
         </LinearLayout>
 
@@ -125,7 +127,7 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="80dp"
+                android:layout_width="70dp"
                 android:layout_height="wrap_content"
                 android:gravity="end"
                 android:text="@string/is_at_all"
@@ -154,7 +156,7 @@
                 android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="80dp"
+                    android:layout_width="70dp"
                     android:layout_height="wrap_content"
                     android:gravity="end"
                     android:text="@string/specified_member"
diff --git a/app/src/main/res/layout/alert_dialog_setview_sms.xml b/app/src/main/res/layout/alert_dialog_setview_sms.xml
index 9cd8c170..ab6f2f95 100644
--- a/app/src/main/res/layout/alert_dialog_setview_sms.xml
+++ b/app/src/main/res/layout/alert_dialog_setview_sms.xml
@@ -45,14 +45,13 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginStart="10dp"
-            android:layout_marginTop="5dp"
             android:layout_marginEnd="10dp"
+            android:gravity="center_vertical"
             android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingTop="5dp"
                 android:text="@string/SmsSimSlot"
                 android:textStyle="bold" />
 
diff --git a/app/src/main/res/layout/alert_dialog_setview_webnotify.xml b/app/src/main/res/layout/alert_dialog_setview_webnotify.xml
index 099b7fd2..099c17ab 100644
--- a/app/src/main/res/layout/alert_dialog_setview_webnotify.xml
+++ b/app/src/main/res/layout/alert_dialog_setview_webnotify.xml
@@ -126,13 +126,13 @@
             android:orientation="vertical">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text='@string/WebNotifyWebParams'
                 android:textStyle="bold" />
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/WebNotifyWebParamsTips"
                 android:textSize="10sp"
@@ -157,16 +157,15 @@
             android:orientation="vertical">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/WebNotifySecret"
                 android:textStyle="bold" />
 
             <com.idormy.sms.forwarder.view.ClearEditText
                 android:id="@+id/editTextWebNotifySecret"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
                 app:showEye="true" />
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/edit_text_clear.xml b/app/src/main/res/layout/edit_text_clear.xml
index c2831c3f..07ab5ebc 100644
--- a/app/src/main/res/layout/edit_text_clear.xml
+++ b/app/src/main/res/layout/edit_text_clear.xml
@@ -42,7 +42,7 @@
         <ImageView
             android:id="@+id/iv_edit_eye"
             android:layout_width="45dp"
-            android:layout_height="match_parent"
+            android:layout_height="45dp"
             android:contentDescription="@string/todo"
             android:scaleType="centerInside"
             android:src="@drawable/clear_icon_eye_close"
@@ -50,8 +50,9 @@
 
         <ImageView
             android:id="@+id/iv_edit_clean"
-            android:layout_width="45dp"
-            android:layout_height="match_parent"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_marginBottom="3dp"
             android:contentDescription="@string/todo"
             android:scaleType="centerInside"
             android:src="@drawable/clear_icon_close"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3a36de66..6fb0f29f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -149,8 +149,8 @@
     <string name="feishu_msg_type_interactive">消息卡片</string>
     <string name="feishu_msg_type_interactive_title">标题模板</string>
     <string name="Corp_ID">企业ID</string>
-    <string name="Agent_ID">应用AgentId</string>
-    <string name="App_Secret">应用Secret</string>
+    <string name="Agent_ID">AgentId</string>
+    <string name="App_Secret">Secret</string>
     <string name="is_at_all">是否@all</string>
     <string name="specified_member">指定成员</string>
     <string name="at_all">\@all</string>
@@ -179,7 +179,7 @@
     <string name="low_power_alarm_threshold">电量预警(%)</string>
     <string name="low_power_alarm_threshold_tips">取值：0–99，0禁用</string>
     <string name="retry_interval">请求接口失败重试</string>
-    <string name="retry_interval_tips">次数=0时禁用，间隔逐次递增</string>
+    <string name="retry_interval_tips">次数=0禁用，间隔逐次递增</string>
     <string name="forward_sms">转发短信广播</string>
     <string name="forward_sms_tips">请授予读取短信、通知类短信、发送短信等权限，关闭验证码保护</string>
     <string name="forward_missed_calls">转发通话记录</string>