From c08e6a0d6291eb4a83747bd901fc54de3b37812f Mon Sep 17 00:00:00 2001
From: AllenTom <qweasdzxczse2@gmail.com>
Date: Sun, 1 Sep 2024 20:59:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B6=88=E6=81=AF=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将硬编码的标题字符串替换为字符串资源。
- 添加了新的字符串资源用于评论计数、评论提示和关注按钮。
---
 .../com/aiosman/riderpro/ui/favourite/FavouriteScreen.kt | 3 ++-
 .../com/aiosman/riderpro/ui/follower/FollowerPage.kt     | 3 ++-
 .../main/java/com/aiosman/riderpro/ui/like/LikePage.kt   | 9 ++++-----
 app/src/main/res/values-zh/strings.xml                   | 3 +++
 app/src/main/res/values/strings.xml                      | 3 +++
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/aiosman/riderpro/ui/favourite/FavouriteScreen.kt b/app/src/main/java/com/aiosman/riderpro/ui/favourite/FavouriteScreen.kt
index 41af4fb..195a221 100644
--- a/app/src/main/java/com/aiosman/riderpro/ui/favourite/FavouriteScreen.kt
+++ b/app/src/main/java/com/aiosman/riderpro/ui/favourite/FavouriteScreen.kt
@@ -24,6 +24,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -65,7 +66,7 @@ fun FavouriteScreen() {
                     .padding(vertical = 16.dp)
             ) {
                 NoticeScreenHeader(
-                    "FAVOURITE",
+                    stringResource(R.string.favourites_upper),
                     moreIcon = false
                 )
             }
diff --git a/app/src/main/java/com/aiosman/riderpro/ui/follower/FollowerPage.kt b/app/src/main/java/com/aiosman/riderpro/ui/follower/FollowerPage.kt
index 55a13a3..f9b4a3c 100644
--- a/app/src/main/java/com/aiosman/riderpro/ui/follower/FollowerPage.kt
+++ b/app/src/main/java/com/aiosman/riderpro/ui/follower/FollowerPage.kt
@@ -20,6 +20,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -50,7 +51,7 @@ fun FollowerScreen() {
         Box(
             modifier = Modifier.fillMaxWidth().padding(vertical = 16.dp)
         ) {
-            NoticeScreenHeader("FOLLOWERS")
+            NoticeScreenHeader(stringResource(R.string.followers_upper), moreIcon = false)
 
         }
         LaunchedEffect(Unit) {
diff --git a/app/src/main/java/com/aiosman/riderpro/ui/like/LikePage.kt b/app/src/main/java/com/aiosman/riderpro/ui/like/LikePage.kt
index 69c2b86..db75d85 100644
--- a/app/src/main/java/com/aiosman/riderpro/ui/like/LikePage.kt
+++ b/app/src/main/java/com/aiosman/riderpro/ui/like/LikePage.kt
@@ -1,7 +1,6 @@
 package com.aiosman.riderpro.ui.like
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -16,24 +15,24 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.paging.compose.collectAsLazyPagingItems
 import com.aiosman.riderpro.LocalNavController
-import com.aiosman.riderpro.data.AccountLike
+import com.aiosman.riderpro.R
 import com.aiosman.riderpro.exp.timeAgo
 import com.aiosman.riderpro.ui.NavigationRoute
-import com.aiosman.riderpro.ui.composables.StatusBarMaskLayout
 import com.aiosman.riderpro.ui.comment.NoticeScreenHeader
 import com.aiosman.riderpro.ui.composables.BottomNavigationPlaceholder
 import com.aiosman.riderpro.ui.composables.CustomAsyncImage
+import com.aiosman.riderpro.ui.composables.StatusBarMaskLayout
 import com.aiosman.riderpro.ui.modifiers.noRippleClickable
 import java.util.Date
 
@@ -63,7 +62,7 @@ fun LikeScreen() {
                     .padding(vertical = 16.dp)
             ) {
                 NoticeScreenHeader(
-                    "LIKES",
+                    stringResource(R.string.like_upper),
                     moreIcon = false
                 )
             }
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 985e977..cfb3736 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -15,4 +15,7 @@
     <string name="favourites_upper">收藏</string>
     <string name="notifications_upper">消息</string>
     <string name="following_upper">关注中</string>
+    <string name="comment_count">%d条评论</string>
+    <string name="post_comment_hint">说点什么</string>
+    <string name="follow_upper">关注</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 74b49b3..83cc1dd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,4 +14,7 @@
     <string name="favourites_upper">FAVOURITES</string>
     <string name="notifications_upper">NOTIFICATIONS</string>
     <string name="following_upper">FOLLOWING</string>
+    <string name="comment_count">%d Comments</string>
+    <string name="post_comment_hint">Say something...</string>
+    <string name="follow_upper">FOLLOW</string>
 </resources>
\ No newline at end of file