From 84c08a639d4b15b44c030efdd980efa8a6c209af Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 25 Jun 2024 08:41:22 +0800
Subject: [PATCH] Move refresh functions into delegate

---
 .../demoapp/adapter/rv/core/BaseRvAdapter.kt  | 12 ------
 .../adapter/rv/core/IRvAdapterDelegate.kt     | 41 ++++++++++++-------
 .../adapter/rv/diff/BaseRvDiffAdapter.kt      | 15 -------
 .../adapter/rv/paging/BaseRvPagingAdapter.kt  |  4 +-
 4 files changed, 30 insertions(+), 42 deletions(-)

diff --git a/adapter/src/main/kotlin/io/goooler/demoapp/adapter/rv/core/BaseRvAdapter.kt b/adapter/src/main/kotlin/io/goooler/demoapp/adapter/rv/core/BaseRvAdapter.kt
index 24ab129d2..d83b9d2e8 100644
--- a/adapter/src/main/kotlin/io/goooler/demoapp/adapter/rv/core/BaseRvAdapter.kt
+++ b/adapter/src/main/kotlin/io/goooler/demoapp/adapter/rv/core/BaseRvAdapter.kt
@@ -33,16 +33,4 @@ abstract class BaseRvAdapter<M : IVhModelType> private constructor(
     }
 
   override fun getItemCount(): Int = delegate.list.size
-
-  override fun refreshItems(items: List<M>) {
-    delegate.refreshItems(items, ::notifyItemChanged)
-  }
-
-  override fun removeItem(index: Int) {
-    delegate.removeItem(index, ::notifyItemRemoved)
-  }
-
-  override fun removeItem(item: M) {
-    delegate.removeItem(item, ::notifyItemRemoved)
-  }
 }
diff --git a/adapter/src/main/kotlin/io/goooler/demoapp/adapter/rv/core/IRvAdapterDelegate.kt b/adapter/src/main/kotlin/io/goooler/demoapp/adapter/rv/core/IRvAdapterDelegate.kt
index 5f9ef8720..7e4e7c8f3 100644
--- a/adapter/src/main/kotlin/io/goooler/demoapp/adapter/rv/core/IRvAdapterDelegate.kt
+++ b/adapter/src/main/kotlin/io/goooler/demoapp/adapter/rv/core/IRvAdapterDelegate.kt
@@ -23,13 +23,14 @@ internal interface RecyclerViewAdapter<VH : RecyclerView.ViewHolder> {
 }
 
 internal interface IRvAdapterDelegate<M : IVhModelType, VH : BindingViewHolder> :
-  IRvAdapter<M>,
+  IMutableRvAdapter<M>,
   RecyclerViewAdapter<VH> {
 
   @Suppress("TooManyFunctions")
   class Impl<M : IVhModelType, AP> : IRvAdapterDelegate<M, BindingViewHolder>
     where AP : IRvAdapter<M>,
-          AP : IRvBinding<M> {
+          AP : IRvBinding<M>,
+          AP : RecyclerView.Adapter<BindingViewHolder> {
 
     private val ivdManager = ViewTypeDelegateManager<M>()
     private val _list = mutableListOf<M>()
@@ -90,10 +91,31 @@ internal interface IRvAdapterDelegate<M : IVhModelType, VH : BindingViewHolder>
       adapter.onBindVH(binding, model, payloads)
     }
 
+    override fun refreshItems(items: List<M>) {
+      refreshItems(items, adapter::notifyItemChanged)
+    }
+
+    override fun removeItem(index: Int) {
+      removeItem(index = index, adapter::notifyItemRemoved)
+    }
+
+    override fun removeItem(item: M) {
+      removeItem(item = item, adapter::notifyItemRemoved)
+    }
+
+    /**
+     * Transform data list. Always return a new list.
+     */
+    fun transform(original: List<M>): List<M> {
+      val result = mutableListOf<M>()
+      original.forEach { findLeaf(it, result) }
+      return result
+    }
+
     /**
      * Compare the list to find the same items and refresh them.
      */
-    inline fun refreshItems(items: List<M>, notify: (Int) -> Unit) {
+    private inline fun refreshItems(items: List<M>, notify: (Int) -> Unit) {
       transform(items).forEach {
         if (it in _list) {
           notify(_list.indexOf(it))
@@ -101,26 +123,17 @@ internal interface IRvAdapterDelegate<M : IVhModelType, VH : BindingViewHolder>
       }
     }
 
-    inline fun removeItem(index: Int, notify: (Int) -> Unit) {
+    private inline fun removeItem(index: Int, notify: (Int) -> Unit) {
       _list.removeAt(index)
       notify(index)
     }
 
-    inline fun removeItem(item: M, notify: (Int) -> Unit) {
+    private inline fun removeItem(item: M, notify: (Int) -> Unit) {
       _list.indexOf(item).takeIf { it != -1 }?.let {
         removeItem(it, notify)
       }
     }
 
-    /**
-     * Transform data list. Always return a new list.
-     */
-    fun transform(original: List<M>): List<M> {
-      val result = mutableListOf<M>()
-      original.forEach { findLeaf(it, result) }
-      return result
-    }
-
     /**
      * Recursively traversing all leaf nodes.
      */
diff --git a/adapter/src/main/kotlin/io/goooler/demoapp/adapter/rv/diff/BaseRvDiffAdapter.kt b/adapter/src/main/kotlin/io/goooler/demoapp/adapter/rv/diff/BaseRvDiffAdapter.kt
index e113ad703..631ed3293 100644
--- a/adapter/src/main/kotlin/io/goooler/demoapp/adapter/rv/diff/BaseRvDiffAdapter.kt
+++ b/adapter/src/main/kotlin/io/goooler/demoapp/adapter/rv/diff/BaseRvDiffAdapter.kt
@@ -45,19 +45,4 @@ abstract class BaseRvDiffAdapter<M : IDiffVhModelType> private constructor(
       delegate.list = value
       submitList(delegate.transform(value))
     }
-
-  /**
-   * Please do not use it with setList() !
-   */
-  override fun refreshItems(items: List<M>) {
-    delegate.refreshItems(items, ::notifyItemChanged)
-  }
-
-  override fun removeItem(index: Int) {
-    delegate.removeItem(index, ::notifyItemRemoved)
-  }
-
-  override fun removeItem(item: M) {
-    delegate.removeItem(item, ::notifyItemRemoved)
-  }
 }
diff --git a/adapter/src/main/kotlin/io/goooler/demoapp/adapter/rv/paging/BaseRvPagingAdapter.kt b/adapter/src/main/kotlin/io/goooler/demoapp/adapter/rv/paging/BaseRvPagingAdapter.kt
index 1c69109d6..cc2374db5 100644
--- a/adapter/src/main/kotlin/io/goooler/demoapp/adapter/rv/paging/BaseRvPagingAdapter.kt
+++ b/adapter/src/main/kotlin/io/goooler/demoapp/adapter/rv/paging/BaseRvPagingAdapter.kt
@@ -29,7 +29,9 @@ abstract class BaseRvPagingAdapter<M : IDiffVhModelType> private constructor(
 
   var onLoadStatusListener: OnLoadStatusListener? = null
 
-  override val list: List<M> get() = snapshot().items
+  override var list: List<M>
+    get() = snapshot().items
+    set(value) = error("You shouldn't call this setter. Use submitData() instead.")
 
   constructor(callback: DiffCallback<M> = DiffCallback()) : this(callback, IRvAdapterDelegate.Impl()) {
     @Suppress("LeakingThis")