♻️ :: 피드 새로고침 오류 수정

Team-SIGNAL · Nov 20, 2023 · 41aa5cb · 41aa5cb
1 parent 30880ee
commit 41aa5cb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/presentation/src/main/java/com/signal/signal_android/feature/main/feed/Feed.kt b/presentation/src/main/java/com/signal/signal_android/feature/main/feed/Feed.kt
@@ -75,9 +75,7 @@ internal fun Feed(
     )
 
     LaunchedEffect(Unit) {
-        if (state.posts.isEmpty()) {
-            feedViewModel.fetchPosts()
-        }
+        feedViewModel.fetchPosts()
     }
 
     if (showDialog) {
@@ -124,7 +122,7 @@ internal fun Feed(
                 Posts(
                     moveToFeedDetails = moveToFeedDetails,
                     moveToReport = moveToReport,
-                    posts = feedViewModel._posts,
+                    posts = { state.posts },
                     showDropDown = {
                         feedViewModel.setFeedId(it)
                         expanded = it
@@ -254,7 +252,7 @@ private fun Posts(
     moveToFeedDetails: (feedId: Long) -> Unit,
     moveToReport: () -> Unit,
     showDropDown: (feedId: Long) -> Unit,
-    posts: List<PostsEntity.PostEntity>,
+    posts: () -> List<PostsEntity.PostEntity>,
     onDismissRequest: () -> Unit,
     expanded: Long,
     onDelete: () -> Unit,
@@ -274,7 +272,7 @@ private fun Posts(
         state = lazyListState,
         modifier = Modifier.fillMaxSize(),
     ) {
-        items(posts) {
+        items(posts()) {
             Post(
                 moveToFeedDetails = { moveToFeedDetails(it.id) },
                 imageUrl = it.image,

diff --git a/presentation/src/main/java/com/signal/signal_android/feature/main/feed/FeedViewModel.kt b/presentation/src/main/java/com/signal/signal_android/feature/main/feed/FeedViewModel.kt
@@ -16,7 +16,7 @@ import kotlinx.coroutines.launch
 internal class FeedViewModel(
     private val feedRepository: FeedRepository,
 ) : BaseViewModel<FeedState, FeedSideEffect>(FeedState.getDefaultState()) {
-    internal val _posts: SnapshotStateList<PostsEntity.PostEntity> = mutableStateListOf()
+    private val _posts: SnapshotStateList<PostsEntity.PostEntity> = mutableStateListOf()
     private val _comments: SnapshotStateList<PostCommentsEntity.CommentEntity> =
         mutableStateListOf()
 
@@ -31,16 +31,18 @@ internal class FeedViewModel(
                     )
                 }.onSuccess {
                     with(it.postEntities) {
-                        when (_posts.contains(firstOrNull())) {
-                            true -> _posts.add(last())
-                            else -> _posts.addAll(this)
-                        }
-                        setState(
-                            copy(
-                                posts = _posts,
-                                hasNextPage = isNotEmpty()
+                        if (_posts.size != it.postEntities.size) {
+                            when (_posts.contains(firstOrNull())) {
+                                true -> _posts.add(last())
+                                else -> _posts.addAll(this)
+                            }
+                            setState(
+                                copy(
+                                    posts = _posts,
+                                    hasNextPage = isNotEmpty()
+                                )
                             )
-                        )
+                        }
                     }
                 }
             }
@@ -56,7 +58,6 @@ internal class FeedViewModel(
                     image = imageUrl,
                 ).onSuccess {
                     postSideEffect(FeedSideEffect.PostSuccess)
-                    fetchPosts()
                 }
             }
         }