RecyclerView dynamic items added

Kirito398 · Kirito398 · commit 9c96fadc661e · 2021-03-23T08:48:46.000+03:00
diff --git a/entities/presentation/src/main/java/ru/sir/presentation/base/recycler_view/RecyclerViewAdapter.kt b/entities/presentation/src/main/java/ru/sir/presentation/base/recycler_view/RecyclerViewAdapter.kt
@@ -3,10 +3,21 @@ package ru.sir.presentation.base.recycler_view
 import android.util.SparseArray
 import android.view.ViewGroup
 import androidx.annotation.LayoutRes
+import androidx.databinding.ObservableArrayList
 import androidx.recyclerview.widget.RecyclerView
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import ru.sir.presentation.base.BaseViewModel
+import ru.sir.presentation.extensions.onChanged
 
-class RecyclerViewAdapter(private val producers: SparseArray<ViewHolderProducer<in Any, *, *>>, private val data: MutableList<RecyclerViewBaseDataModel>) : RecyclerView.Adapter<BaseViewHolder<in Any, *>>() {
+class RecyclerViewAdapter(private val producers: SparseArray<ViewHolderProducer<in Any, *, *>>) : RecyclerView.Adapter<BaseViewHolder<in Any, *>>() {
+
+    val data = ObservableArrayList<RecyclerViewBaseDataModel>().onChanged {
+        CoroutineScope(Dispatchers.Main).launch {
+            notifyDataSetChanged()
+        }
+    }
 
     class Builder<VM : BaseViewModel>(private val viewModel: VM, private val viewModelId: Int) {
         private val producers = SparseArray<ViewHolderProducer<*, *, *>>()
@@ -29,7 +40,7 @@ class RecyclerViewAdapter(private val producers: SparseArray<ViewHolderProducer<
         }
 
         @Suppress("UNCHECKED_CAST")
-        fun build(data: MutableList<RecyclerViewBaseDataModel>) = RecyclerViewAdapter(producers as SparseArray<ViewHolderProducer<in Any, *, *>>, data)
+        fun build() = RecyclerViewAdapter(producers as SparseArray<ViewHolderProducer<in Any, *, *>>)
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder<in Any, *> {
@@ -46,4 +57,9 @@ class RecyclerViewAdapter(private val producers: SparseArray<ViewHolderProducer<
     override fun getItemViewType(position: Int): Int {
         return data[position].getType()
     }
+
+    fun getObserver(f: (observer: ObservableArrayList<RecyclerViewBaseDataModel>) -> Unit): RecyclerViewAdapter {
+        f(data)
+        return this
+    }
 }
diff --git a/entities/presentation/src/main/java/ru/sir/presentation/extensions/BindingExtensions.kt b/entities/presentation/src/main/java/ru/sir/presentation/extensions/BindingExtensions.kt
@@ -1,7 +1,9 @@
 package ru.sir.presentation.extensions
 
 import androidx.databinding.Observable
+import androidx.databinding.ObservableArrayList
 import androidx.databinding.ObservableBoolean
+import androidx.databinding.ObservableList
 
 fun ObservableBoolean.onChanged(f: (newValue: Boolean) -> Unit): ObservableBoolean {
     addOnPropertyChangedCallback(object : Observable.OnPropertyChangedCallback() {
@@ -10,4 +12,15 @@ fun ObservableBoolean.onChanged(f: (newValue: Boolean) -> Unit): ObservableBoole
         }
     })
     return this
+}
+
+fun <T> ObservableArrayList<T>.onChanged(f: ObservableArrayList<T>.() -> Unit): ObservableArrayList<T> {
+    addOnListChangedCallback(object : ObservableList.OnListChangedCallback<ObservableList<*>>() {
+        override fun onChanged(sender: ObservableList<*>?) { f() }
+        override fun onItemRangeChanged(sender: ObservableList<*>?, positionStart: Int, itemCount: Int) { f() }
+        override fun onItemRangeInserted(sender: ObservableList<*>?, positionStart: Int, itemCount: Int) { f() }
+        override fun onItemRangeMoved(sender: ObservableList<*>?, fromPosition: Int, toPosition: Int, itemCount: Int) { f() }
+        override fun onItemRangeRemoved(sender: ObservableList<*>?, positionStart: Int, itemCount: Int) { f() }
+    })
+    return this
 }
diff --git a/features/recycler_view_example/src/main/java/ru/sir/recycler_view_example/data/Remote.kt b/features/recycler_view_example/src/main/java/ru/sir/recycler_view_example/data/Remote.kt
@@ -0,0 +1,9 @@
+package ru.sir.recycler_view_example.data
+
+import ru.sir.core.Either
+import ru.sir.core.None
+import ru.sir.recycler_view_example_api.models.Item
+
+interface Remote {
+    fun loadDataFromServer(): Either<None, List<Item>>
+}
diff --git a/features/recycler_view_example/src/main/java/ru/sir/recycler_view_example/data/RepositoryImpl.kt b/features/recycler_view_example/src/main/java/ru/sir/recycler_view_example/data/RepositoryImpl.kt
@@ -0,0 +1,10 @@
+package ru.sir.recycler_view_example.data
+
+import ru.sir.core.Either
+import ru.sir.core.None
+import ru.sir.recycler_view_example_api.interfaces.Repository
+import ru.sir.recycler_view_example_api.models.Item
+
+class RepositoryImpl(private val remote: Remote) : Repository {
+    override fun loadData(): Either<None, List<Item>> = remote.loadDataFromServer()
+}
diff --git a/features/recycler_view_example/src/main/java/ru/sir/recycler_view_example/di/components/RecyclerViewExampleComponent.kt b/features/recycler_view_example/src/main/java/ru/sir/recycler_view_example/di/components/RecyclerViewExampleComponent.kt
@@ -2,13 +2,12 @@ package ru.sir.recycler_view_example.di.components
 
 import dagger.Subcomponent
 import ru.sir.presentation.base.BaseDaggerComponent
-import ru.sir.recycler_view_example.di.modules.CacheModule
-import ru.sir.recycler_view_example.di.modules.ViewModelModule
+import ru.sir.recycler_view_example.di.modules.*
 import ru.sir.recycler_view_example.ui.RecyclerViewExample
 import javax.inject.Singleton
 
 @Singleton
-@Subcomponent(modules = [ViewModelModule::class, CacheModule::class])
+@Subcomponent(modules = [ViewModelModule::class, DomainModule::class, DataModule::class, RemoteModule::class, CacheModule::class])
 interface RecyclerViewExampleComponent : BaseDaggerComponent {
 
     @Subcomponent.Factory
diff --git a/features/recycler_view_example/src/main/java/ru/sir/recycler_view_example/di/modules/DataModule.kt b/features/recycler_view_example/src/main/java/ru/sir/recycler_view_example/di/modules/DataModule.kt
@@ -0,0 +1,16 @@
+package ru.sir.recycler_view_example.di.modules
+
+import dagger.Module
+import dagger.Provides
+import ru.sir.recycler_view_example.data.Remote
+import ru.sir.recycler_view_example.data.RepositoryImpl
+import ru.sir.recycler_view_example_api.interfaces.Repository
+import javax.inject.Singleton
+
+@Module
+class DataModule {
+
+    @Provides
+    @Singleton
+    fun provideRepository(remote: Remote): Repository = RepositoryImpl(remote)
+}
diff --git a/features/recycler_view_example/src/main/java/ru/sir/recycler_view_example/di/modules/DomainModule.kt b/features/recycler_view_example/src/main/java/ru/sir/recycler_view_example/di/modules/DomainModule.kt
@@ -0,0 +1,13 @@
+package ru.sir.recycler_view_example.di.modules
+
+import dagger.Module
+import dagger.Provides
+import ru.sir.recycler_view_example_api.interactor.LoadData
+import ru.sir.recycler_view_example_api.interfaces.Repository
+
+@Module
+class DomainModule {
+
+    @Provides
+    fun provideLoadData(repository: Repository): LoadData = LoadData(repository)
+}
diff --git a/features/recycler_view_example/src/main/java/ru/sir/recycler_view_example/di/modules/RemoteModule.kt b/features/recycler_view_example/src/main/java/ru/sir/recycler_view_example/di/modules/RemoteModule.kt
@@ -0,0 +1,15 @@
+package ru.sir.recycler_view_example.di.modules
+
+import dagger.Module
+import dagger.Provides
+import ru.sir.recycler_view_example.data.Remote
+import ru.sir.recycler_view_example.remote.RemoteImpl
+import javax.inject.Singleton
+
+@Module
+class RemoteModule {
+
+    @Provides
+    @Singleton
+    fun provideRemote(): Remote = RemoteImpl()
+}
diff --git a/features/recycler_view_example/src/main/java/ru/sir/recycler_view_example/remote/RemoteImpl.kt b/features/recycler_view_example/src/main/java/ru/sir/recycler_view_example/remote/RemoteImpl.kt
@@ -0,0 +1,35 @@
+package ru.sir.recycler_view_example.remote
+
+import ru.sir.core.Either
+import ru.sir.core.None
+import ru.sir.recycler_view_example.data.Remote
+import ru.sir.recycler_view_example_api.models.Item
+
+class RemoteImpl : Remote {
+    companion object {
+        private const val RV_TITLE = 1
+        private const val RV_ITEM = 2
+    }
+
+    override fun loadDataFromServer(): Either<None, List<Item>> {
+        val items = mutableListOf(
+            Item("Title 1", RV_TITLE),
+            Item("Label 1", RV_ITEM),
+            Item("Title 2", RV_TITLE),
+            Item("Label 1", RV_ITEM),
+            Item("Label 2", RV_ITEM),
+            Item("Label 3", RV_ITEM),
+            Item("Title 3", RV_TITLE),
+            Item("Label 1", RV_ITEM),
+            Item("Label 2", RV_ITEM),
+            Item("Label 3", RV_ITEM),
+            Item("Label 4", RV_ITEM)
+        )
+
+        for (i in 0 .. Int.MAX_VALUE) {
+            //Имитация работы сервера
+        }
+
+        return Either.Right(items)
+    }
+}
diff --git a/features/recycler_view_example/src/main/java/ru/sir/recycler_view_example/view_models/RecyclerViewExampleViewModel.kt b/features/recycler_view_example/src/main/java/ru/sir/recycler_view_example/view_models/RecyclerViewExampleViewModel.kt
@@ -1,36 +1,50 @@
 package ru.sir.recycler_view_example.view_models
 
 import android.app.Application
+import androidx.databinding.ObservableArrayList
+import androidx.databinding.ObservableBoolean
+import androidx.databinding.ObservableList
+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 ru.sir.recycler_view_example.BR
 import ru.sir.recycler_view_example.R
+import ru.sir.recycler_view_example_api.interactor.LoadData
+import ru.sir.recycler_view_example_api.models.Item
 import javax.inject.Inject
 
-class RecyclerViewExampleViewModel @Inject constructor(application: Application) : BaseViewModel(application) {
-
+class RecyclerViewExampleViewModel @Inject constructor(
+    application: Application,
+    private val loadData: LoadData
+) : BaseViewModel(application) {
     companion object {
         private const val RV_TITLE = 1
         private const val RV_ITEM = 2
     }
 
-    val items = mutableListOf(
-        RecyclerViewBaseDataModel("Title 1", RV_TITLE),
-        RecyclerViewBaseDataModel("Label 1", RV_ITEM),
-        RecyclerViewBaseDataModel("Title 2", RV_TITLE),
-        RecyclerViewBaseDataModel("Label 1", RV_ITEM),
-        RecyclerViewBaseDataModel("Label 2", RV_ITEM),
-        RecyclerViewBaseDataModel("Label 3", RV_ITEM),
-        RecyclerViewBaseDataModel("Title 3", RV_TITLE),
-        RecyclerViewBaseDataModel("Label 1", RV_ITEM),
-        RecyclerViewBaseDataModel("Label 2", RV_ITEM),
-        RecyclerViewBaseDataModel("Label 3", RV_ITEM),
-        RecyclerViewBaseDataModel("Label 4", RV_ITEM)
-    )
+    val isLoading = ObservableBoolean(false)
+    private lateinit var items: ObservableArrayList<RecyclerViewBaseDataModel>
+
+    override fun init() {
+        isLoading.set(true)
+        loadData(None()) { it.either({}, ::onDataLoaded) }
+    }
+
+    private fun onDataLoaded(data: List<Item>) {
+        items.addAll(data.toRecyclerViewItems())
+        isLoading.set(false)
+    }
 
     fun recyclerViewAdapter() = RecyclerViewAdapter.Builder(this, BR.viewModel)
         .addProducer(RV_TITLE, R.layout.item_title, String::class.java, TitleViewModel::class.java)
         .addProducer(RV_ITEM, R.layout.item_example1, String::class.java, ItemViewModel::class.java)
-        .build(items)
+        .build()
+        .getObserver { items = it }
+
+    private fun List<Item>.toRecyclerViewItems(): List<RecyclerViewBaseDataModel> {
+        val newList = mutableListOf<RecyclerViewBaseDataModel>()
+        this.forEach { newList.add(RecyclerViewBaseDataModel(it.name, it.type)) }
+        return newList
+    }
 }
diff --git a/features/recycler_view_example/src/main/res/layout/fragment_recycler_view_example.xml b/features/recycler_view_example/src/main/res/layout/fragment_recycler_view_example.xml
@@ -2,6 +2,7 @@
 <layout xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
+        <import type="android.view.View"/>
         <variable
             name="viewModel"
             type="ru.sir.recycler_view_example.view_models.RecyclerViewExampleViewModel" />
@@ -26,5 +27,15 @@
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             tools:listitem="@layout/item_example1"/>
 
+        <ProgressBar
+            android:id="@+id/loadingPb"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:visibility="@{viewModel.isLoading() ? View.VISIBLE : View.GONE}"/>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/features/recycler_view_example_api/build.gradle b/features/recycler_view_example_api/build.gradle
@@ -11,5 +11,6 @@ java {
 }
 
 dependencies {
+    api project(path: ':entities:core')
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
diff --git a/features/recycler_view_example_api/src/main/java/ru/sir/recycler_view_example_api/MyClass.kt b/features/recycler_view_example_api/src/main/java/ru/sir/recycler_view_example_api/MyClass.kt
diff --git a/features/recycler_view_example_api/src/main/java/ru/sir/recycler_view_example_api/interactor/LoadData.kt b/features/recycler_view_example_api/src/main/java/ru/sir/recycler_view_example_api/interactor/LoadData.kt
@@ -0,0 +1,11 @@
+package ru.sir.recycler_view_example_api.interactor
+
+import ru.sir.core.AsyncUseCase
+import ru.sir.core.Either
+import ru.sir.core.None
+import ru.sir.recycler_view_example_api.interfaces.Repository
+import ru.sir.recycler_view_example_api.models.Item
+
+class LoadData(private val repository: Repository) : AsyncUseCase<List<Item>, None, None>() {
+    override suspend fun run(params: None): Either<None, List<Item>> = repository.loadData()
+}
diff --git a/features/recycler_view_example_api/src/main/java/ru/sir/recycler_view_example_api/interfaces/Repository.kt b/features/recycler_view_example_api/src/main/java/ru/sir/recycler_view_example_api/interfaces/Repository.kt
@@ -0,0 +1,9 @@
+package ru.sir.recycler_view_example_api.interfaces
+
+import ru.sir.core.Either
+import ru.sir.core.None
+import ru.sir.recycler_view_example_api.models.Item
+
+interface Repository {
+    fun loadData(): Either<None, List<Item>>
+}
diff --git a/features/recycler_view_example_api/src/main/java/ru/sir/recycler_view_example_api/models/Item.kt b/features/recycler_view_example_api/src/main/java/ru/sir/recycler_view_example_api/models/Item.kt
@@ -0,0 +1,6 @@
+package ru.sir.recycler_view_example_api.models
+
+data class Item(
+    val name: String,
+    val type: Int
+)
