feat: ✨ 评论区点击头像可以前往评论者主页

feat: ✨ PC端报错页面允许返回
kagg886 · Jan 18, 2025 · 2549e8c · 2549e8c
1 parent 1c4cd17
commit 2549e8c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/composeApp/src/commonMain/kotlin/top/kagg886/pmf/ui/component/error-page.kt b/composeApp/src/commonMain/kotlin/top/kagg886/pmf/ui/component/error-page.kt
@@ -2,17 +2,22 @@ package top.kagg886.pmf.ui.component
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.Refresh
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import cafe.adriel.voyager.navigator.LocalNavigator
+import cafe.adriel.voyager.navigator.currentOrThrow
 
 @Composable
-fun ErrorPage(modifier: Modifier = Modifier,text:String, onClick: () -> Unit) {
+fun ErrorPage(modifier: Modifier = Modifier, text: String, onClick: () -> Unit) {
     Box(modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
         Column(modifier = Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) {
             Text(text)
@@ -21,5 +26,15 @@ fun ErrorPage(modifier: Modifier = Modifier,text:String, onClick: () -> Unit) {
                 Icon(imageVector = Icons.Default.Refresh, contentDescription = null)
             }
         }
+
+        val nav = LocalNavigator.currentOrThrow
+        IconButton(
+            onClick = {
+                nav.pop()
+            },
+            modifier = Modifier.align(Alignment.TopStart).padding(16.dp)
+        ) {
+            Icon(imageVector = Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null)
+        }
     }
 }
diff --git a/...pp/src/commonMain/kotlin/top/kagg886/pmf/ui/route/main/detail/author/AuthorScreenModel.kt b/...pp/src/commonMain/kotlin/top/kagg886/pmf/ui/route/main/detail/author/AuthorScreenModel.kt
@@ -27,6 +27,7 @@ class AuthorScreenModel(val id: Int) : ContainerHost<AuthorScreenState, AuthorSc
             client.getUserInfo(id)
         }
         if (illust.isFailure) {
+            illust.exceptionOrNull()!!.printStackTrace()
             if (silent) {
                 reduce { AuthorScreenState.Error }
             }

diff --git a/composeApp/src/commonMain/kotlin/top/kagg886/pmf/ui/util/comment-screen.kt b/composeApp/src/commonMain/kotlin/top/kagg886/pmf/ui/util/comment-screen.kt
@@ -1,6 +1,7 @@
 package top.kagg886.pmf.ui.util
 
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -23,6 +24,7 @@ import top.kagg886.pmf.LocalSnackBarHost
 import top.kagg886.pmf.ui.component.*
 import top.kagg886.pmf.ui.component.scroll.VerticalScrollbar
 import top.kagg886.pmf.ui.component.scroll.rememberScrollbarAdapter
+import top.kagg886.pmf.ui.route.main.detail.author.AuthorScreen
 import top.kagg886.pmf.util.toReadableString
 
 @Composable
@@ -89,6 +91,7 @@ private fun CommentPanelContainer(model: CommentViewModel, state: CommentViewSta
                             OutlinedCard(
                                 modifier = Modifier.fillMaxWidth().padding(5.dp)
                             ) {
+                                val nav = LocalNavigator.currentOrThrow
                                 ListItem(
                                     overlineContent = {
                                         Text(comment.date.toReadableString())
@@ -99,7 +102,9 @@ private fun CommentPanelContainer(model: CommentViewModel, state: CommentViewSta
                                     leadingContent = {
                                         ProgressedAsyncImage(
                                             url = comment.user.profileImageUrls.content,
-                                            modifier = Modifier.size(35.dp)
+                                            modifier = Modifier.size(35.dp).clickable {
+                                                nav.push(AuthorScreen(comment.user.id))
+                                            }
                                         )
                                     },
                                     trailingContent = {
@@ -148,7 +153,9 @@ private fun CommentPanelContainer(model: CommentViewModel, state: CommentViewSta
                                                 leadingContent = {
                                                     ProgressedAsyncImage(
                                                         url = i.user.profileImageUrls.content,
-                                                        modifier = Modifier.size(25.dp)
+                                                        modifier = Modifier.size(25.dp).clickable {
+                                                            nav.push(AuthorScreen(i.user.id))
+                                                        }
                                                     )
                                                 },
                                                 supportingContent = {