Recycler view example added

Author: Kirito398

entities/presentation/src/main/java/ru/sir/presentation/base/recycler_view/BaseViewHolder.kt

@@ -4,11 +4,16 @@ import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.RecyclerView
 import ru.sir.presentation.base.BaseViewModel
 
-class BaseViewHolder<M, I : RecyclerViewBaseItem<M, out BaseViewModel>>(
+class BaseViewHolder<M : Any?, I : RecyclerViewBaseItem<M, out BaseViewModel>>(
     private val binding: ViewDataBinding,
-    private val viewModel: I
+    private val viewModel: I,
+    private val viewModelId: Int
 ) : RecyclerView.ViewHolder(binding.root) {
 
+    init {
+        binding.setVariable(viewModelId, viewModel)
+    }
+
     fun bindData(item: M) {
         viewModel.bindData(item)
     }

entities/presentation/src/main/java/ru/sir/presentation/base/recycler_view/RecyclerViewAdapter.kt

@@ -1,40 +1,49 @@
 package ru.sir.presentation.base.recycler_view
 
+import android.util.SparseArray
 import android.view.ViewGroup
 import androidx.annotation.LayoutRes
 import androidx.recyclerview.widget.RecyclerView
 import ru.sir.presentation.base.BaseViewModel
-import java.lang.IllegalStateException
 
-class RecyclerViewAdapter(private val producers: MutableMap<Int, ViewHolderProducer<*, *, *>>) : RecyclerView.Adapter<BaseViewHolder>() {
+class RecyclerViewAdapter(private val producers: SparseArray<ViewHolderProducer<in Any, *, *>>, private val data: MutableList<RecyclerViewBaseDataModel>) : RecyclerView.Adapter<BaseViewHolder<in Any, *>>() {
 
-    private var data = mutableListOf<String>()
+    class Builder<VM : BaseViewModel>(private val viewModel: VM, private val viewModelId: Int) {
+        private val producers = SparseArray<ViewHolderProducer<*, *, *>>()
 
-    class Builder<VM : BaseViewModel>(private val viewModel: VM) {
-        private val producers = mutableMapOf<Int, ViewHolderProducer<*, *, *>>()
-
-        fun <M, I : RecyclerViewBaseItem<M, VM>> addProducer(type: Int, @LayoutRes layoutId: Int, modelClassType: Class<M>, itemViewModelClassType: Class<I>): Builder<VM> {
+        fun <M : Any, I : RecyclerViewBaseItem<M, VM>> addProducer(
+            type: Int,
+            @LayoutRes layoutId: Int,
+            modelClassType: Class<M>,
+            itemViewModelClassType: Class<I>
+        ): Builder<VM> {
             val producer: ViewHolderProducer<M, I, VM> = ViewHolderProducer(type, layoutId, modelClassType, itemViewModelClassType)
             return addProducer(producer)
         }
 
-        fun <M, I : RecyclerViewBaseItem<M, VM>> addProducer(producer: ViewHolderProducer<M, I, VM>): Builder<VM> {
+        fun <M : Any, I : RecyclerViewBaseItem<M, VM>> addProducer(producer: ViewHolderProducer<M, I, VM>): Builder<VM> {
             producer.setParentViewModel(viewModel)
-            producers[producer.getViewType()] = producer
+            producer.setViewModelId(viewModelId)
+            producers.put(producer.getViewType(), producer)
             return this
         }
 
-        fun build() = RecyclerViewAdapter(producers)
+        @Suppress("UNCHECKED_CAST")
+        fun build(data: MutableList<RecyclerViewBaseDataModel>) = RecyclerViewAdapter(producers as SparseArray<ViewHolderProducer<in Any, *, *>>, data)
     }
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder<*, *> {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder<in Any, *> {
         return producers[viewType]?.produce(parent)
             ?: throw IllegalStateException("View Holder Producer not found!")
     }
 
-    override fun onBindViewHolder(holder: BaseViewHolder<*, *>, position: Int) {
-        holder.bindData(data[position])
+    override fun onBindViewHolder(holder: BaseViewHolder<in Any, *>, position: Int) {
+        holder.bindData(data[position].getData())
     }
 
     override fun getItemCount(): Int = data.size
+
+    override fun getItemViewType(position: Int): Int {
+        return data[position].getType()
+    }
 }

entities/presentation/src/main/java/ru/sir/presentation/base/recycler_view/RecyclerViewBaseDataModel.kt

@@ -0,0 +1,24 @@
+package ru.sir.presentation.base.recycler_view
+
+class RecyclerViewBaseDataModel(
+    private val data: Any,
+    private val type: Int
+) {
+
+    fun getData(): Any = data
+    fun getType(): Int = type
+
+//    override fun equals(o: Any?): Boolean {
+//        if (this === o) return true
+//        if (o == null || javaClass != o.javaClass) return false
+//        val that = o as RecyclerViewBaseDataModel
+//
+//        return if (type != that.type) false else Objects.equals(data, that.data)
+//    }
+//
+//    override fun hashCode(): Int {
+//        var result = data?.hashCode() ?: 0
+//        result = 31 * result + type
+//        return result
+//    }
+}

entities/presentation/src/main/java/ru/sir/presentation/base/recycler_view/RecyclerViewBaseItem.kt

@@ -2,7 +2,7 @@ package ru.sir.presentation.base.recycler_view
 
 import ru.sir.presentation.base.BaseViewModel
 
-abstract class RecyclerViewBaseItem<M, VM : BaseViewModel> {
+abstract class RecyclerViewBaseItem<M : Any?, VM : BaseViewModel> {
     protected lateinit var parent: VM
 
     fun init(parent: VM) {

entities/presentation/src/main/java/ru/sir/presentation/base/recycler_view/ViewHolderProducer.kt

@@ -7,13 +7,18 @@ import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
 import ru.sir.presentation.base.BaseViewModel
 
-class ViewHolderProducer<M, I : RecyclerViewBaseItem<M, VM>, VM : BaseViewModel>(val type: Int, @LayoutRes val layoutId: Int, val modelClassType: Class<M>, private val itemViewModelClassType: Class<I>) {
+class ViewHolderProducer<M : Any, I : RecyclerViewBaseItem<M, VM>, VM : BaseViewModel>(val type: Int, @LayoutRes val layoutId: Int, val modelClassType: Class<M>, private val itemViewModelClassType: Class<I>) {
     private lateinit var parentViewModel: VM
+    private var viewModelId: Int = -1
 
     fun setParentViewModel(viewModel: VM) {
         parentViewModel = viewModel
     }
 
+    fun setViewModelId(id: Int) {
+        viewModelId = id
+    }
+
     fun getViewType() = type
 
     fun produce(parent: ViewGroup): BaseViewHolder<M, I> {
@@ -24,7 +29,7 @@ class ViewHolderProducer<M, I : RecyclerViewBaseItem<M, VM>, VM : BaseViewModel>
             false
         )
 
-        return BaseViewHolder(binding, instantiateViewModel())
+        return BaseViewHolder(binding, instantiateViewModel(), viewModelId)
     }
 
     private fun instantiateViewModel(): I {

features/example1/src/main/java/ru/bis/example1/view_models/CustomDataBinding.kt renamed to entities/presentation/src/main/java/ru/sir/presentation/extensions/CustomDataBinding.kt

@@ -1,4 +1,4 @@
-package ru.bis.example1.view_models
+package ru.sir.presentation.extensions
 
 import androidx.databinding.BindingAdapter
 import androidx.recyclerview.widget.RecyclerView

features/example1/src/main/java/ru/bis/example1/ui/adapters/Example1Adapter.kt

@@ -2,13 +2,13 @@ package ru.bis.example1.view_models
 
 import android.app.Application
 import androidx.databinding.ObservableField
-import androidx.recyclerview.widget.RecyclerView
+import ru.bis.example1.BR
 import ru.bis.example1.R
-import ru.bis.example1.ui.adapters.Example1Adapter
 import ru.bis.example1_api.interactor.GetDataFromCache
 import ru.sir.core.None
 import ru.sir.presentation.base.BaseViewModel
 import ru.sir.presentation.base.recycler_view.RecyclerViewAdapter
+import ru.sir.presentation.base.recycler_view.RecyclerViewBaseDataModel
 import javax.inject.Inject
 
 class Example1ViewModel @Inject constructor(
@@ -17,15 +17,17 @@ class Example1ViewModel @Inject constructor(
     ) : BaseViewModel(application) {
 
     val result = ObservableField<String>()
-    val items = mutableListOf<String>()
+    val items = mutableListOf(
+        RecyclerViewBaseDataModel("Label 1", 1),
+        RecyclerViewBaseDataModel("Label 2", 1),
+        RecyclerViewBaseDataModel("Label 3", 1),
+        RecyclerViewBaseDataModel("Label 4", 1),
+        RecyclerViewBaseDataModel("Label 5", 1),
+        RecyclerViewBaseDataModel("Label 6", 1)
+    )
 
     override fun init() {
         getDataFromCache(None()) { it.either(::onLoadDataFromCacheFailed, ::onLoadDataFromCacheSuccess) }
-
-        items.add("String 1")
-        items.add("String 2")
-        items.add("String 3")
-        items.add("String 4")
     }
 
     private fun onLoadDataFromCacheSuccess(data: String) {
@@ -36,7 +38,7 @@ class Example1ViewModel @Inject constructor(
         result.set(context.getString(R.string.load_data_failed))
     }
 
-    fun recyclerViewAdapter() = RecyclerViewAdapter.Builder(this)
-        .addProducer(1, R.layout.item_example1, String::class.java, ItemViewModel::class.java)
-        .build()
+    fun recyclerViewAdapter() = RecyclerViewAdapter.Builder(this, BR.viewModel)
+            .addProducer(1, R.layout.item_example1, String::class.java, ItemViewModel::class.java)
+            .build(items)
 }

features/example1/src/main/java/ru/bis/example1/ui/adapters/Example1ViewHolder.kt

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout>
+<layout xmlns:tools="http://schemas.android.com/tools">
 
     <data>
         <variable
@@ -21,27 +21,31 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:text="@string/example1_title"/>
+        android:text="@string/example1_title"
+        android:layout_margin="10dp"/>
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/rvExample"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:text="@{viewModel.result}"/>
+        app:layout_constraintTop_toBottomOf="@id/title"
+        android:text="@{viewModel.result}"
+        android:layout_margin="10dp"/>
 
     <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvExample"
         android:layout_height="0dp"
         android:layout_width="match_parent"
         app:layout_constraintTop_toBottomOf="@id/text"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        recyclerAdapter="@{viewModel.recyclerViewAdapter()}"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
+        app:recyclerAdapter="@{viewModel.recyclerViewAdapter()}"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        tools:listitem="@layout/item_example1"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>