From b98d2fffaa939a1b5c31c879959745bb26ba4656 Mon Sep 17 00:00:00 2001
From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com>
Date: Mon, 17 Jul 2023 16:29:24 +0800
Subject: [PATCH] =?UTF-8?q?pref:=20=E8=B4=B4=E5=AD=90=E5=8D=A1=E7=89=87?=
 =?UTF-8?q?=E8=B5=9E/=E5=9B=9E=E5=A4=8D/=E5=88=86=E4=BA=AB=E6=95=B0?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tieba/post/ui/widgets/compose/FeedCard.kt       | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/FeedCard.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/FeedCard.kt
index 90d8a604..6da81c37 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/FeedCard.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/FeedCard.kt
@@ -77,6 +77,7 @@ import com.huanchengfly.tieba.post.utils.DateTimeUtils
 import com.huanchengfly.tieba.post.utils.EmoticonUtil.emoticonString
 import com.huanchengfly.tieba.post.utils.ImageUtil
 import com.huanchengfly.tieba.post.utils.StringUtil
+import com.huanchengfly.tieba.post.utils.StringUtil.getShortNumString
 import kotlin.math.max
 import kotlin.math.min
 
@@ -414,7 +415,7 @@ private fun ThreadReplyBtn(
             Text(
                 text = if (replyNum == 0)
                     stringResource(id = R.string.title_reply)
-                else "$replyNum"
+                else replyNum.getShortNumString()
             )
         },
         modifier = modifier,
@@ -445,7 +446,7 @@ private fun ThreadAgreeBtn(
             Text(
                 text = if (agreeNum == 0)
                     stringResource(id = R.string.title_agree)
-                else "$agreeNum"
+                else agreeNum.getShortNumString()
             )
         },
         modifier = modifier,
@@ -471,7 +472,7 @@ private fun ThreadShareBtn(
             Text(
                 text = if (shareNum == 0L)
                     stringResource(id = R.string.title_share)
-                else "$shareNum"
+                else shareNum.getShortNumString()
             )
         },
         modifier = modifier,
@@ -483,7 +484,7 @@ private fun ThreadShareBtn(
 @Composable
 fun FeedCard(
     item: ImmutableHolder<ThreadInfo>,
-    onClick: () -> Unit,
+    onClick: (ThreadInfo) -> Unit,
     onAgree: () -> Unit,
     onClickForum: () -> Unit = {},
     dislikeAction: @Composable () -> Unit = {},
@@ -518,7 +519,7 @@ fun FeedCard(
             Row(modifier = Modifier.fillMaxWidth()) {
                 ThreadReplyBtn(
                     replyNum = item.get { replyNum },
-                    onClick = onClick,
+                    onClick = { onClick(item.get()) },
                     modifier = Modifier.weight(1f)
                 )
 
@@ -536,7 +537,7 @@ fun FeedCard(
                 )
             }
         },
-        onClick = onClick
+        onClick = { onClick(item.get()) },
     )
 }