From 723adf52c23e5521c4b5370e27ba0ff6efe5ad9e Mon Sep 17 00:00:00 2001
From: AllenTom <qweasdzxczse2@gmail.com>
Date: Sat, 12 Oct 2024 10:30:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=B1=95=E7=A4=BA=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../riderpro/ui/composables/ActionButton.kt   | 17 ++++++-
 .../ui/index/tabs/search/SearchScreen.kt      | 51 ++++++++++---------
 2 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/aiosman/riderpro/ui/composables/ActionButton.kt b/app/src/main/java/com/aiosman/riderpro/ui/composables/ActionButton.kt
index 856d7e4..0e1f14c 100644
--- a/app/src/main/java/com/aiosman/riderpro/ui/composables/ActionButton.kt
+++ b/app/src/main/java/com/aiosman/riderpro/ui/composables/ActionButton.kt
@@ -44,6 +44,7 @@ fun ActionButton(
     loadingBackgroundColor: Color = Color(0xFFD95757),
     disabledBackgroundColor: Color = Color(0xFFD0D0D0),
     enabled: Boolean = true,
+    fullWidth:Boolean = false,
     click: () -> Unit = {}
 ) {
     val animatedBackgroundColor by animateColorAsState(
@@ -76,7 +77,13 @@ fun ActionButton(
             Box(
                 modifier = Modifier
                     .align(Alignment.Center)
-                    .fillMaxWidth(),
+                    .let {
+                        if(fullWidth){
+                            it.fillMaxWidth()
+                        }else{
+                            it
+                        }
+                    },
                 contentAlignment = Alignment.Center
             ) {
                 Box(modifier = Modifier.align(Alignment.CenterStart)){
@@ -93,7 +100,13 @@ fun ActionButton(
         }else{
             Box(
                 modifier = Modifier
-                    .fillMaxWidth()
+                    .let {
+                        if(fullWidth){
+                            it.fillMaxWidth()
+                        }else{
+                            it
+                        }
+                    }
                     .padding(horizontal = 16.dp),
                 contentAlignment = Alignment.Center
             ) {
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 677979c..7ba5136 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
@@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.PagerState
@@ -322,7 +323,7 @@ fun UserItem(
                 modifier = Modifier.weight(1f)
             ) {
                 Text(text = accountProfile.nickName, fontSize = 16.sp, fontWeight = FontWeight.Bold)
-                Spacer(modifier = Modifier.padding(2.dp))
+                Spacer(modifier = Modifier.width(2.dp))
                 Text(
                     text = stringResource(
                         R.string.search_user_item_follower_count,
@@ -330,32 +331,34 @@ fun UserItem(
                     ), fontSize = 14.sp, color = Color(0xFF9E9E9E)
                 )
             }
-            Spacer(modifier = Modifier.padding(8.dp))
-            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
-                    ) {
-                        onFollow(accountProfile)
-                    }
-                } else {
-                    ActionButton(
-                        text = stringResource(R.string.follow_upper),
-                        backgroundColor = Color(0xffda3832),
-                        contentPadding = PaddingValues(vertical = 4.dp, horizontal = 8.dp),
-                        color = Color.White
-                    ) {
-                        onFollow(accountProfile)
+            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)
+                        }
                     }
                 }
             }
-
-
         }
-
-
     }
 }
\ No newline at end of file