From a5977bfd3bfa751e5aaba4459b32724bae6e0770 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Thu, 10 Mar 2022 17:43:32 +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=BE=AE=E8=B0=83=EF=BC=88=E5=AE=9A=E6=97=B6=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E7=94=B5=E6=B1=A0=E7=8A=B6=E6=80=81=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_setting.xml | 134 +++++++++----------
 app/src/main/res/values-en/strings.xml       |   2 +-
 app/src/main/res/values/strings.xml          |   2 +-
 3 files changed, 62 insertions(+), 76 deletions(-)

diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index 838358ad..2d68fd90 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -532,6 +532,66 @@
                         android:layout_height="wrap_content"
                         android:text="@string/timing_report_battery_status"
                         android:textStyle="bold" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/timing_report_battery_status_tips"
+                        android:textSize="9sp"
+                        tools:ignore="SmallSp" />
+
+                    <LinearLayout
+                        android:id="@+id/layout_battery_cron"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:visibility="gone">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/first_send_time"
+                            android:textSize="12sp"
+                            android:textStyle="bold" />
+
+                        <EditText
+                            android:id="@+id/et_battery_cron_start_time"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:autofillHints=""
+                            android:ems="5"
+                            android:focusable="false"
+                            android:maxLines="1"
+                            android:text=""
+                            android:textAlignment="center"
+                            android:textSize="12sp"
+                            tools:ignore="LabelFor,TextFields" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="10dp"
+                            android:text="@string/interval_minutes"
+                            android:textSize="12sp"
+                            android:textStyle="bold" />
+
+                        <EditText
+                            android:id="@+id/et_battery_cron_interval"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:autofillHints=""
+                            android:digits="0123456789"
+                            android:ems="4"
+                            android:inputType="number"
+                            android:maxLength="4"
+                            android:maxLines="1"
+                            android:text=""
+                            android:textAlignment="center"
+                            android:textSize="12sp"
+                            tools:ignore="LabelFor" />
+
+                    </LinearLayout>
                 </LinearLayout>
 
                 <Switch
@@ -545,80 +605,6 @@
 
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/layout_battery_cron"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:background="@color/setting_bar_color"
-                android:gravity="center_vertical"
-                android:orientation="vertical"
-                android:padding="15dp"
-                android:visibility="gone">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/timer_rule"
-                        android:textStyle="bold" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/first_send_time"
-                        android:textSize="12sp"
-                        android:textStyle="bold" />
-
-                    <EditText
-                        android:id="@+id/et_battery_cron_start_time"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:focusable="false"
-                        android:maxLines="1"
-                        android:ems="5"
-                        android:autofillHints=""
-                        android:text=""
-                        android:textAlignment="center"
-                        android:textSize="12sp"
-                        tools:ignore="LabelFor,TextFields" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="10dp"
-                        android:text="@string/interval_minutes"
-                        android:textSize="12sp"
-                        android:textStyle="bold" />
-
-                    <EditText
-                        android:id="@+id/et_battery_cron_interval"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:maxLines="1"
-                        android:inputType="number"
-                        android:digits="0123456789"
-                        android:maxLength="4"
-                        android:ems="4"
-                        android:autofillHints=""
-                        android:text=""
-                        android:textAlignment="center"
-                        android:textSize="12sp"
-                        tools:ignore="LabelFor" />
-                </LinearLayout>
-
-            </LinearLayout>
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 4ec5d129..0fcdfba1 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -274,7 +274,7 @@
     <string name="monitor_battery_status_changes">Monitor battery status changes</string>
     <string name="battery_status_changes_tips">Notify when charging status changes (charging/discharging/uncharged/fully charged)</string>
     <string name="timing_report_battery_status">Regularly report battery status</string>
-    <string name="timer_rule">Timer rule</string>
+    <string name="timing_report_battery_status_tips">Timer rule</string>
     <string name="first_send_time">First time: </string>
     <string name="interval_minutes">Interval(minutes): </string>
     <string name="proxy_settings">Proxy Settings</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 82f9ae95..eb0eb6b5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -273,7 +273,7 @@
     <string name="monitor_battery_status_changes">监听电池状态变化</string>
     <string name="battery_status_changes_tips">充电状态改变(充电中/放电中/未充电/已充满)时发出通知</string>
     <string name="timing_report_battery_status">定时推送电池状态</string>
-    <string name="timer_rule">定时规则</string>
+    <string name="timing_report_battery_status_tips">请设置每日首次发送时间与再次发送间隔时间</string>
     <string name="first_send_time">首次发送时间：</string>
     <string name="interval_minutes">间隔(分钟)：</string>
     <string name="proxy_settings">代理设置</string>