Mostly migrate rxbinding to Kotlin Flow version

This commit is contained in:
arkon
2020-04-16 23:04:00 -04:00
parent fae763dbb0
commit bdf322ceb0
12 changed files with 238 additions and 134 deletions
@@ -12,8 +12,6 @@ import com.bluelinelabs.conductor.ControllerChangeHandler
import com.bluelinelabs.conductor.ControllerChangeType
import com.bluelinelabs.conductor.RouterTransaction
import com.bluelinelabs.conductor.changehandler.FadeChangeHandler
import com.jakewharton.rxbinding.support.v4.widget.refreshes
import com.jakewharton.rxbinding.support.v7.widget.queryTextChanges
import eu.davidea.flexibleadapter.FlexibleAdapter
import eu.davidea.flexibleadapter.items.IFlexible
import eu.kanade.tachiyomi.R
@@ -24,6 +22,13 @@ import eu.kanade.tachiyomi.extension.ExtensionUpdateJob
import eu.kanade.tachiyomi.extension.model.Extension
import eu.kanade.tachiyomi.ui.base.controller.NucleusController
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import reactivecircus.flowbinding.appcompat.queryTextChanges
import reactivecircus.flowbinding.swiperefreshlayout.refreshes
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
@@ -47,6 +52,8 @@ open class ExtensionController : NucleusController<ExtensionPresenter>(),
private var query = ""
private val uiScope = CoroutineScope(Dispatchers.Main)
private lateinit var binding: ExtensionControllerBinding
init {
@@ -70,9 +77,9 @@ open class ExtensionController : NucleusController<ExtensionPresenter>(),
super.onViewCreated(view)
binding.extSwipeRefresh.isRefreshing = true
binding.extSwipeRefresh.refreshes().subscribeUntilDestroy {
presenter.findAvailableExtensions()
}
binding.extSwipeRefresh.refreshes()
.onEach { presenter.findAvailableExtensions() }
.launchIn(uiScope)
// Initialize adapter, scroll listener and recycler views
adapter = ExtensionAdapter(this)
@@ -146,11 +153,12 @@ open class ExtensionController : NucleusController<ExtensionPresenter>(),
}
searchView.queryTextChanges()
.filter { router.backstack.lastOrNull()?.controller() == this }
.subscribeUntilDestroy {
query = it.toString()
drawExtensions()
}
.filter { router.backstack.lastOrNull()?.controller() == this }
.onEach {
query = it.toString()
drawExtensions()
}
.launchIn(uiScope)
// Fixes problem with the overflow icon showing up in lieu of search
searchItem.fixExpand(onExpand = { invalidateMenuOnExpand() })
@@ -22,7 +22,6 @@ import androidx.preference.PreferenceScreen
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.DividerItemDecoration.VERTICAL
import androidx.recyclerview.widget.LinearLayoutManager
import com.jakewharton.rxbinding.view.clicks
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.preference.EmptyPreferenceDataStore
import eu.kanade.tachiyomi.data.preference.SharedPreferencesDataStore
@@ -33,6 +32,11 @@ import eu.kanade.tachiyomi.ui.base.controller.NucleusController
import eu.kanade.tachiyomi.util.preference.preferenceCategory
import eu.kanade.tachiyomi.util.system.LocaleHelper
import eu.kanade.tachiyomi.util.view.visible
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import reactivecircus.flowbinding.android.view.clicks
@SuppressLint("RestrictedApi")
class ExtensionDetailsController(bundle: Bundle? = null) :
@@ -44,6 +48,8 @@ class ExtensionDetailsController(bundle: Bundle? = null) :
private var preferenceScreen: PreferenceScreen? = null
private val uiScope = CoroutineScope(Dispatchers.Main)
private lateinit var binding: ExtensionDetailControllerBinding
constructor(pkgName: String) : this(Bundle().apply {
@@ -76,9 +82,9 @@ class ExtensionDetailsController(bundle: Bundle? = null) :
binding.extensionLang.text = context.getString(R.string.ext_language_info, LocaleHelper.getDisplayName(extension.lang, context))
binding.extensionPkg.text = extension.pkgName
extension.getApplicationIcon(context)?.let { binding.extensionIcon.setImageDrawable(it) }
binding.extensionUninstallButton.clicks().subscribeUntilDestroy {
presenter.uninstallExtension()
}
binding.extensionUninstallButton.clicks()
.onEach { presenter.uninstallExtension() }
.launchIn(uiScope)
if (extension.isObsolete) {
binding.extensionObsolete.visible()