From dc188b9d2d69badfe56e80f6f5d6e65430bb78b4 Mon Sep 17 00:00:00 2001 From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com> Date: Thu, 5 Oct 2023 14:49:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=B7=E6=96=B0=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../explore/personalized/PersonalizedPage.kt | 66 ++++++++++--------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/explore/personalized/PersonalizedPage.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/explore/personalized/PersonalizedPage.kt index 4072f247..edac0f93 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/explore/personalized/PersonalizedPage.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/explore/personalized/PersonalizedPage.kt @@ -327,46 +327,48 @@ private fun FeedList( enter = EnterTransition.None, exit = shrinkVertically() + fadeOut() ) { - BlockableContent( - blocked = blocked, - blockedTip = { BlockTip(text = { Text(text = stringResource(id = R.string.tip_blocked_thread)) }) }, - modifier = Modifier - .fillMaxWidth() - .padding(vertical = 8.dp, horizontal = 16.dp) - ) { - Column { - FeedCard( - item = item, - onClick = onItemClick, - onReplyClick = onItemReplyClick, - onAgree = onAgree, - onClickForum = remember { - { - onOpenForum(it.name) + Column { + BlockableContent( + blocked = blocked, + blockedTip = { BlockTip(text = { Text(text = stringResource(id = R.string.tip_blocked_thread)) }) }, + modifier = Modifier + .fillMaxWidth() + .padding(vertical = 8.dp, horizontal = 16.dp) + ) { + Column { + FeedCard( + item = item, + onClick = onItemClick, + onReplyClick = onItemReplyClick, + onAgree = onAgree, + onClickForum = remember { + { + onOpenForum(it.name) + } + } + ) { + if (personalized != null) { + Dislike( + personalized = personalized, + onDislike = { clickTime, reasons -> + onDislike(item.get(), clickTime, reasons) + } + ) } } - ) { - if (personalized != null) { - Dislike( - personalized = personalized, - onDislike = { clickTime, reasons -> - onDislike(item.get(), clickTime, reasons) - } + if (showDivider) { + VerticalDivider( + modifier = Modifier.padding(horizontal = 16.dp), + thickness = 2.dp ) } } - if (showDivider) { - VerticalDivider( - modifier = Modifier.padding(horizontal = 16.dp), - thickness = 2.dp - ) - } + } + if (isRefreshPosition) { + RefreshTip(onRefresh) } } } - if (isRefreshPosition) { - RefreshTip(onRefresh) - } } } }