From 2f4b521ad0212be9056977d62da11f50ad3403d8 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/ForumActivity.kt  | 2 +-
 .../huanchengfly/tieba/post/activities/LoginActivity.kt  | 2 +-
 .../tieba/post/adapters/PersonalizedFeedAdapter.java     | 2 +-
 .../tieba/post/adapters/SearchThreadAdapter.kt           | 4 ++--
 .../tieba/post/adapters/UserPostAdapter.java             | 4 ++--
 .../tieba/post/fragments/PhotoViewFragment.java          | 2 +-
 .../huanchengfly/tieba/post/services/OKSignService.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                      | 9 ++++++---
 11 files changed, 20 insertions(+), 16 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/ForumActivity.kt b/app/src/main/java/com/huanchengfly/tieba/post/activities/ForumActivity.kt
index f8bfc9a8..7cbeb508 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/activities/ForumActivity.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/activities/ForumActivity.kt
@@ -683,7 +683,7 @@ class ForumActivity : BaseActivity(), View.OnClickListener, OnRefreshedListener,
                 (headerSloganTextView.parent as View).visibility = View.VISIBLE
                 headerSloganTextView.text = mDataBean!!.forum!!.slogan
             }
-            headerNameTextView.text = getString(R.string.text_forum_name, mDataBean!!.forum?.name)
+            headerNameTextView.text = getString(R.string.title_forum_name, mDataBean!!.forum?.name)
             if ("1" == mDataBean!!.forum?.isLike) {
                 if ("0" == mDataBean!!.forum?.signInInfo?.userInfo?.isSignIn) {
                     button.setText(R.string.button_sign_in)
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/adapters/PersonalizedFeedAdapter.java b/app/src/main/java/com/huanchengfly/tieba/post/adapters/PersonalizedFeedAdapter.java
index 8faae800..3bbf4a69 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/adapters/PersonalizedFeedAdapter.java
+++ b/app/src/main/java/com/huanchengfly/tieba/post/adapters/PersonalizedFeedAdapter.java
@@ -220,7 +220,7 @@ public class PersonalizedFeedAdapter extends BaseMultiTypeAdapter<PersonalizedBe
                     getContext().getString(
                             R.string.template_two_string,
                             relativeTime,
-                            getContext().getString(R.string.text_forum_name, threadBean.getForumName())
+                            getContext().getString(R.string.title_forum_name, threadBean.getForumName())
                     )
             );
         } else {
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/adapters/SearchThreadAdapter.kt b/app/src/main/java/com/huanchengfly/tieba/post/adapters/SearchThreadAdapter.kt
index feb40cb7..df5c2b06 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/adapters/SearchThreadAdapter.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/adapters/SearchThreadAdapter.kt
@@ -44,8 +44,8 @@ class SearchThreadAdapter(
                 if (item.time != null) context.getString(
                     R.string.template_two_string,
                     DateTimeUtils.getRelativeTimeString(context, item.time),
-                    context.getString(R.string.text_forum_name, item.forumName)
-                ) else context.getString(R.string.text_forum_name, item.forumName)
+                    context.getString(R.string.title_forum_name, item.forumName)
+                ) else context.getString(R.string.title_forum_name, item.forumName)
             )
         }
         viewHolder.itemView.background = getItemBackgroundDrawable(
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/adapters/UserPostAdapter.java b/app/src/main/java/com/huanchengfly/tieba/post/adapters/UserPostAdapter.java
index 009139be..eb0e9c11 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/adapters/UserPostAdapter.java
+++ b/app/src/main/java/com/huanchengfly/tieba/post/adapters/UserPostAdapter.java
@@ -63,7 +63,7 @@ public class UserPostAdapter extends BaseMultiTypeDelegateAdapter<UserPostBean.P
                         getContext().getString(
                                 R.string.template_two_string,
                                 relativeTime,
-                                getContext().getString(R.string.text_forum_name, postBean.getForumName())
+                                getContext().getString(R.string.title_forum_name, postBean.getForumName())
                         )
                 );
             } else {
@@ -77,7 +77,7 @@ public class UserPostAdapter extends BaseMultiTypeDelegateAdapter<UserPostBean.P
                     R.id.message_list_item_user_time,
                     getContext().getString(R.string.template_two_string,
                             DateTimeUtils.getRelativeTimeString(getContext(), postBean.getCreateTime()),
-                            getContext().getString(R.string.text_forum_name, postBean.getForumName())
+                            getContext().getString(R.string.title_forum_name, postBean.getForumName())
                     )
             );
             TextView contentTextView = viewHolder.getView(R.id.message_list_item_content);
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/fragments/PhotoViewFragment.java b/app/src/main/java/com/huanchengfly/tieba/post/fragments/PhotoViewFragment.java
index de98d908..cae9c075 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/fragments/PhotoViewFragment.java
+++ b/app/src/main/java/com/huanchengfly/tieba/post/fragments/PhotoViewFragment.java
@@ -127,7 +127,7 @@ public class PhotoViewFragment extends BaseFragment {
 
                         @Override
                         public void onImageLoaded() {
-                            view.setDoubleTapZoomDpi(80);
+                            view.setDoubleTapZoomDpi(160);
                             view.setDoubleTapZoomDuration(200);
                             view.setDoubleTapZoomStyle(SubsamplingScaleImageView.ZOOM_FOCUS_FIXED);
                             view.setQuickScaleEnabled(false);
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/services/OKSignService.kt b/app/src/main/java/com/huanchengfly/tieba/post/services/OKSignService.kt
index cd8620e2..fcceee82 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/services/OKSignService.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/services/OKSignService.kt
@@ -147,7 +147,7 @@ class OKSignService : IntentService(TAG), CoroutineScope, ProgressListener {
                 total
             ),
             getString(
-                R.string.text_forum_name,
+                R.string.title_forum_name,
                 signDataBean.forumName
             )
         )
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..093f24c3 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>
@@ -126,7 +126,7 @@
     <string name="tip_store_deleted">贴子已被删除</string>
     <string name="content_top">置顶</string>
     <string name="tip_forum_header_liked">LV%1$s %2$s</string>
-    <string name="text_forum_name">%1$s吧</string>
+    <string name="title_forum_name">%1$s吧</string>
     <string name="toast_sign_success">签到成功， 经验 +%1$s。你是今天第 %2$s 个签到的。</string>
     <string name="button_sign_in">签到</string>
     <string name="button_signed">已签到</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>