From d3fc481d0c21a12bb99d3b46034b31a6ad7ff82e Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Wed, 20 Dec 2023 11:15:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80=EF=BC=9A=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/fragment_rules_edit.xml   | 23 ++---
 .../main/res/layout/fragment_senders_bark.xml | 23 ++---
 .../fragment_senders_dingtalk_group_robot.xml | 23 ++---
 .../fragment_senders_dingtalk_inner_robot.xml | 23 ++---
 .../res/layout/fragment_senders_email.xml     | 23 ++---
 .../res/layout/fragment_senders_feishu.xml    | 23 ++---
 .../layout/fragment_senders_feishu_app.xml    | 23 ++---
 .../res/layout/fragment_senders_gotify.xml    | 23 ++---
 .../res/layout/fragment_senders_pushplus.xml  | 23 ++---
 .../layout/fragment_senders_serverchan.xml    | 23 ++---
 .../main/res/layout/fragment_senders_sms.xml  | 23 ++---
 .../res/layout/fragment_senders_socket.xml    | 23 ++---
 .../res/layout/fragment_senders_telegram.xml  | 23 ++---
 .../layout/fragment_senders_url_scheme.xml    | 23 ++---
 .../res/layout/fragment_senders_webhook.xml   | 23 ++---
 .../layout/fragment_senders_wework_agent.xml  | 23 ++---
 .../layout/fragment_senders_wework_robot.xml  | 23 ++---
 .../res/layout/fragment_tasks_action_frpc.xml | 23 ++---
 .../fragment_tasks_action_notification.xml    | 23 ++---
 .../layout/fragment_tasks_action_send_sms.xml | 23 ++---
 .../fragment_tasks_condition_battery.xml      | 27 +-----
 .../fragment_tasks_condition_charge.xml       | 27 +-----
 .../layout/fragment_tasks_condition_cron.xml  | 23 ++---
 ...fragment_tasks_condition_leave_address.xml | 27 +-----
 .../fragment_tasks_condition_lock_screen.xml  | 27 +-----
 .../fragment_tasks_condition_network.xml      | 27 +-----
 .../layout/fragment_tasks_condition_sim.xml   | 27 +-----
 .../fragment_tasks_condition_to_address.xml   | 27 +-----
 .../main/res/layout/fragment_tasks_edit.xml   | 23 ++---
 app/src/main/res/values-en/strings.xml        |  5 --
 app/src/main/res/values-v21/styles.xml        | 85 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  5 --
 app/src/main/res/values/styles.xml            | 23 +++++
 33 files changed, 268 insertions(+), 545 deletions(-)
 create mode 100644 app/src/main/res/values-v21/styles.xml

diff --git a/app/src/main/res/layout/fragment_rules_edit.xml b/app/src/main/res/layout/fragment_rules_edit.xml
index c3b050f4..4800c8ce 100644
--- a/app/src/main/res/layout/fragment_rules_edit.xml
+++ b/app/src/main/res/layout/fragment_rules_edit.xml
@@ -577,34 +577,23 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/del_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/del"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/save_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/save"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Green.Icon.Spacing"
             android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/test"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_senders_bark.xml b/app/src/main/res/layout/fragment_senders_bark.xml
index 2a81ffcf..039cde8b 100644
--- a/app/src/main/res/layout/fragment_senders_bark.xml
+++ b/app/src/main/res/layout/fragment_senders_bark.xml
@@ -384,34 +384,23 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/del_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/del"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/save_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/save"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Green.Icon.Spacing"
             android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/test"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_senders_dingtalk_group_robot.xml b/app/src/main/res/layout/fragment_senders_dingtalk_group_robot.xml
index 72a9eb37..a9230488 100644
--- a/app/src/main/res/layout/fragment_senders_dingtalk_group_robot.xml
+++ b/app/src/main/res/layout/fragment_senders_dingtalk_group_robot.xml
@@ -298,34 +298,23 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/del_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/del"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/save_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/save"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Green.Icon.Spacing"
             android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/test"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_senders_dingtalk_inner_robot.xml b/app/src/main/res/layout/fragment_senders_dingtalk_inner_robot.xml
index 523b4716..81c8416e 100644
--- a/app/src/main/res/layout/fragment_senders_dingtalk_inner_robot.xml
+++ b/app/src/main/res/layout/fragment_senders_dingtalk_inner_robot.xml
@@ -422,34 +422,23 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/del_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/del"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/save_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/save"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Green.Icon.Spacing"
             android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/test"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_senders_email.xml b/app/src/main/res/layout/fragment_senders_email.xml
index 36e8b675..24936e0c 100644
--- a/app/src/main/res/layout/fragment_senders_email.xml
+++ b/app/src/main/res/layout/fragment_senders_email.xml
@@ -408,34 +408,23 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/del_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/del"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/save_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/save"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Green.Icon.Spacing"
             android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/test"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_senders_feishu.xml b/app/src/main/res/layout/fragment_senders_feishu.xml
index d01850fd..6d8af3a4 100644
--- a/app/src/main/res/layout/fragment_senders_feishu.xml
+++ b/app/src/main/res/layout/fragment_senders_feishu.xml
@@ -203,34 +203,23 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/del_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/del"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/save_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/save"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Green.Icon.Spacing"
             android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/test"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_senders_feishu_app.xml b/app/src/main/res/layout/fragment_senders_feishu_app.xml
index 7e766170..ba40018e 100644
--- a/app/src/main/res/layout/fragment_senders_feishu_app.xml
+++ b/app/src/main/res/layout/fragment_senders_feishu_app.xml
@@ -233,34 +233,23 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/del_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/del"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/save_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/save"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Green.Icon.Spacing"
             android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/test"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_senders_gotify.xml b/app/src/main/res/layout/fragment_senders_gotify.xml
index fac804f4..13c0f294 100644
--- a/app/src/main/res/layout/fragment_senders_gotify.xml
+++ b/app/src/main/res/layout/fragment_senders_gotify.xml
@@ -184,34 +184,23 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/del_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/del"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/save_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/save"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Green.Icon.Spacing"
             android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/test"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_senders_pushplus.xml b/app/src/main/res/layout/fragment_senders_pushplus.xml
index 48852fc8..2f21cadd 100644
--- a/app/src/main/res/layout/fragment_senders_pushplus.xml
+++ b/app/src/main/res/layout/fragment_senders_pushplus.xml
@@ -330,34 +330,23 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/del_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/del"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/save_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/save"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Green.Icon.Spacing"
             android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/test"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_senders_serverchan.xml b/app/src/main/res/layout/fragment_senders_serverchan.xml
index adc28291..648f6e87 100644
--- a/app/src/main/res/layout/fragment_senders_serverchan.xml
+++ b/app/src/main/res/layout/fragment_senders_serverchan.xml
@@ -160,34 +160,23 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/del_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/del"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/save_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/save"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Green.Icon.Spacing"
             android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/test"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_senders_sms.xml b/app/src/main/res/layout/fragment_senders_sms.xml
index 5cf8bfb8..040e7de9 100644
--- a/app/src/main/res/layout/fragment_senders_sms.xml
+++ b/app/src/main/res/layout/fragment_senders_sms.xml
@@ -164,34 +164,23 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/del_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/del"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/save_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/save"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Green.Icon.Spacing"
             android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/test"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_senders_socket.xml b/app/src/main/res/layout/fragment_senders_socket.xml
index 27e1c60d..94adf0df 100644
--- a/app/src/main/res/layout/fragment_senders_socket.xml
+++ b/app/src/main/res/layout/fragment_senders_socket.xml
@@ -432,34 +432,23 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/del_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/del"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/save_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/save"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Green.Icon.Spacing"
             android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/test"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_senders_telegram.xml b/app/src/main/res/layout/fragment_senders_telegram.xml
index 4e54f8ce..44cf2db4 100644
--- a/app/src/main/res/layout/fragment_senders_telegram.xml
+++ b/app/src/main/res/layout/fragment_senders_telegram.xml
@@ -285,34 +285,23 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/del_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/del"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/save_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/save"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Green.Icon.Spacing"
             android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/test"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_senders_url_scheme.xml b/app/src/main/res/layout/fragment_senders_url_scheme.xml
index 46625ed7..0f14cf25 100644
--- a/app/src/main/res/layout/fragment_senders_url_scheme.xml
+++ b/app/src/main/res/layout/fragment_senders_url_scheme.xml
@@ -90,34 +90,23 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/del_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/del"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/save_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/save"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Green.Icon.Spacing"
             android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/test"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_senders_webhook.xml b/app/src/main/res/layout/fragment_senders_webhook.xml
index f90c1cf0..db0796e6 100644
--- a/app/src/main/res/layout/fragment_senders_webhook.xml
+++ b/app/src/main/res/layout/fragment_senders_webhook.xml
@@ -259,34 +259,23 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/del_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/del"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/save_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/save"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Green.Icon.Spacing"
             android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/test"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_senders_wework_agent.xml b/app/src/main/res/layout/fragment_senders_wework_agent.xml
index 0fdc9c14..c723bff5 100644
--- a/app/src/main/res/layout/fragment_senders_wework_agent.xml
+++ b/app/src/main/res/layout/fragment_senders_wework_agent.xml
@@ -463,34 +463,23 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/del_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/del"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/save_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/save"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Green.Icon.Spacing"
             android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/test"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_senders_wework_robot.xml b/app/src/main/res/layout/fragment_senders_wework_robot.xml
index bc625264..62e4c4aa 100644
--- a/app/src/main/res/layout/fragment_senders_wework_robot.xml
+++ b/app/src/main/res/layout/fragment_senders_wework_robot.xml
@@ -221,34 +221,23 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/del_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/del"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/save_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/save"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Green.Icon.Spacing"
             android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/test"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_tasks_action_frpc.xml b/app/src/main/res/layout/fragment_tasks_action_frpc.xml
index 7af96fce..4e4baf5d 100644
--- a/app/src/main/res/layout/fragment_tasks_action_frpc.xml
+++ b/app/src/main/res/layout/fragment_tasks_action_frpc.xml
@@ -149,34 +149,23 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/discard_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/discard"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/submit_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/submit"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Green.Icon.Spacing"
             android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/test"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_tasks_action_notification.xml b/app/src/main/res/layout/fragment_tasks_action_notification.xml
index ca24d007..a29d8588 100644
--- a/app/src/main/res/layout/fragment_tasks_action_notification.xml
+++ b/app/src/main/res/layout/fragment_tasks_action_notification.xml
@@ -338,34 +338,23 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/discard_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/discard"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/submit_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/submit"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Green.Icon.Spacing"
             android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/test"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_tasks_action_send_sms.xml b/app/src/main/res/layout/fragment_tasks_action_send_sms.xml
index 90eb8862..3a988aba 100644
--- a/app/src/main/res/layout/fragment_tasks_action_send_sms.xml
+++ b/app/src/main/res/layout/fragment_tasks_action_send_sms.xml
@@ -152,34 +152,23 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/discard_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/discard"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/submit_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/submit"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Green.Icon.Spacing"
             android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/test"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_tasks_condition_battery.xml b/app/src/main/res/layout/fragment_tasks_condition_battery.xml
index 3e25bed3..43b304a5 100644
--- a/app/src/main/res/layout/fragment_tasks_condition_battery.xml
+++ b/app/src/main/res/layout/fragment_tasks_condition_battery.xml
@@ -163,35 +163,16 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/discard_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/discard"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/submit_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
-            tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
-
-        <com.xuexiang.xui.widget.textview.supertextview.SuperButton
-            android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
-            android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
-            android:visibility="gone"
+            android:text="@string/submit"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_tasks_condition_charge.xml b/app/src/main/res/layout/fragment_tasks_condition_charge.xml
index c5fcfc05..5ba0f4fc 100644
--- a/app/src/main/res/layout/fragment_tasks_condition_charge.xml
+++ b/app/src/main/res/layout/fragment_tasks_condition_charge.xml
@@ -163,35 +163,16 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/discard_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/discard"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/submit_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
-            tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
-
-        <com.xuexiang.xui.widget.textview.supertextview.SuperButton
-            android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
-            android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
-            android:visibility="gone"
+            android:text="@string/submit"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_tasks_condition_cron.xml b/app/src/main/res/layout/fragment_tasks_condition_cron.xml
index 86ada66f..22f77e98 100644
--- a/app/src/main/res/layout/fragment_tasks_condition_cron.xml
+++ b/app/src/main/res/layout/fragment_tasks_condition_cron.xml
@@ -1287,34 +1287,23 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/discard_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/discard"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/submit_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/submit"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Green.Icon.Spacing"
             android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/test"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_tasks_condition_leave_address.xml b/app/src/main/res/layout/fragment_tasks_condition_leave_address.xml
index 3a61adaf..499c78ad 100644
--- a/app/src/main/res/layout/fragment_tasks_condition_leave_address.xml
+++ b/app/src/main/res/layout/fragment_tasks_condition_leave_address.xml
@@ -232,35 +232,16 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/discard_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/discard"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/submit_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
-            tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
-
-        <com.xuexiang.xui.widget.textview.supertextview.SuperButton
-            android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
-            android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
-            android:visibility="gone"
+            android:text="@string/submit"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_tasks_condition_lock_screen.xml b/app/src/main/res/layout/fragment_tasks_condition_lock_screen.xml
index f13aa548..a275199d 100644
--- a/app/src/main/res/layout/fragment_tasks_condition_lock_screen.xml
+++ b/app/src/main/res/layout/fragment_tasks_condition_lock_screen.xml
@@ -127,35 +127,16 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/discard_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/discard"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/submit_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
-            tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
-
-        <com.xuexiang.xui.widget.textview.supertextview.SuperButton
-            android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
-            android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
-            android:visibility="gone"
+            android:text="@string/submit"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_tasks_condition_network.xml b/app/src/main/res/layout/fragment_tasks_condition_network.xml
index 46fd62fb..ab58e6f1 100644
--- a/app/src/main/res/layout/fragment_tasks_condition_network.xml
+++ b/app/src/main/res/layout/fragment_tasks_condition_network.xml
@@ -190,35 +190,16 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/discard_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/discard"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/submit_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
-            tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
-
-        <com.xuexiang.xui.widget.textview.supertextview.SuperButton
-            android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
-            android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
-            android:visibility="gone"
+            android:text="@string/submit"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_tasks_condition_sim.xml b/app/src/main/res/layout/fragment_tasks_condition_sim.xml
index dba7f932..a8375ce3 100644
--- a/app/src/main/res/layout/fragment_tasks_condition_sim.xml
+++ b/app/src/main/res/layout/fragment_tasks_condition_sim.xml
@@ -98,35 +98,16 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/discard_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/discard"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/submit_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
-            tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
-
-        <com.xuexiang.xui.widget.textview.supertextview.SuperButton
-            android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
-            android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
-            android:visibility="gone"
+            android:text="@string/submit"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_tasks_condition_to_address.xml b/app/src/main/res/layout/fragment_tasks_condition_to_address.xml
index 3b2d64b6..2fc7d7d6 100644
--- a/app/src/main/res/layout/fragment_tasks_condition_to_address.xml
+++ b/app/src/main/res/layout/fragment_tasks_condition_to_address.xml
@@ -232,35 +232,16 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/discard_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/discard"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/submit_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
-            tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
-
-        <com.xuexiang.xui.widget.textview.supertextview.SuperButton
-            android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
-            android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
-            android:visibility="gone"
+            android:text="@string/submit"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_tasks_edit.xml b/app/src/main/res/layout/fragment_tasks_edit.xml
index 8299fcfc..6ce03296 100644
--- a/app/src/main/res/layout/fragment_tasks_edit.xml
+++ b/app/src/main/res/layout/fragment_tasks_edit.xml
@@ -234,34 +234,23 @@
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_del"
-            style="@style/SuperButton.Gray.Icon"
+            style="@style/SuperButton.Gray.Icon.Spacing"
             android:drawableStart="@drawable/ic_delete"
-            android:paddingStart="10dp"
-            android:text="@string/del_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/del"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_save"
-            style="@style/SuperButton.Blue.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Blue.Icon.Spacing"
             android:drawableStart="@drawable/ic_save"
-            android:paddingStart="13dp"
-            android:text="@string/save_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/save"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
         <com.xuexiang.xui.widget.textview.supertextview.SuperButton
             android:id="@+id/btn_test"
-            style="@style/SuperButton.Green.Icon"
-            android:layout_marginStart="10dp"
+            style="@style/SuperButton.Green.Icon.Spacing"
             android:drawableStart="@drawable/ic_test"
-            android:paddingStart="10dp"
-            android:text="@string/test_btn"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/text_size_medium"
+            android:text="@string/test"
             android:visibility="gone"
             tools:ignore="RtlSymmetry,TextContrastCheck,TouchTargetSizeCheck" />
 
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 267fb7fb..7c7f6eb0 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -167,17 +167,12 @@
     <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
     <string name="discard">Discard</string>
-    <string name="discard_btn">Discard</string>
     <string name="quit">Quit</string>
     <string name="del">Delete</string>
-    <string name="del_btn">Delete</string>
     <string name="save">Save</string>
-    <string name="save_btn">Save</string>
     <string name="submit">Submit</string>
-    <string name="submit_btn">Submit</string>
     <string name="send">Send</string>
     <string name="test">Test</string>
-    <string name="test_btn">Test</string>
     <string name="confirm">Confirm</string>
     <string name="all">All</string>
     <string name="select">Select</string>
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
new file mode 100644
index 00000000..671bf105
--- /dev/null
+++ b/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,85 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!-- 拓展主题 theme. -->
+    <style name="XUITheme" parent="XUIBaseTheme" tools:ignore="PrivateResource">
+        <!--设置默认窗口的动画样式-->
+        <item name="android:windowAnimationStyle">@style/WindowAnimStyle</item>
+    </style>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="XUITheme.Phone">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="xui_actionbar_height">?actionBarSize</item>
+        <!-- 解决 Android 5.1 及以上版本 Button 英文字符串自动变大写的问题 -->
+        <item name="android:textAllCaps">false</item>
+    </style>
+
+    <style name="AppTheme.Launch">
+        <item name="xui_config_color_splash_bg">@color/xui_config_color_white</item>
+        <item name="xui_config_app_logo_bottom" tools:ignore="PrivateResource">
+            @dimen/xui_config_app_logo_bottom
+        </item>
+        <item name="xui_config_company_logo_bottom" tools:ignore="PrivateResource">
+            @dimen/xui_config_company_logo_bottom
+        </item>
+        <item name="android:windowBackground">@drawable/xui_config_bg_splash</item>
+        <item name="android:windowFullscreen">true</item>
+    </style>
+
+    <!--窗体背景，这个背景能在第一时间显示, 避免启动时白屏，黑屏问题-->
+    <style name="AppTheme.Launch.App">
+        <!--注意修改图标-->
+        <item name="xui_config_splash_app_logo">@drawable/ic_splash_app_logo</item>
+        <item name="xui_config_splash_company_logo">@drawable/ic_splash_company_logo</item>
+    </style>
+
+    <!--DialogTheme，用于将Activity作为Dialog的主题-->
+    <style name="DialogTheme" parent="XUITheme.Phone">
+        <!--设置dialog的背景，此处为系统给定的透明值-->
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <!--Dialog的windowFrame框为无-->
+        <item name="android:windowFrame">@null</item>
+        <!--无标题-->
+        <item name="android:windowNoTitle">true</item>　　　　　
+        <!--是否浮现在activity之上-->
+        <item name="android:windowIsFloating" tools:ignore="TranslucentOrientation">true</item>
+        <!--是否半透明-->
+        <item name="android:windowIsTranslucent">true</item>
+        <!--是否有覆盖-->
+        <item name="android:windowContentOverlay">@null</item>
+        <!--设置Activity出现方式-->
+        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+        <!--背景是否模糊显示-->
+        <item name="android:backgroundDimEnabled">true</item>
+    </style>
+
+    <style name="SuperButton.Gray.Icon.Spacing">
+        <item name="android:paddingStart">15dp</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textSize">@dimen/text_size_medium</item>
+        <item name="android:drawablePadding">0dp</item>
+        <item name="android:letterSpacing">0.8</item>
+    </style>
+
+    <style name="SuperButton.Blue.Icon.Spacing">
+        <item name="android:layout_marginStart">10dp</item>
+        <item name="android:paddingStart">15dp</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textSize">@dimen/text_size_medium</item>
+        <item name="android:drawablePadding">0dp</item>
+        <item name="android:letterSpacing">0.8</item>
+    </style>
+
+    <style name="SuperButton.Green.Icon.Spacing">
+        <item name="android:layout_marginStart">10dp</item>
+        <item name="android:paddingStart">15dp</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textSize">@dimen/text_size_medium</item>
+        <item name="android:drawablePadding">0dp</item>
+        <item name="android:letterSpacing">0.8</item>
+    </style>
+
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c3332480..d82f09e4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -168,17 +168,12 @@
     <string name="ok">确定</string>
     <string name="cancel">取消</string>
     <string name="discard">丢弃</string>
-    <string name="discard_btn">丢　　弃</string>
     <string name="quit">退出</string>
     <string name="del">删除</string>
-    <string name="del_btn">删　　除</string>
     <string name="save">保存</string>
-    <string name="save_btn">保　　存</string>
     <string name="submit">提交</string>
-    <string name="submit_btn">提　　交</string>
     <string name="send">发送</string>
     <string name="test">测试</string>
-    <string name="test_btn">测　　试</string>
     <string name="confirm">确认</string>
     <string name="all">全部</string>
     <string name="select">选择</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b5a71a3a..5d1f2ed2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -13,6 +13,8 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="xui_actionbar_height">?actionBarSize</item>
+        <!-- 解决 Android 5.1 及以上版本 Button 英文字符串自动变大写的问题 -->
+        <item name="android:textAllCaps">false</item>
     </style>
 
     <style name="AppTheme.Launch">
@@ -54,4 +56,25 @@
         <item name="android:backgroundDimEnabled">true</item>
     </style>
 
+    <style name="SuperButton.Gray.Icon.Spacing">
+        <item name="android:layout_marginStart">10dp</item>
+        <item name="android:paddingStart">12dp</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textSize">@dimen/text_size_medium</item>
+    </style>
+
+    <style name="SuperButton.Blue.Icon.Spacing">
+        <item name="android:layout_marginStart">10dp</item>
+        <item name="android:paddingStart">12dp</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textSize">@dimen/text_size_medium</item>
+    </style>
+
+    <style name="SuperButton.Green.Icon.Spacing">
+        <item name="android:layout_marginStart">10dp</item>
+        <item name="android:paddingStart">12dp</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textSize">@dimen/text_size_medium</item>
+    </style>
+
 </resources>