From 83a855b2d4a1dc84233b23d415567f0533735968 Mon Sep 17 00:00:00 2001
From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com>
Date: Sun, 12 Mar 2023 15:31:39 +0800
Subject: [PATCH] =?UTF-8?q?pref:=20=E6=9C=AA=E7=99=BB=E5=BD=95=E6=97=B6?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=9C=80=E8=A6=81=E7=99=BB=E5=BD=95=E6=89=8D?=
 =?UTF-8?q?=E5=8F=AF=E8=AE=BF=E9=97=AE=E7=9A=84=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tieba/post/ui/page/main/user/UserPage.kt  | 50 ++++++++++---------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/user/UserPage.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/user/UserPage.kt
index c72d9f5a..7c9091f3 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/user/UserPage.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/user/UserPage.kt
@@ -121,11 +121,11 @@ private fun StatCard(
 
 @Composable
 private fun InfoCard(
+    modifier: Modifier = Modifier,
     userName: String = "",
     userIntro: String = "",
     avatar: String? = null,
-    isPlaceholder: Boolean = false,
-    modifier: Modifier = Modifier
+    isPlaceholder: Boolean = false
 ) {
     Row(
         modifier = modifier,
@@ -264,9 +264,6 @@ fun UserPage(
             ) {
                 if (account != null) {
                     InfoCard(
-                        userName = account!!.nameShow ?: account!!.name,
-                        userIntro = account!!.intro ?: stringResource(id = R.string.tip_no_intro),
-                        avatar = StringUtil.getAvatarUrl(account!!.portrait),
                         modifier = Modifier
                             .padding(top = 8.dp)
                             .clickable {
@@ -277,6 +274,9 @@ fun UserPage(
                                 )
                             }
                             .padding(horizontal = 16.dp, vertical = 16.dp),
+                        userName = account!!.nameShow ?: account!!.name,
+                        userIntro = account!!.intro ?: stringResource(id = R.string.tip_no_intro),
+                        avatar = StringUtil.getAvatarUrl(account!!.portrait),
                     )
                     StatCard(
                         account = account!!,
@@ -288,10 +288,10 @@ fun UserPage(
                     )
                 } else if (isLoading) {
                     InfoCard(
-                        isPlaceholder = true,
                         modifier = Modifier
                             .padding(horizontal = 16.dp, vertical = 16.dp)
                             .padding(top = 8.dp),
+                        isPlaceholder = true,
                     )
                     StatCardPlaceholder(
                         modifier = Modifier
@@ -308,13 +308,15 @@ fun UserPage(
                     )
                 }
                 val navigator = LocalNavigator.current
-                ListMenuItem(
-                    icon = ImageVector.vectorResource(id = R.drawable.ic_favorite),
-                    text = stringResource(id = R.string.title_my_collect),
-                    onClick = {
-                        navigator.navigate(ThreadStorePageDestination)
-                    }
-                )
+                if (account != null) {
+                    ListMenuItem(
+                        icon = ImageVector.vectorResource(id = R.drawable.ic_favorite),
+                        text = stringResource(id = R.string.title_my_collect),
+                        onClick = {
+                            navigator.navigate(ThreadStorePageDestination)
+                        }
+                    )
+                }
                 ListMenuItem(
                     icon = ImageVector.vectorResource(id = R.drawable.ic_outline_watch_later_24),
                     text = stringResource(id = R.string.title_history),
@@ -340,16 +342,18 @@ fun UserPage(
                         onCheckedChange = { ThemeUtil.switchNightMode() }
                     )
                 }
-                ListMenuItem(
-                    icon = ImageVector.vectorResource(id = R.drawable.ic_help_outline_black_24),
-                    text = stringResource(id = R.string.my_info_service_center),
-                    onClick = {
-                        WebViewActivity.launch(
-                            context,
-                            "https://tieba.baidu.com/mo/q/hybrid-main-service/uegServiceCenter?cuid=${CuidUtils.getNewCuid()}&cuid_galaxy2=${CuidUtils.getNewCuid()}&cuid_gid=&timestamp=${System.currentTimeMillis()}&_client_version=11.10.8.6&nohead=1"
-                        )
-                    },
-                )
+                if (account != null) {
+                    ListMenuItem(
+                        icon = ImageVector.vectorResource(id = R.drawable.ic_help_outline_black_24),
+                        text = stringResource(id = R.string.my_info_service_center),
+                        onClick = {
+                            WebViewActivity.launch(
+                                context,
+                                "https://tieba.baidu.com/mo/q/hybrid-main-service/uegServiceCenter?cuid=${CuidUtils.getNewCuid()}&cuid_galaxy2=${CuidUtils.getNewCuid()}&cuid_gid=&timestamp=${System.currentTimeMillis()}&_client_version=11.10.8.6&nohead=1"
+                            )
+                        },
+                    )
+                }
                 VerticalDivider(
                     modifier = Modifier.padding(vertical = 8.dp, horizontal = 16.dp)
                 )