From 341b092687d70bc44e36150077d82817d95df5af Mon Sep 17 00:00:00 2001
From: Kevinlinpr <kevinlinpr@gmail.com>
Date: Sun, 13 Oct 2024 03:02:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=90=9C=E7=B4=A2=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8CMoment=E9=A1=B5=E9=9D=A2=E7=9A=84=E8=BE=B9?=
 =?UTF-8?q?=E8=B7=9D=E5=92=8CUsers=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/index/tabs/search/SearchScreen.kt      | 54 +++++++++----------
 .../java/com/aiosman/riderpro/ui/post/Post.kt | 20 +++----
 2 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/SearchScreen.kt b/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/SearchScreen.kt
index 527e5c8..b083023 100644
--- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/SearchScreen.kt
+++ b/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/SearchScreen.kt
@@ -259,7 +259,7 @@ fun MomentResultTab() {
                 ) {
                     MomentCard(momentEntity = momentItem, hideAction = true)
                 }
-                Spacer(modifier = Modifier.padding(16.dp))
+//                Spacer(modifier = Modifier.padding(16.dp))
             }
         }
     }
@@ -333,33 +333,31 @@ fun UserItem(
                 )
             }
             Spacer(modifier = Modifier.width(16.dp))
-            Box(
-                modifier = Modifier
-            ) {
-                if (accountProfile.id != AppState.UserId) {
-                    if (accountProfile.isFollowing) {
-                        ActionButton(
-                            text = stringResource(R.string.following_upper),
-                            backgroundColor = Color(0xFF9E9E9E),
-                            contentPadding = PaddingValues(vertical = 4.dp, horizontal = 8.dp),
-                            color = Color.White,
-                            fullWidth = false
-                        ) {
-                            onFollow(accountProfile)
-                        }
-                    } else {
-                        ActionButton(
-                            text = stringResource(R.string.follow_upper),
-                            backgroundColor = Color(0xffda3832),
-                            contentPadding = PaddingValues(vertical = 4.dp, horizontal = 8.dp),
-                            color = Color.White,
-                            fullWidth = false
-                        ) {
-                            onFollow(accountProfile)
-                        }
-                    }
-                }
-            }
+//            Box {
+//                if (accountProfile.id != AppState.UserId) {
+//                    if (accountProfile.isFollowing) {
+//                        ActionButton(
+//                            text = stringResource(R.string.following_upper),
+//                            backgroundColor = Color(0xFF9E9E9E),
+//                            contentPadding = PaddingValues(vertical = 4.dp, horizontal = 8.dp),
+//                            color = Color.White,
+//                            fullWidth = false
+//                        ) {
+//                            onFollow(accountProfile)
+//                        }
+//                    } else {
+//                        ActionButton(
+//                            text = stringResource(R.string.follow_upper),
+//                            backgroundColor = Color(0xffda3832),
+//                            contentPadding = PaddingValues(vertical = 4.dp, horizontal = 8.dp),
+//                            color = Color.White,
+//                            fullWidth = false
+//                        ) {
+//                            onFollow(accountProfile)
+//                        }
+//                    }
+//                }
+//            }
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/aiosman/riderpro/ui/post/Post.kt b/app/src/main/java/com/aiosman/riderpro/ui/post/Post.kt
index d441447..da93fd4 100644
--- a/app/src/main/java/com/aiosman/riderpro/ui/post/Post.kt
+++ b/app/src/main/java/com/aiosman/riderpro/ui/post/Post.kt
@@ -688,16 +688,16 @@ fun Header(
 
         Spacer(modifier = Modifier.width(8.dp))
         Text(text = nickname ?: "", fontWeight = FontWeight.Bold)
-        if (AppState.UserId != userId) {
-            FollowButton(
-                isFollowing = isFollowing,
-                onFollowClick = onFollowClick,
-                imageModifier = Modifier
-                    .height(18.dp)
-                    .width(80.dp),
-                fontSize = 12.sp
-            )
-        }
+//        if (AppState.UserId != userId) {
+//            FollowButton(
+//                isFollowing = isFollowing,
+//                onFollowClick = onFollowClick,
+//                imageModifier = Modifier
+//                    .height(18.dp)
+//                    .width(80.dp),
+//                fontSize = 12.sp
+//            )
+//        }
         if (AppState.UserId == userId) {
             Spacer(modifier = Modifier.weight(1f))
             Box {