fix: 刷新提示位置
This commit is contained in:
parent
131376f183
commit
dc188b9d2d
|
|
@ -327,46 +327,48 @@ private fun FeedList(
|
||||||
enter = EnterTransition.None,
|
enter = EnterTransition.None,
|
||||||
exit = shrinkVertically() + fadeOut()
|
exit = shrinkVertically() + fadeOut()
|
||||||
) {
|
) {
|
||||||
BlockableContent(
|
Column {
|
||||||
blocked = blocked,
|
BlockableContent(
|
||||||
blockedTip = { BlockTip(text = { Text(text = stringResource(id = R.string.tip_blocked_thread)) }) },
|
blocked = blocked,
|
||||||
modifier = Modifier
|
blockedTip = { BlockTip(text = { Text(text = stringResource(id = R.string.tip_blocked_thread)) }) },
|
||||||
.fillMaxWidth()
|
modifier = Modifier
|
||||||
.padding(vertical = 8.dp, horizontal = 16.dp)
|
.fillMaxWidth()
|
||||||
) {
|
.padding(vertical = 8.dp, horizontal = 16.dp)
|
||||||
Column {
|
) {
|
||||||
FeedCard(
|
Column {
|
||||||
item = item,
|
FeedCard(
|
||||||
onClick = onItemClick,
|
item = item,
|
||||||
onReplyClick = onItemReplyClick,
|
onClick = onItemClick,
|
||||||
onAgree = onAgree,
|
onReplyClick = onItemReplyClick,
|
||||||
onClickForum = remember {
|
onAgree = onAgree,
|
||||||
{
|
onClickForum = remember {
|
||||||
onOpenForum(it.name)
|
{
|
||||||
|
onOpenForum(it.name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
) {
|
||||||
|
if (personalized != null) {
|
||||||
|
Dislike(
|
||||||
|
personalized = personalized,
|
||||||
|
onDislike = { clickTime, reasons ->
|
||||||
|
onDislike(item.get(), clickTime, reasons)
|
||||||
|
}
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
) {
|
if (showDivider) {
|
||||||
if (personalized != null) {
|
VerticalDivider(
|
||||||
Dislike(
|
modifier = Modifier.padding(horizontal = 16.dp),
|
||||||
personalized = personalized,
|
thickness = 2.dp
|
||||||
onDislike = { clickTime, reasons ->
|
|
||||||
onDislike(item.get(), clickTime, reasons)
|
|
||||||
}
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (showDivider) {
|
}
|
||||||
VerticalDivider(
|
if (isRefreshPosition) {
|
||||||
modifier = Modifier.padding(horizontal = 16.dp),
|
RefreshTip(onRefresh)
|
||||||
thickness = 2.dp
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (isRefreshPosition) {
|
|
||||||
RefreshTip(onRefresh)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue