From 53df4568f326d1c7868569b4fbc3f9ae7a2d5c28 Mon Sep 17 00:00:00 2001
From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com>
Date: Sun, 8 Jan 2023 11:58:40 +0800
Subject: [PATCH] =?UTF-8?q?pref:=20=E4=BC=98=E5=8C=96=20UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../post/ui/page/forum/threadlist/ForumThreadListPage.kt    | 2 +-
 .../page/main/notifications/list/NotificationsListPage.kt   | 6 ++----
 .../huanchengfly/tieba/post/ui/widgets/compose/LoadMore.kt  | 5 +----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/forum/threadlist/ForumThreadListPage.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/forum/threadlist/ForumThreadListPage.kt
index 9d234af5..35a44f4b 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/forum/threadlist/ForumThreadListPage.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/forum/threadlist/ForumThreadListPage.kt
@@ -254,7 +254,7 @@ fun ForumThreadListPage(
                     Column(
                         modifier = Modifier.fillMaxWidth(fraction)
                     ) {
-                        if (index > 0 && threadList[index - 1].isTop != item.isTop) {
+                        if (index > 0) {
                             Divider(
                                 color = ExtendedTheme.colors.divider,
                                 modifier = Modifier.padding(horizontal = 16.dp),
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/notifications/list/NotificationsListPage.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/notifications/list/NotificationsListPage.kt
index 7f705f4c..2dc3c02e 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/notifications/list/NotificationsListPage.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/notifications/list/NotificationsListPage.kt
@@ -2,7 +2,6 @@ package com.huanchengfly.tieba.post.ui.page.main.notifications.list
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -89,8 +88,7 @@ fun NotificationsListPage(
             onLoadMore = { viewModel.send(NotificationsListUiIntent.LoadMore(currentPage + 1)) },
         ) {
             LazyColumn(
-                contentPadding = PaddingValues(vertical = 16.dp),
-                verticalArrangement = Arrangement.spacedBy(24.dp),
+                contentPadding = PaddingValues(vertical = 4.dp)
             ) {
                 items(
                     items = data,
@@ -109,7 +107,7 @@ fun NotificationsListPage(
                                     ThreadActivity.launch(context, it.threadId!!, it.postId)
                                 }
                             }
-                            .padding(horizontal = 16.dp)
+                            .padding(horizontal = 16.dp, vertical = 12.dp)
                     ) {
                         if (it.replyer != null) {
                             UserHeader(
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/LoadMore.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/LoadMore.kt
index fcd35da3..8a15c838 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/LoadMore.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/LoadMore.kt
@@ -7,7 +7,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
@@ -36,9 +35,7 @@ fun LoadMoreLayout(
 ) {
     val loadDistance = with(LocalDensity.current) { LoadDistance.toPx() }
 
-    val canLoadMore = remember(key1 = enableLoadMore, key2 = loadEnd) {
-        enableLoadMore || !loadEnd
-    }
+    val canLoadMore = (enableLoadMore && !loadEnd)
 
     val swipeableState = if (canLoadMore) {
         rememberSwipeableState(isLoading) { newValue ->