From 18b1efaf932e3ff1de385fe0a824de6d56e189ef Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Tue, 25 Jan 2022 07:28:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9AStepBar=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/idormy/sms/forwarder/view/StepBar.java   | 7 +++++--
 app/src/main/res/layout/activity_setting.xml               | 2 +-
 app/src/main/res/values-en/strings.xml                     | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/view/StepBar.java b/app/src/main/java/com/idormy/sms/forwarder/view/StepBar.java
index c0bed148..61c58b51 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/view/StepBar.java
+++ b/app/src/main/java/com/idormy/sms/forwarder/view/StepBar.java
@@ -178,8 +178,11 @@ public class StepBar extends LinearLayout {
         boolean Step4 = LogUtil.countLog("2", null, null) > 0;
 
         //页面提示文本
-        if (MyApplication.showHelpTip && current_step.equals("main") && txHelpTip != null) {
-            txHelpTip.setText(Step1 ? R.string.log_tips : R.string.setting_tips);
+        if (txHelpTip != null) {
+            txHelpTip.setVisibility(MyApplication.showHelpTip ? View.VISIBLE : View.GONE);
+            if (MyApplication.showHelpTip && current_step.equals("main")) {
+                txHelpTip.setText(Step1 ? R.string.log_tips : R.string.setting_tips);
+            }
         }
 
         if (Step1) txStep1.setBackground(mContext.getResources().getDrawable(R.drawable.step_circle_current));
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index 2362d78f..83777241 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -426,7 +426,7 @@
                 android:padding="15dp">
 
                 <LinearLayout
-                    android:layout_width="110dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:orientation="vertical">
 
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 575d47d8..cf6e856b 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -168,7 +168,7 @@
     <string name="device_name">Device name</string>
     <string name="sim1_remark" tools:ignore="Typos">SIM1 Label</string>
     <string name="sim2_remark" tools:ignore="Typos">SIM2 Label</string>
-    <string name="carrier_mobile" tools:ignore="Typos">Label of SIM,\neg. SIM1_AT&amp;T_88888888</string>
+    <string name="carrier_mobile" tools:ignore="Typos">Label of SIM,\neg. AT&amp;T_88888888</string>
     <string name="low_power_alarm_threshold">Low power alarm</string>
     <string name="low_power_alarm_threshold_tips">Value range: 0–100.\nLeft blank or 0 is disabled</string>
     <string name="retry_interval">Retry interval</string>