From 2b30beb3673a28be284fbf3240f25636537030de Mon Sep 17 00:00:00 2001
From: zhong <2724770085@qq.com>
Date: Thu, 6 Nov 2025 20:56:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=96=87=E4=BB=B6=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/aiosman/ravenow/ui/composables/FollowButton.kt   | 9 ++++-----
 .../index/tabs/profile/composable/OtherProfileAction.kt  | 2 +-
 app/src/main/res/values-ja/strings.xml                   | 1 +
 app/src/main/res/values-zh/strings.xml                   | 5 +++--
 app/src/main/res/values/strings.xml                      | 1 +
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/aiosman/ravenow/ui/composables/FollowButton.kt b/app/src/main/java/com/aiosman/ravenow/ui/composables/FollowButton.kt
index 4ab16b6..4aa3fd6 100644
--- a/app/src/main/java/com/aiosman/ravenow/ui/composables/FollowButton.kt
+++ b/app/src/main/java/com/aiosman/ravenow/ui/composables/FollowButton.kt
@@ -10,6 +10,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
@@ -32,7 +33,7 @@ fun FollowButton(
             .wrapContentWidth()
             .clip(RoundedCornerShape(8.dp))
             .background(
-                color = if (isFollowing) AppColors.main else AppColors.nonActive
+                color = if (isFollowing) AppColors.nonActive else AppColors.nonActive
             )
             .padding(horizontal = 16.dp, vertical = 8.dp)
             .noRippleClickable {
@@ -41,11 +42,9 @@ fun FollowButton(
         contentAlignment = Alignment.Center
     ) {
         Text(
-            text = if (isFollowing) stringResource(R.string.following_upper) else stringResource(
-                R.string.follow_upper
-            ),
+            text = if (isFollowing) stringResource(R.string.follow_upper_had) else stringResource(R.string.follow_upper),
             fontSize = fontSize,
-            color = if (isFollowing) AppColors.mainText else AppColors.text,
+            color = if (isFollowing) AppColors.text else AppColors.text,
             style = TextStyle(fontWeight = FontWeight.Bold)
         )
     }
diff --git a/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/composable/OtherProfileAction.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/composable/OtherProfileAction.kt
index 30ee6bb..20e64e9 100644
--- a/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/composable/OtherProfileAction.kt
+++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/composable/OtherProfileAction.kt
@@ -98,7 +98,7 @@ fun OtherProfileAction(
                 }
         ) {
             Text(
-                text = if (profile.isFollowing) "已关注" else stringResource(R.string.follow_upper),
+                text = if (profile.isFollowing) stringResource(R.string.follow_upper_had) else stringResource(R.string.follow_upper),
                 fontSize = 14.sp,
                 fontWeight = FontWeight.W900,
                 color = if (profile.isFollowing) {
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index f054f36..8ec3af4 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -20,6 +20,7 @@
     <string name="comment_count">%d コメント</string>
     <string name="post_comment_hint">何か言ってください</string>
     <string name="follow_upper">フォロー</string>
+    <string name="follow_upper_had">フォローしました</string>
     <string name="login_upper">ログイン</string>
     <string name="lets_ride_upper">レッツ・レヴ・ナウ</string>
     <string name="or_login_with">または</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 6819fc1..7213c7c 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -14,11 +14,12 @@
     <string name="followers_upper">粉丝</string>
     <string name="favourites_upper">收藏</string>
     <string name="notifications_upper">消息</string>
-    <string name="following_upper">关注</string>
+    <string name="following_upper">关注11</string>
     <string name="unfollow_upper">取消关注</string>
     <string name="comment_count">%d条评论</string>
     <string name="post_comment_hint">快来互动吧...</string>
-    <string name="follow_upper">关注</string>
+    <string name="follow_upper">关注3</string>
+    <string name="follow_upper_had">已关注</string>
     <string name="login_upper">登录</string>
     <string name="lets_ride_upper">确认</string>
     <string name="or_login_with">其他账号登录</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b5de431..86c2024 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,6 +19,7 @@
     <string name="comment_count">%d Comments</string>
     <string name="post_comment_hint">Say something…</string>
     <string name="follow_upper">FOLLOW</string>
+    <string name="follow_upper_had">Followed</string>
     <string name="login_upper">Log in</string>
     <string name="lets_ride_upper">Let\'s Rave Now</string>
     <string name="or_login_with">or</string>