[FIX] #307 외부와 내부 리사이클러뷰에서 서로 다른 리스트를 사용하도록 깊은 복사 수행하기

Runnect · Feb 6, 2024 · b2ecbfe · b2ecbfe
1 parent 12ab353
commit b2ecbfe
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/...c/main/java/com/runnect/runnect/presentation/discover/adapter/DiscoverRecommendAdapter.kt b/...c/main/java/com/runnect/runnect/presentation/discover/adapter/DiscoverRecommendAdapter.kt
@@ -11,6 +11,7 @@ import com.runnect.runnect.domain.entity.DiscoverMultiViewItem
 import com.runnect.runnect.presentation.MainActivity
 import com.runnect.runnect.presentation.discover.model.EditableDiscoverCourse
 import com.runnect.runnect.util.callback.diff.ItemDiffCallback
+import okhttp3.internal.wait
 import timber.log.Timber
 
 class DiscoverRecommendAdapter(
@@ -90,18 +91,33 @@ class DiscoverRecommendAdapter(
     }
 
     fun addRecommendCourseNextPage(nextPageItems: List<DiscoverMultiViewItem.RecommendCourse>) {
-        notifyItemRangeInserted(itemCount - 1, nextPageItems.size)
-        Timber.d("item count in inner recyclerview: ${nextPageItems.size} ${itemCount}")
+        Timber.d("before item count : $itemCount")
+
+        val newList = currentList.toMutableList()
+        newList.addAll(nextPageItems)
+
+        submitList(newList) { // 비동기 작업이 끝나고 나서 호출되는 콜백 함수
+            Timber.d("after item count : $itemCount")
+        }
     }
 
     fun updateRecommendCourseBySorting(firstPageItems: List<DiscoverMultiViewItem.RecommendCourse>) {
-        notifyDataSetChanged()
-        Timber.d("item count in inner recyclerview: ${firstPageItems.size} ${itemCount}")
+        Timber.d("before item count : $itemCount")
+
+        val newList = currentList.toMutableList()
+        newList.apply {
+            clear()
+            addAll(firstPageItems)
+        }
+
+        submitList(newList) {
+            Timber.d("after item count : $itemCount")
+        }
     }
 
     companion object {
         private val diffUtil = ItemDiffCallback<DiscoverMultiViewItem.RecommendCourse>(
-            onItemsTheSame = { old, new -> old.id == new.id },
+            onItemsTheSame = { old, new -> old === new },
             onContentsTheSame = { old, new -> old == new }
         )
     }

diff --git a/...a/com/runnect/runnect/presentation/discover/adapter/multiview/DiscoverMultiViewAdapter.kt b/...a/com/runnect/runnect/presentation/discover/adapter/multiview/DiscoverMultiViewAdapter.kt
@@ -36,7 +36,9 @@ class DiscoverMultiViewAdapter(
             }
 
             is DiscoverMultiViewHolder.RecommendCourseViewHolder -> {
-                holder.bind(recommendCourses)
+                // 내부 리사이클러뷰에서는 완전히 새로운 리스트를 참조하도록 깊은 복사 수행
+                val newList = recommendCourses.map { it.copy() }.toList()
+                holder.bind(newList)
             }
         }
     }
@@ -92,8 +94,6 @@ class DiscoverMultiViewAdapter(
 
     fun addRecommendCourseNextPage(nextPageItems: List<RecommendCourse>) {
         recommendCourses.addAll(nextPageItems)
-        Timber.d("item count in outer recyclerview: ${nextPageItems.size} ${recommendCourses.size}")
-
         multiViewHolderFactory.recommendCourseAdapter.addRecommendCourseNextPage(nextPageItems)
     }
 
@@ -102,8 +102,6 @@ class DiscoverMultiViewAdapter(
             clear()
             addAll(firstPageItems)
         }
-        Timber.d("item count in outer recyclerview: ${firstPageItems.size} ${recommendCourses.size}")
-
         multiViewHolderFactory.recommendCourseAdapter.updateRecommendCourseBySorting(firstPageItems)
     }