REVERT(3677ee646a2b6e4da8ee2a62dc323dd36766b939): Improve: Convert setup*() functions to suspend function

- migrate back to LiveData from Flow
This commit is contained in:
machiav3lli 2022-01-25 00:29:39 +01:00
parent 3677ee646a
commit d3283cc6e4
6 changed files with 19 additions and 25 deletions

View File

@ -3,17 +3,14 @@ package com.looker.droidify.ui.fragments
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope
abstract class BaseNavFragment : Fragment() { abstract class BaseNavFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
lifecycleScope.launchWhenCreated { setupAdapters()
setupAdapters() setupLayout()
setupLayout()
}
} }
abstract suspend fun setupAdapters() abstract fun setupAdapters()
abstract suspend fun setupLayout() abstract fun setupLayout()
} }

View File

@ -15,7 +15,6 @@ import com.mikepenz.fastadapter.FastAdapter
import com.mikepenz.fastadapter.paged.PagedModelAdapter import com.mikepenz.fastadapter.paged.PagedModelAdapter
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import io.reactivex.rxjava3.schedulers.Schedulers import io.reactivex.rxjava3.schedulers.Schedulers
import kotlinx.coroutines.flow.collectLatest
// TODO create categories layouts that hold the apps in horizontal layout // TODO create categories layouts that hold the apps in horizontal layout
class ExploreFragment : MainNavFragmentX() { class ExploreFragment : MainNavFragmentX() {
@ -49,7 +48,7 @@ class ExploreFragment : MainNavFragmentX() {
.subscribe { repositories = it } .subscribe { repositories = it }
} }
override suspend fun setupAdapters() { override fun setupAdapters() {
appsItemAdapter = PagedModelAdapter<Product, VAppItem>(PRODUCT_ASYNC_DIFFER_CONFIG) { appsItemAdapter = PagedModelAdapter<Product, VAppItem>(PRODUCT_ASYNC_DIFFER_CONFIG) {
it.data_item?.let { item -> VAppItem(item, repositories[it.repository_id]) } it.data_item?.let { item -> VAppItem(item, repositories[it.repository_id]) }
} }
@ -62,8 +61,8 @@ class ExploreFragment : MainNavFragmentX() {
} }
} }
override suspend fun setupLayout() { override fun setupLayout() {
viewModel.productsList.collectLatest { viewModel.productsList.observe(viewLifecycleOwner) {
appsItemAdapter.submitList(it) appsItemAdapter.submitList(it)
appsFastAdapter?.notifyDataSetChanged() appsFastAdapter?.notifyDataSetChanged()
} }

View File

@ -17,7 +17,6 @@ import com.mikepenz.fastadapter.FastAdapter
import com.mikepenz.fastadapter.paged.PagedModelAdapter import com.mikepenz.fastadapter.paged.PagedModelAdapter
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import io.reactivex.rxjava3.schedulers.Schedulers import io.reactivex.rxjava3.schedulers.Schedulers
import kotlinx.coroutines.flow.collectLatest
class InstalledFragment : MainNavFragmentX() { class InstalledFragment : MainNavFragmentX() {
@ -53,7 +52,7 @@ class InstalledFragment : MainNavFragmentX() {
.subscribe { repositories = it } .subscribe { repositories = it }
} }
override suspend fun setupAdapters() { override fun setupAdapters() {
installedItemAdapter = PagedModelAdapter<Product, VAppItem>(PRODUCT_ASYNC_DIFFER_CONFIG) { installedItemAdapter = PagedModelAdapter<Product, VAppItem>(PRODUCT_ASYNC_DIFFER_CONFIG) {
it.data_item?.let { item -> VAppItem(item, repositories[it.repository_id]) } it.data_item?.let { item -> VAppItem(item, repositories[it.repository_id]) }
} }
@ -75,14 +74,14 @@ class InstalledFragment : MainNavFragmentX() {
} }
} }
override suspend fun setupLayout() { override fun setupLayout() {
binding.buttonUpdated.setOnClickListener { binding.buttonUpdated.setOnClickListener {
binding.updatedRecycler.apply { binding.updatedRecycler.apply {
visibility = if (visibility == View.VISIBLE) View.GONE else View.VISIBLE visibility = if (visibility == View.VISIBLE) View.GONE else View.VISIBLE
} }
} }
viewModel.productsList.collectLatest { viewModel.productsList.observe(viewLifecycleOwner) {
binding.updatedBar.visibility = binding.updatedBar.visibility =
if (it.any { item -> item.data_item?.canUpdate == true }) View.VISIBLE else View.GONE if (it.any { item -> item.data_item?.canUpdate == true }) View.VISIBLE else View.GONE
updatedItemAdapter.submitList(it) updatedItemAdapter.submitList(it)

View File

@ -17,7 +17,6 @@ import com.mikepenz.fastadapter.FastAdapter
import com.mikepenz.fastadapter.paged.PagedModelAdapter import com.mikepenz.fastadapter.paged.PagedModelAdapter
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import io.reactivex.rxjava3.schedulers.Schedulers import io.reactivex.rxjava3.schedulers.Schedulers
import kotlinx.coroutines.flow.collectLatest
class LatestFragment : MainNavFragmentX() { class LatestFragment : MainNavFragmentX() {
@ -54,7 +53,7 @@ class LatestFragment : MainNavFragmentX() {
.subscribe { repositories = it } .subscribe { repositories = it }
} }
override suspend fun setupAdapters() { override fun setupAdapters() {
updatedItemAdapter = PagedModelAdapter<Product, VAppItem>(PRODUCT_ASYNC_DIFFER_CONFIG) { updatedItemAdapter = PagedModelAdapter<Product, VAppItem>(PRODUCT_ASYNC_DIFFER_CONFIG) {
it.data_item?.let { item -> VAppItem(item, repositories[it.repository_id]) } it.data_item?.let { item -> VAppItem(item, repositories[it.repository_id]) }
} }
@ -76,8 +75,8 @@ class LatestFragment : MainNavFragmentX() {
} }
} }
override suspend fun setupLayout() { override fun setupLayout() {
viewModel.productsList.collectLatest { viewModel.productsList.observe(requireActivity()) {
newItemAdapter.submitList(it) newItemAdapter.submitList(it)
updatedItemAdapter.submitList(it) updatedItemAdapter.submitList(it)
} }

View File

@ -40,7 +40,7 @@ class PrefsRepositoriesFragment : BaseNavFragment() {
return binding.root return binding.root
} }
override suspend fun setupAdapters() { override fun setupAdapters() {
syncConnection.bind(requireContext()) syncConnection.bind(requireContext())
reposFastAdapter = FastAdapter.with(reposItemAdapter) reposFastAdapter = FastAdapter.with(reposItemAdapter)
@ -52,7 +52,7 @@ class PrefsRepositoriesFragment : BaseNavFragment() {
} }
} }
override suspend fun setupLayout() { override fun setupLayout() {
viewModel.productsList.observe(requireActivity()) { viewModel.productsList.observe(requireActivity()) {
reposItemAdapter.set( reposItemAdapter.set(
it.mapNotNull { dbRepo -> it.mapNotNull { dbRepo ->

View File

@ -1,8 +1,8 @@
package com.looker.droidify.ui.viewmodels package com.looker.droidify.ui.viewmodels
import androidx.lifecycle.LiveData
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.asFlow
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import androidx.paging.DataSource import androidx.paging.DataSource
import androidx.paging.LivePagedListBuilder import androidx.paging.LivePagedListBuilder
@ -88,8 +88,8 @@ class MainNavFragmentViewModelX(val db: DatabaseX, source: Source) : ViewModel()
.setEnablePlaceholders(false) .setEnablePlaceholders(false)
.build() .build()
} }
val request = request(source) private val request = request(source)
val productsList: Flow<PagedList<Product>> by lazy { val productsList: LiveData<PagedList<Product>> by lazy {
LivePagedListBuilder( LivePagedListBuilder(
db.productDao.queryList( db.productDao.queryList(
installed = request.installed, installed = request.installed,
@ -99,7 +99,7 @@ class MainNavFragmentViewModelX(val db: DatabaseX, source: Source) : ViewModel()
order = request.order, order = request.order,
numberOfItems = request.numberOfItems numberOfItems = request.numberOfItems
), pagedListConfig ), pagedListConfig
).build().asFlow() ).build()
} }
fun fillList(source: Source) { fun fillList(source: Source) {