From e3a9a94baf6eec065a393a6fed735474efe0fb9e Mon Sep 17 00:00:00 2001
From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com>
Date: Sat, 6 Aug 2022 09:57:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                           | 1 +
 .../huanchengfly/tieba/post/activities/LoginActivity.kt    | 2 +-
 .../huanchengfly/tieba/post/widgets/compose/Selectors.kt   | 2 +-
 app/src/main/res/layout/fragment_my_info.xml               | 6 +++---
 app/src/main/res/values/strings.xml                        | 7 +++++--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8d453219..a9beadfc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -136,6 +136,7 @@
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".activities.LoginActivity"
+            android:label="@string/title_activity_login"
             android:configChanges="screenSize|screenLayout|orientation|smallestScreenSize|keyboardHidden"
             android:windowSoftInputMode="adjustResize" />
 
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/activities/LoginActivity.kt b/app/src/main/java/com/huanchengfly/tieba/post/activities/LoginActivity.kt
index 5cea919c..4b0cf872 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/activities/LoginActivity.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/activities/LoginActivity.kt
@@ -31,7 +31,7 @@ class LoginActivity : BaseActivity(), WebViewListener {
         val actionBar = supportActionBar
         if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true)
-            actionBar.setTitle(R.string.title_login)
+            actionBar.setTitle(R.string.title_activity_login)
         }
         if (savedInstanceState == null) {
             val mWebViewFragment = WebViewFragment.newInstance(
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/widgets/compose/Selectors.kt b/app/src/main/java/com/huanchengfly/tieba/post/widgets/compose/Selectors.kt
index dc3dc2a0..f05aa1ae 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/widgets/compose/Selectors.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/widgets/compose/Selectors.kt
@@ -35,7 +35,7 @@ fun <ItemValue> SingleSelector(
     selectedIndicator: @Composable () -> Unit = {
         Icon(
             imageVector = Icons.Rounded.Check,
-            contentDescription = stringResource(id = R.string.checked)
+            contentDescription = stringResource(id = R.string.desc_checked)
         )
     },
     colors: SelectorColors = SelectorDefaults.selectorColors(),
diff --git a/app/src/main/res/layout/fragment_my_info.xml b/app/src/main/res/layout/fragment_my_info.xml
index 7c9c204c..f6030091 100644
--- a/app/src/main/res/layout/fragment_my_info.xml
+++ b/app/src/main/res/layout/fragment_my_info.xml
@@ -112,7 +112,7 @@
                                 android:layout_below="@id/my_info_grid_follows"
                                 android:layout_centerHorizontal="true"
                                 android:layout_marginTop="8dp"
-                                android:text="关注"
+                                android:text="@string/title_follow_num"
                                 android:textSize="14sp"
                                 app:tint="@color/default_color_text_secondary" />
 
@@ -152,7 +152,7 @@
                                 android:layout_below="@id/my_info_grid_fans"
                                 android:layout_centerHorizontal="true"
                                 android:layout_marginTop="8dp"
-                                android:text="粉丝"
+                                android:text="@string/title_fans_num"
                                 android:textSize="14sp"
                                 app:tint="@color/default_color_text_secondary" />
 
@@ -191,7 +191,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center_horizontal"
                                 android:layout_marginTop="8dp"
-                                android:text="贴子"
+                                android:text="@string/title_posts_num"
                                 android:textSize="14sp"
                                 app:tint="@color/default_color_text_secondary" />
                         </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fa8b0b00..75a96de2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,7 +15,7 @@
     <string name="shortcut_my_message">我的消息</string>
     <string name="shortcut_search">搜索</string>
     <string name="forum_list_title">关注</string>
-    <string name="title_login">登录</string>
+    <string name="title_activity_login">登录</string>
     <string name="title_refresh">刷新</string>
     <string name="title_copy_link">复制链接</string>
     <string name="toast_copy_success">已复制到剪贴板</string>
@@ -541,5 +541,8 @@
     <string name="title_modify_nickname">修改昵称</string>
     <string name="toast_intro_length_beyond_restrict">你输入的字数超出限制</string>
     <string name="title_modify_sex">选择性别</string>
-    <string name="checked">已选中</string>
+    <string name="desc_checked">已选中</string>
+    <string name="title_follow_num">关注</string>
+    <string name="title_fans_num">粉丝</string>
+    <string name="title_posts_num">贴子</string>
 </resources>