From ea3fc586af04ba13fff87f6d8d300c0a51dff90e Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Wed, 19 Jan 2022 20:31:29 +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&=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |   3 +
 .../idormy/sms/forwarder/MainActivity.java    |  28 +-
 .../idormy/sms/forwarder/RuleActivity.java    |   8 +
 app/src/main/res/drawable/ic_delete.xml       |   5 +
 .../main/res/drawable/step_circle_current.xml |   8 +
 .../main/res/drawable/step_circle_normal.xml  |   8 +
 .../res/drawable/step_rectangle_current.xml   |   4 +
 .../res/drawable/step_rectangle_normal.xml    |   4 +
 app/src/main/res/layout/activity_applist.xml  |   8 +-
 app/src/main/res/layout/activity_main.xml     | 254 +++++++++++++++++-
 app/src/main/res/layout/activity_rule.xml     | 158 +++++------
 app/src/main/res/layout/activity_sender.xml   |  11 +-
 app/src/main/res/layout/activity_setting.xml  |   1 -
 .../res/layout/alert_dialog_setview_bark.xml  |  12 +-
 .../layout/alert_dialog_setview_dingding.xml  |  20 +-
 .../res/layout/alert_dialog_setview_email.xml |  28 +-
 .../layout/alert_dialog_setview_feishu.xml    |  12 +-
 .../layout/alert_dialog_setview_gotify.xml    |  12 +-
 .../layout/alert_dialog_setview_pushplus.xml  |  32 +--
 .../layout/alert_dialog_setview_qywxapp.xml   |  28 +-
 .../alert_dialog_setview_qywxgrouprobot.xml   |   8 +-
 .../alert_dialog_setview_serverchan.xml       |   8 +-
 .../res/layout/alert_dialog_setview_sms.xml   |  16 +-
 .../layout/alert_dialog_setview_telegram.xml  |  28 +-
 .../layout/alert_dialog_setview_webnotify.xml |  20 +-
 .../res/layout/diaolog_privacy_policy.xml     |   8 +-
 app/src/main/res/layout/edit_text_clear.xml   |   7 +-
 app/src/main/res/values-en/colors.xml         |   1 +
 app/src/main/res/values-en/strings.xml        |   8 +
 app/src/main/res/values/colors.xml            |   1 +
 app/src/main/res/values/strings.xml           |  11 +-
 build.gradle                                  |   2 +
 32 files changed, 539 insertions(+), 223 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_delete.xml
 create mode 100644 app/src/main/res/drawable/step_circle_current.xml
 create mode 100644 app/src/main/res/drawable/step_circle_normal.xml
 create mode 100644 app/src/main/res/drawable/step_rectangle_current.xml
 create mode 100644 app/src/main/res/drawable/step_rectangle_normal.xml

diff --git a/app/build.gradle b/app/build.gradle
index c96b3ea1..233f0b10 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -177,4 +177,7 @@ dependencies {
     //jetty
     implementation "org.eclipse.jetty:jetty-server:9.2.30.v20200428"
     implementation "org.eclipse.jetty:jetty-servlet:9.2.30.v20200428"
+
+    //StepView
+    //implementation 'com.shuhart.stepview:stepview:1.5.1'
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java b/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java
index 0ef97ec0..4fd6b3f1 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java
+++ b/app/src/main/java/com/idormy/sms/forwarder/MainActivity.java
@@ -18,6 +18,7 @@ import android.view.View;
 import android.view.Window;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -25,6 +26,7 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.idormy.sms.forwarder.adapter.LogAdapter;
 import com.idormy.sms.forwarder.model.vo.LogVo;
 import com.idormy.sms.forwarder.sender.HttpServer;
@@ -110,6 +112,20 @@ public class MainActivity extends AppCompatActivity implements RefreshListView.I
         } catch (Exception e) {
             Log.e(TAG, "SmsHubApiTask:", e);
         }
+
+        /*final StepView stepView = findViewById(R.id.step_view);
+        stepView.setOnStepClickListener(new StepView.OnStepClickListener() {
+            @Override
+            public void onStepClick(int step) {
+                Toast.makeText(MainActivity.this, "Step " + step, Toast.LENGTH_SHORT).show();
+            }
+        });
+        List<String> steps = new ArrayList<>();
+        for (int i = 0; i < 4; i++) {
+            steps.add("Step " + (i + 1));
+        }
+        //steps.set(steps.size() - 1, steps.get(steps.size() - 1) + " last one");
+        stepView.setSteps(steps);*/
     }
 
     @Override
@@ -127,7 +143,17 @@ public class MainActivity extends AppCompatActivity implements RefreshListView.I
 
         //是否关闭页面提示
         TextView help_tip = findViewById(R.id.help_tip);
-        help_tip.setVisibility(MyApplication.showHelpTip ? View.VISIBLE : View.GONE);
+        FloatingActionButton btnCleanLog = findViewById(R.id.btnCleanLog);
+        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) btnCleanLog.getLayoutParams();
+        if (MyApplication.showHelpTip) {
+            layoutParams.bottomMargin = CommonUtil.dp2px(this, 120);//距离底部120dp
+            btnCleanLog.setLayoutParams(layoutParams);
+            help_tip.setVisibility(View.VISIBLE);
+        } else {
+            layoutParams.bottomMargin = CommonUtil.dp2px(this, 80);
+            btnCleanLog.setLayoutParams(layoutParams);
+            help_tip.setVisibility(View.GONE);
+        }
 
         // 先拿到数据并放在适配器上
         initTLogs(); //初始化数据
diff --git a/app/src/main/java/com/idormy/sms/forwarder/RuleActivity.java b/app/src/main/java/com/idormy/sms/forwarder/RuleActivity.java
index 0add6c92..d1f0120c 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/RuleActivity.java
+++ b/app/src/main/java/com/idormy/sms/forwarder/RuleActivity.java
@@ -23,6 +23,7 @@ import android.widget.Toast;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.idormy.sms.forwarder.adapter.RuleAdapter;
 import com.idormy.sms.forwarder.model.RuleModel;
 import com.idormy.sms.forwarder.model.SenderModel;
@@ -130,6 +131,9 @@ public class RuleActivity extends AppCompatActivity {
         //切换日志类别
         int typeCheckId = getTypeCheckId(currentType);
         final RadioGroup radioGroupTypeCheck = findViewById(R.id.radioGroupTypeCheck);
+        final FloatingActionButton addSmsRule = findViewById(R.id.addSmsRule);
+        final FloatingActionButton addCallRule = findViewById(R.id.addCallRule);
+        final FloatingActionButton addAppRule = findViewById(R.id.addAppRule);
         radioGroupTypeCheck.check(typeCheckId);
         radioGroupTypeCheck.setOnCheckedChangeListener((group, checkedId) -> {
             RadioButton rb = findViewById(checkedId);
@@ -137,6 +141,10 @@ public class RuleActivity extends AppCompatActivity {
             initRules(); //初始化数据
             adapter = new RuleAdapter(RuleActivity.this, R.layout.item_rule, ruleModels);
             listView.setAdapter(adapter);
+
+            addSmsRule.setVisibility("sms".equals(currentType) ? View.VISIBLE : View.GONE);
+            addCallRule.setVisibility("call".equals(currentType) ? View.VISIBLE : View.GONE);
+            addAppRule.setVisibility("app".equals(currentType) ? View.VISIBLE : View.GONE);
         });
     }
 
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
new file mode 100644
index 00000000..f54f7d4d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8.46,11.88l1.41,-1.41L12,12.59l2.12,-2.12 1.41,1.41L13.41,14l2.12,2.12 -1.41,1.41L12,15.41l-2.12,2.12 -1.41,-1.41L10.59,14l-2.13,-2.12zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/step_circle_current.xml b/app/src/main/res/drawable/step_circle_current.xml
new file mode 100644
index 00000000..3d674eb0
--- /dev/null
+++ b/app/src/main/res/drawable/step_circle_current.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#1C8DD4" />
+    <size
+        android:width="30dp"
+        android:height="30dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/step_circle_normal.xml b/app/src/main/res/drawable/step_circle_normal.xml
new file mode 100644
index 00000000..20c6a080
--- /dev/null
+++ b/app/src/main/res/drawable/step_circle_normal.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#CCCCCC" />
+    <size
+        android:width="30dp"
+        android:height="30dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/step_rectangle_current.xml b/app/src/main/res/drawable/step_rectangle_current.xml
new file mode 100644
index 00000000..1d0bf523
--- /dev/null
+++ b/app/src/main/res/drawable/step_rectangle_current.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#1C8DD4" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/step_rectangle_normal.xml b/app/src/main/res/drawable/step_rectangle_normal.xml
new file mode 100644
index 00000000..ff11851f
--- /dev/null
+++ b/app/src/main/res/drawable/step_rectangle_normal.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#CCCCCC" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_applist.xml b/app/src/main/res/layout/activity_applist.xml
index b7bdb25c..4cafd79f 100644
--- a/app/src/main/res/layout/activity_applist.xml
+++ b/app/src/main/res/layout/activity_applist.xml
@@ -37,16 +37,16 @@
         android:layout_width="fill_parent"
         android:layout_marginTop="5dp"
         android:layout_height="1dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"
         android:background="#aadcdcdc" />
 
     <ListView
         android:id="@+id/list_view_app"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"
         android:layout_marginTop="0dp"
         android:layout_weight="1" />
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index bb06ead4..3035b9d2 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,13 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
-    <LinearLayout
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/btnCleanLog"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginEnd="10dp"
+        android:layout_marginBottom="90dp"
+        android:background="@color/colorPrimary"
+        android:contentDescription="@string/clean_log"
+        android:onClick="cleanLog"
+        android:scaleType="centerCrop"
+        android:src="@drawable/ic_delete"
+        app:elevation="8dp"
+        tools:ignore="UsingOnClickInXml" />
+
+    <LinearLayout
+        android:id="@+id/radioGroup"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="5dip"
         android:orientation="horizontal">
@@ -15,14 +34,16 @@
         <RadioGroup
             android:id="@+id/radioGroupTypeCheck"
             style="@style/rg_style"
+            android:layout_width="match_parent"
+            android:gravity="center"
             android:orientation="horizontal">
 
             <RadioButton
                 android:id="@+id/btnTypeSms"
                 style="@style/select_style"
+                android:checked="true"
                 android:tag="sms"
-                android:text="@string/sms"
-                android:checked="true" />
+                android:text="@string/sms" />
 
             <RadioButton
                 android:id="@+id/btnTypeCall"
@@ -42,13 +63,18 @@
     <com.idormy.sms.forwarder.RefreshListView
         android:id="@+id/list_view_log"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_margin="5dp"
-        android:layout_weight="1" />
+        android:layout_height="match_parent"
+        android:layout_below="@+id/radioGroup"
+        android:layout_marginStart="5dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginEnd="5dp"
+        android:layout_marginBottom="25dp" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
         android:orientation="vertical">
 
         <TextView
@@ -59,7 +85,39 @@
             android:text="@string/log_tips"
             android:textColor="@color/colorPrimary" />
 
-        <LinearLayout
+        <View
+            android:id="@+id/radioGroupLine"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginStart="5dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="5dp"
+            android:background="#aadcdcdc" />
+
+        <!--<com.shuhart.stepview.StepView
+            android:id="@+id/step_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="5dp"
+            app:sv_selectedCircleColor="@color/colorPrimary"
+            app:sv_selectedTextColor="@color/colorPrimary"
+            app:sv_stepLineWidth="2dp"
+            app:sv_stepPadding="2dp"
+            app:sv_nextTextColor="@color/gray"
+            app:sv_nextStepLineColor="@color/gray"
+            app:sv_nextStepCircleEnabled="true"
+            app:sv_nextStepCircleColor="@color/gray"
+            app:sv_doneCircleColor="@color/colorPrimary"
+            app:sv_doneStepLineColor="@color/colorPrimary"
+            app:sv_doneCircleRadius="15dp"
+            app:sv_selectedCircleRadius="15dp"
+            app:sv_selectedStepNumberColor="@color/white"
+            app:sv_stepViewStyle="@style/StepView"
+            app:sv_doneStepMarkColor="@color/colorPrimaryDark"
+            app:sv_stepNumberTextSize="15sp"
+            app:sv_animationType="Line" />-->
+
+        <!--<LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
@@ -91,16 +149,186 @@
             <Button
                 android:layout_width="match_parent"
                 android:layout_height="35dp"
-                android:layout_marginLeft="10dp"
+                android:layout_marginStart="10dp"
                 android:layout_marginTop="5dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginEnd="10dp"
                 android:layout_marginBottom="10dp"
                 android:layout_weight="1"
                 android:background="@color/colorPrimary"
                 android:onClick="toSendSetting"
                 android:text="@string/sender_setting"
                 tools:ignore="ButtonStyle,UsingOnClickInXml" />
+        </LinearLayout>-->
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="10dp"
+            android:gravity="center_vertical">
+
+            <View
+                android:layout_width="15dp"
+                android:layout_height="match_parent" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/step_circle_current"
+                android:gravity="center"
+                android:text="@string/_1"
+                android:textColor="#fff"
+                android:textSize="18sp" />
+
+            <ImageView
+                android:layout_width="15dp"
+                android:layout_height="4dp"
+                android:layout_gravity="center"
+                android:src="@drawable/step_rectangle_current"
+                tools:ignore="ContentDescription" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="4dp"
+                android:layout_weight="1"
+                android:src="@drawable/step_rectangle_current"
+                tools:ignore="ContentDescription" />
+
+            <ImageView
+                android:layout_width="15dp"
+                android:layout_height="4dp"
+                android:layout_gravity="center"
+                android:src="@drawable/step_rectangle_current"
+                tools:ignore="ContentDescription" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/step_circle_current"
+                android:gravity="center"
+                android:text="@string/_2"
+                android:textColor="#fff"
+                android:textSize="18sp" />
+
+            <ImageView
+                android:layout_width="15dp"
+                android:layout_height="4dp"
+                android:layout_gravity="center"
+                android:src="@drawable/step_rectangle_normal"
+                tools:ignore="ContentDescription" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="4dp"
+                android:layout_weight="1"
+                android:src="@drawable/step_rectangle_normal"
+                tools:ignore="ContentDescription" />
+
+            <ImageView
+                android:layout_width="15dp"
+                android:layout_height="4dp"
+                android:layout_gravity="center"
+                android:src="@drawable/step_rectangle_normal"
+                tools:ignore="ContentDescription" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/step_circle_normal"
+                android:gravity="center"
+                android:text="@string/_3"
+                android:textColor="#fff"
+                android:textSize="18sp" />
+
+            <ImageView
+                android:layout_width="15dp"
+                android:layout_height="4dp"
+                android:layout_gravity="center"
+                android:src="@drawable/step_rectangle_normal"
+                tools:ignore="ContentDescription" />
+
+            <ImageView
+                android:layout_width="0dp"
+                android:layout_height="4dp"
+                android:layout_weight="1"
+                android:src="@drawable/step_rectangle_normal"
+                tools:ignore="ContentDescription" />
+
+
+            <ImageView
+                android:layout_width="15dp"
+                android:layout_height="4dp"
+                android:layout_gravity="center"
+                android:src="@drawable/step_rectangle_normal"
+                tools:ignore="ContentDescription" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/step_circle_normal"
+                android:gravity="center"
+                android:text="@string/_4"
+                android:textColor="#fff"
+                android:textSize="18sp" />
+
+            <View
+                android:layout_width="15dp"
+                android:layout_height="match_parent" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="10dp">
+
+            <TextView
+                android:layout_width="60dp"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/step_1"
+                android:textSize="12sp" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1" />
+
+            <TextView
+                android:layout_width="60dp"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/step_2"
+                android:textSize="12sp" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1" />
+
+            <TextView
+                android:layout_width="60dp"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/step_3"
+                android:textSize="12sp" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1" />
+
+            <TextView
+                android:layout_width="60dp"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/step_4"
+                android:textSize="12sp" />
         </LinearLayout>
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_rule.xml b/app/src/main/res/layout/activity_rule.xml
index 5c3c25bd..8a03d1ea 100644
--- a/app/src/main/res/layout/activity_rule.xml
+++ b/app/src/main/res/layout/activity_rule.xml
@@ -1,28 +1,79 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/addSmsRule"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginEnd="10dp"
+        android:layout_marginBottom="20dp"
+        android:background="@color/colorPrimary"
+        android:onClick="addRule"
+        android:scaleType="centerCrop"
+        android:src="@drawable/ic_add"
+        android:tag="sms"
+        app:elevation="8dp" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/addCallRule"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginEnd="10dp"
+        android:layout_marginBottom="20dp"
+        android:background="@color/colorPrimary"
+        android:onClick="addRule"
+        android:scaleType="centerCrop"
+        android:src="@drawable/ic_add"
+        android:tag="call"
+        app:elevation="8dp"
+        android:visibility="gone" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/addAppRule"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginEnd="10dp"
+        android:layout_marginBottom="20dp"
+        android:background="@color/colorPrimary"
+        android:onClick="addRule"
+        android:scaleType="centerCrop"
+        android:src="@drawable/ic_add"
+        android:tag="app"
+        app:elevation="8dp"
+        android:visibility="gone" />
 
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:id="@+id/radioGroup"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="5dip"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentStart="true"
         android:orientation="horizontal">
 
         <RadioGroup
             android:id="@+id/radioGroupTypeCheck"
+            android:layout_width="match_parent"
             style="@style/rg_style"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:gravity="center">
 
             <RadioButton
                 android:id="@+id/btnTypeSms"
                 style="@style/select_style"
+                android:checked="true"
                 android:tag="sms"
-                android:text="@string/sms"
-                android:checked="true" />
+                android:text="@string/sms" />
 
             <RadioButton
                 android:id="@+id/btnTypeCall"
@@ -40,85 +91,34 @@
     </LinearLayout>
 
     <View
-        android:layout_width="fill_parent"
-        android:layout_marginTop="5dp"
+        android:id="@+id/radioGroupLine"
+        android:layout_below="@+id/radioGroup"
+        android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
+        android:layout_marginStart="5dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginEnd="5dp"
         android:background="#aadcdcdc" />
 
     <ListView
         android:id="@+id/list_view_rule"
+        android:layout_below="@+id/radioGroupLine"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
-        android:layout_marginTop="0dp"
+        android:layout_height="match_parent"
+        android:layout_marginTop="5dp"
+        android:layout_marginEnd="5dp"
+        android:layout_marginBottom="25dp"
+        android:layout_marginStart="5dp"
         android:layout_weight="1" />
 
-    <LinearLayout
+    <TextView
+        android:id="@+id/help_tip"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_alignParentStart="true"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:text="@string/rule_tips"
+        android:textColor="@color/colorPrimary" />
 
-        <TextView
-            android:id="@+id/help_tip"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/rule_tips"
-            android:textColor="@color/colorPrimary" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="5dip"
-            android:orientation="horizontal">
-
-            <Button
-                android:layout_width="match_parent"
-                android:layout_height="35dp"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="5dp"
-                android:layout_marginBottom="10dp"
-                android:layout_weight="1"
-                android:background="@color/colorPrimary"
-                android:onClick="addRule"
-                android:tag="sms"
-                android:padding="0dp"
-                android:text="@string/new_sms_rule"
-                tools:ignore="ButtonStyle,UsingOnClickInXml" />
-
-            <Button
-                android:layout_width="match_parent"
-                android:layout_height="35dp"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="5dp"
-                android:layout_marginBottom="10dp"
-                android:layout_weight="1"
-                android:background="@color/colorPrimary"
-                android:onClick="addRule"
-                android:tag="call"
-                android:padding="0dp"
-                android:text="@string/new_call_rule"
-                tools:ignore="ButtonStyle,UsingOnClickInXml" />
-
-            <Button
-                android:layout_width="match_parent"
-                android:layout_height="35dp"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="5dp"
-                android:layout_marginRight="10dp"
-                android:layout_marginBottom="10dp"
-                android:layout_weight="1"
-                android:background="@color/colorPrimary"
-                android:onClick="addRule"
-                android:tag="app"
-                android:padding="0dp"
-                android:text="@string/new_app_rule"
-                tools:ignore="ButtonStyle,UsingOnClickInXml" />
-        </LinearLayout>
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sender.xml b/app/src/main/res/layout/activity_sender.xml
index 64173eea..7549c386 100644
--- a/app/src/main/res/layout/activity_sender.xml
+++ b/app/src/main/res/layout/activity_sender.xml
@@ -7,9 +7,9 @@
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginRight="10dp"
+        android:layout_marginEnd="10dp"
         android:layout_marginBottom="20dp"
         android:background="@color/colorPrimary"
         android:onClick="addSender"
@@ -21,7 +21,7 @@
         android:id="@+id/help_tip"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_alignParentBottom="true"
         android:gravity="center"
         android:text="@string/sender_tips"
@@ -31,7 +31,10 @@
         android:id="@+id/list_view_sender"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_margin="5dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginEnd="5dp"
+        android:layout_marginBottom="25dp"
+        android:layout_marginStart="5dp"
         android:layout_weight="1" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index e8473136..fb92f290 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -107,7 +107,6 @@
                         android:layout_height="wrap_content"
                         android:text="未接来电"
                         android:id="@+id/chb_music"
-                        android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true" />
 
                     <CheckBox
diff --git a/app/src/main/res/layout/alert_dialog_setview_bark.xml b/app/src/main/res/layout/alert_dialog_setview_bark.xml
index 05535514..0e39ae03 100644
--- a/app/src/main/res/layout/alert_dialog_setview_bark.xml
+++ b/app/src/main/res/layout/alert_dialog_setview_bark.xml
@@ -13,8 +13,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -48,9 +48,9 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
             android:layout_marginTop="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="vertical">
 
             <TextView
@@ -80,9 +80,9 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
             android:layout_marginTop="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="vertical">
 
             <TextView
diff --git a/app/src/main/res/layout/alert_dialog_setview_dingding.xml b/app/src/main/res/layout/alert_dialog_setview_dingding.xml
index ed4f36fe..3d42ac22 100644
--- a/app/src/main/res/layout/alert_dialog_setview_dingding.xml
+++ b/app/src/main/res/layout/alert_dialog_setview_dingding.xml
@@ -13,8 +13,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -48,8 +48,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:layout_marginTop="10dp"
             android:orientation="vertical">
 
@@ -81,8 +81,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:layout_marginTop="10dp"
             android:orientation="vertical">
 
@@ -106,8 +106,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:layout_marginTop="10dp"
             android:orientation="horizontal">
 
@@ -132,8 +132,8 @@
             android:id="@+id/linearLayoutDingdingAtMobiles"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:layout_marginTop="10dp"
             android:orientation="vertical"
             android:visibility="gone">
diff --git a/app/src/main/res/layout/alert_dialog_setview_email.xml b/app/src/main/res/layout/alert_dialog_setview_email.xml
index 0285fa96..3f6015b3 100644
--- a/app/src/main/res/layout/alert_dialog_setview_email.xml
+++ b/app/src/main/res/layout/alert_dialog_setview_email.xml
@@ -13,8 +13,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -58,8 +58,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -83,8 +83,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -107,8 +107,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -142,8 +142,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:layout_marginTop="5dp"
             android:orientation="horizontal"
             android:visibility="gone">
@@ -181,8 +181,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -206,8 +206,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
diff --git a/app/src/main/res/layout/alert_dialog_setview_feishu.xml b/app/src/main/res/layout/alert_dialog_setview_feishu.xml
index b57b67a8..f1304f64 100644
--- a/app/src/main/res/layout/alert_dialog_setview_feishu.xml
+++ b/app/src/main/res/layout/alert_dialog_setview_feishu.xml
@@ -13,8 +13,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -48,8 +48,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:layout_marginTop="10dp"
             android:orientation="vertical">
 
@@ -74,8 +74,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:layout_marginTop="10dp"
             android:orientation="vertical">
 
diff --git a/app/src/main/res/layout/alert_dialog_setview_gotify.xml b/app/src/main/res/layout/alert_dialog_setview_gotify.xml
index 8cda7c19..43344326 100644
--- a/app/src/main/res/layout/alert_dialog_setview_gotify.xml
+++ b/app/src/main/res/layout/alert_dialog_setview_gotify.xml
@@ -13,8 +13,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -49,9 +49,9 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="vertical">
 
             <LinearLayout
@@ -187,8 +187,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
diff --git a/app/src/main/res/layout/alert_dialog_setview_pushplus.xml b/app/src/main/res/layout/alert_dialog_setview_pushplus.xml
index 1635f6f9..bf2444b2 100644
--- a/app/src/main/res/layout/alert_dialog_setview_pushplus.xml
+++ b/app/src/main/res/layout/alert_dialog_setview_pushplus.xml
@@ -13,8 +13,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -48,8 +48,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="vertical">
 
             <LinearLayout
@@ -87,8 +87,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -112,8 +112,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -137,8 +137,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -162,8 +162,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -187,8 +187,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -212,8 +212,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
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 9c3a1bc8..28473096 100644
--- a/app/src/main/res/layout/alert_dialog_setview_qywxapp.xml
+++ b/app/src/main/res/layout/alert_dialog_setview_qywxapp.xml
@@ -13,8 +13,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -49,8 +49,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -74,8 +74,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -100,8 +100,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -126,8 +126,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:layout_marginTop="10dp"
             android:orientation="horizontal">
 
@@ -156,8 +156,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:orientation="horizontal">
 
                 <TextView
@@ -181,8 +181,8 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/specified_member_tips"
                 android:textSize="10sp"
                 tools:ignore="SmallSp" />
diff --git a/app/src/main/res/layout/alert_dialog_setview_qywxgrouprobot.xml b/app/src/main/res/layout/alert_dialog_setview_qywxgrouprobot.xml
index 0a68154d..7c68664b 100644
--- a/app/src/main/res/layout/alert_dialog_setview_qywxgrouprobot.xml
+++ b/app/src/main/res/layout/alert_dialog_setview_qywxgrouprobot.xml
@@ -13,8 +13,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -48,8 +48,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="vertical">
 
             <LinearLayout
diff --git a/app/src/main/res/layout/alert_dialog_setview_serverchan.xml b/app/src/main/res/layout/alert_dialog_setview_serverchan.xml
index 301523ba..de1131f6 100644
--- a/app/src/main/res/layout/alert_dialog_setview_serverchan.xml
+++ b/app/src/main/res/layout/alert_dialog_setview_serverchan.xml
@@ -13,8 +13,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -48,8 +48,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="vertical">
 
             <TextView
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 d9b87475..9fccd81c 100644
--- a/app/src/main/res/layout/alert_dialog_setview_sms.xml
+++ b/app/src/main/res/layout/alert_dialog_setview_sms.xml
@@ -12,8 +12,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -47,9 +47,9 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -87,9 +87,9 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="vertical">
 
             <LinearLayout
@@ -127,8 +127,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
diff --git a/app/src/main/res/layout/alert_dialog_setview_telegram.xml b/app/src/main/res/layout/alert_dialog_setview_telegram.xml
index 75716c29..d6799407 100644
--- a/app/src/main/res/layout/alert_dialog_setview_telegram.xml
+++ b/app/src/main/res/layout/alert_dialog_setview_telegram.xml
@@ -13,8 +13,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -48,8 +48,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="vertical">
 
             <TextView
@@ -73,8 +73,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:layout_marginTop="10dp"
             android:orientation="horizontal">
 
@@ -112,8 +112,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:layout_marginTop="10dp"
             android:orientation="vertical">
 
@@ -176,8 +176,8 @@
             android:id="@+id/layoutProxyHost"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal"
             android:visibility="gone">
 
@@ -202,8 +202,8 @@
             android:id="@+id/layoutProxyPort"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal"
             android:visibility="gone">
 
@@ -242,8 +242,8 @@
             android:id="@+id/layoutProxyAuthenticator"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="vertical"
             android:visibility="gone">
 
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 92262493..31c1b4e5 100644
--- a/app/src/main/res/layout/alert_dialog_setview_webnotify.xml
+++ b/app/src/main/res/layout/alert_dialog_setview_webnotify.xml
@@ -13,8 +13,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -48,8 +48,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal">
 
             <TextView
@@ -86,8 +86,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="vertical">
 
             <LinearLayout
@@ -124,8 +124,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="vertical">
 
             <TextView
@@ -155,8 +155,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="vertical">
 
             <TextView
diff --git a/app/src/main/res/layout/diaolog_privacy_policy.xml b/app/src/main/res/layout/diaolog_privacy_policy.xml
index 2c0d450d..bf7b5c1e 100644
--- a/app/src/main/res/layout/diaolog_privacy_policy.xml
+++ b/app/src/main/res/layout/diaolog_privacy_policy.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:tools="http://schemas.android.com/tools"
     android:background="#fff"
-    android:layout_marginLeft="20dp"
-    android:layout_marginRight="20dp"
+    android:layout_marginStart="20dp"
+    android:layout_marginEnd="20dp"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
@@ -21,8 +21,8 @@
 
     <TextView
         android:id="@+id/textlike"
-        android:layout_marginRight="5dp"
-        android:layout_marginLeft="5dp"
+        android:layout_marginEnd="5dp"
+        android:layout_marginStart="5dp"
         android:layout_marginBottom="10dp"
         android:layout_width="wrap_content"
         android:textColor="#000"
diff --git a/app/src/main/res/layout/edit_text_clear.xml b/app/src/main/res/layout/edit_text_clear.xml
index afc3a430..1384edd8 100644
--- a/app/src/main/res/layout/edit_text_clear.xml
+++ b/app/src/main/res/layout/edit_text_clear.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -13,8 +12,8 @@
         android:id="@+id/iv_edit_left_icon"
         android:layout_width="30dp"
         android:layout_height="45dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"
         android:layout_centerVertical="true"
         android:scaleType="centerInside"
         android:src="@drawable/icon_login"
@@ -36,7 +35,7 @@
         android:layout_width="90dp"
         android:layout_height="45dp"
         android:layout_centerVertical="true"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:gravity="right">
 
         <ImageView
diff --git a/app/src/main/res/values-en/colors.xml b/app/src/main/res/values-en/colors.xml
index ea4e5a79..8f791fd7 100644
--- a/app/src/main/res/values-en/colors.xml
+++ b/app/src/main/res/values-en/colors.xml
@@ -11,6 +11,7 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="gray">#CCCCCC</color>
 
     <color name="tv_black_333333">#333333</color>
     <color name="tv_gray_999999">#999999</color>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 39f31e19..edb5d119 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -307,4 +307,12 @@
     <string name="pushplus">PushPlus</string>
     <string name="gotify">Gotify</string>
     <string name="add">Add</string>
+    <string name="_2">2</string>
+    <string name="_3">3</string>
+    <string name="_4">4</string>
+    <string name="step_1">Settings</string>
+    <string name="step_2">Senders</string>
+    <string name="step_3">Rules</string>
+    <string name="step_4">Logs</string>
+    <string name="clean_log">Clean Log</string>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ea4e5a79..8f791fd7 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -11,6 +11,7 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="gray">#CCCCCC</color>
 
     <color name="tv_black_333333">#333333</color>
     <color name="tv_gray_999999">#999999</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2badc03e..09143194 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,7 +16,7 @@
     <string name="rule_setting">转发规则</string>
     <string name="sender_setting">发送通道</string>
     <string name="app_list">应用列表</string>
-    <string name="log_tips">提示：置顶下拉刷新，长按删除单条，选项卡切换日志类型</string>
+    <string name="log_tips">提示：置顶下拉刷新，长按删除单条，选项卡切换日志类型\n首次使用按以下步骤设置，该步骤点亮表示已设置！</string>
     <string name="rule_tips">提示：新建规则点击“添加”，长按删除/克隆，点击编辑已有</string>
     <string name="sender_tips">提示：新建发送通道点击“添加”，长按删除/克隆，点击编辑已有</string>
     <string name="app_tips">提示：点击复制APP的包名，长按则启动并跳转该APP</string>
@@ -306,4 +306,13 @@
     <string name="pushplus">PushPlus</string>
     <string name="gotify">Gotify</string>
     <string name="add">添加</string>
+    <string name="_1">1</string>
+    <string name="_2">2</string>
+    <string name="_3">3</string>
+    <string name="_4">4</string>
+    <string name="step_1">选择功能</string>
+    <string name="step_2">发送通道</string>
+    <string name="step_3">转发规则</string>
+    <string name="step_4">转发日志</string>
+    <string name="clean_log">清理日志</string>
 </resources>
diff --git a/build.gradle b/build.gradle
index ce1afdd9..df233e42 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,6 +2,7 @@
 
 buildscript {
     repositories {
+        jcenter()
         maven { url 'https://maven.aliyun.com/repository/google' }
         maven { url 'https://maven.aliyun.com/repository/central' }
         maven { url 'https://maven.aliyun.com/repository/public' }
@@ -17,6 +18,7 @@ buildscript {
 
 allprojects {
     repositories {
+        jcenter()
         maven { url 'https://maven.aliyun.com/repository/google' }
         maven { url 'https://maven.aliyun.com/repository/central' }
         maven { url 'https://maven.aliyun.com/repository/public' }