Tweak RvAdapterDelegate

adapter/src/main/kotlin/io/goooler/demoapp/adapter/rv/core/BaseRvAdapter.kt

@@ -1,6 +1,5 @@
 package io.goooler.demoapp.adapter.rv.core
 
-import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.RecyclerView
 
 /**
@@ -14,7 +13,7 @@ import androidx.recyclerview.widget.RecyclerView
  */
 @Suppress("TooManyFunctions")
 abstract class BaseRvAdapter<M : IVhModelType> private constructor(
- private val delegate: RvAdapterDelegate<M>,
+ private val delegate: RvAdapterDelegate<M, BaseRvAdapter<M>>,
 ) : RecyclerView.Adapter<BindingViewHolder>(),
  IRvBinding<M>,
  IMutableRvAdapter<M>,
@@ -33,14 +32,6 @@ abstract class BaseRvAdapter<M : IVhModelType> private constructor(
  notifyDataSetChanged()
  }
 
- override fun onCreateVHForAll(binding: ViewDataBinding) {
- onCreateVH(binding)
- }
-
- override fun onBindVHForAll(binding: ViewDataBinding, model: M, payloads: List<Any>) {
- onBindVH(binding, model, payloads)
- }
-
  override fun refreshItems(items: List<M>) {
  delegate.refreshItems(items, ::notifyItemChanged)
  }

adapter/src/main/kotlin/io/goooler/demoapp/adapter/rv/core/IRvAdapterDelegate.kt

@@ -53,12 +53,14 @@ internal interface IRvAdapterDelegate<M : IVhModelType, VH : BindingViewHolder>
  * @since 1.0.0
  */
 @Suppress("TooManyFunctions")
-internal class RvAdapterDelegate<M : IVhModelType> : IRvAdapterDelegate<M, BindingViewHolder> {
+internal class RvAdapterDelegate<M : IVhModelType, AP> : IRvAdapterDelegate<M, BindingViewHolder>
+ where AP : IRvAdapter<M>,
+ AP : IRvBinding<M> {
 
  private val ivdManager = ViewTypeDelegateManager<M>()
  private val _list = mutableListOf<M>()
 
- lateinit var adapter: IRvAdapter<M>
+ lateinit var adapter: AP
 
  override var list: List<M>
  get() = _list.toImmutableList()
@@ -121,11 +123,11 @@ internal class RvAdapterDelegate<M : IVhModelType> : IRvAdapterDelegate<M, Bindi
  }
 
  override fun onCreateVHForAll(binding: ViewDataBinding) {
- error("Shouldn't call this in delegate.")
+ adapter.onCreateVH(binding)
  }
 
  override fun onBindVHForAll(binding: ViewDataBinding, model: M, payloads: List<Any>) {
- error("Shouldn't call this in delegate.")
+ adapter.onBindVH(binding, model, payloads)
  }
 
  /**

adapter/src/main/kotlin/io/goooler/demoapp/adapter/rv/diff/BaseRvDiffAdapter.kt

@@ -1,6 +1,5 @@
 package io.goooler.demoapp.adapter.rv.diff
 
-import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.AsyncDifferConfig
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
@@ -21,7 +20,7 @@ import io.goooler.demoapp.adapter.rv.core.RvAdapterDelegate
  */
 abstract class BaseRvDiffAdapter<M : IDiffVhModelType> private constructor(
  callback: AsyncDifferConfig<M>,
- private val delegate: RvAdapterDelegate<M>,
+ private val delegate: RvAdapterDelegate<M, BaseRvDiffAdapter<M>>,
 ) : ListAdapter<M, BindingViewHolder>(callback),
  IRvBinding<M>,
  IMutableRvAdapter<M>,
@@ -47,14 +46,6 @@ abstract class BaseRvDiffAdapter<M : IDiffVhModelType> private constructor(
  submitList(delegate.transform(value))
  }
 
- override fun onCreateVHForAll(binding: ViewDataBinding) {
- onCreateVH(binding)
- }
-
- override fun onBindVHForAll(binding: ViewDataBinding, model: M, payloads: List<Any>) {
- onBindVH(binding, model, payloads)
- }
-
  /**
  * Please do not use it with setList() !
  */

adapter/src/main/kotlin/io/goooler/demoapp/adapter/rv/paging/BaseRvPagingAdapter.kt

@@ -23,7 +23,7 @@ import io.goooler.demoapp.adapter.rv.diff.IDiffVhModelType
  */
 abstract class BaseRvPagingAdapter<M : IDiffVhModelType> private constructor(
  callback: DiffCallBack<M>,
- private val delegate: RvAdapterDelegate<M>,
+ private val delegate: RvAdapterDelegate<M, BaseRvPagingAdapter<M>>,
 ) : PagingDataAdapter<M, BindingViewHolder>(callback),
  IRvBinding<M>,
  IRvAdapter<M>,