Complete RxBindings to FlowBinding migration

This commit is contained in:
arkon
2020-04-20 18:09:03 -04:00
parent c9a727594e
commit 3d10dad780
4 changed files with 9 additions and 20 deletions

View File

@@ -19,7 +19,6 @@ import com.bluelinelabs.conductor.ControllerChangeHandler
import com.bluelinelabs.conductor.ControllerChangeType
import com.f2prateek.rx.preferences.Preference
import com.google.android.material.tabs.TabLayout
import com.jakewharton.rxbinding.support.v4.view.pageSelections
import com.jakewharton.rxrelay.BehaviorRelay
import com.jakewharton.rxrelay.PublishRelay
import eu.kanade.tachiyomi.R
@@ -43,6 +42,7 @@ import kotlinx.android.synthetic.main.main_activity.tabs
import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.onEach
import reactivecircus.flowbinding.appcompat.queryTextChanges
import reactivecircus.flowbinding.viewpager.pageSelections
import rx.Subscription
import timber.log.Timber
import uy.kohesive.injekt.Injekt
@@ -149,10 +149,12 @@ class LibraryController(
adapter = LibraryAdapter(this)
binding.libraryPager.adapter = adapter
binding.libraryPager.pageSelections().skip(1).subscribeUntilDestroy {
preferences.lastUsedCategory().set(it)
activeCategory = it
}
binding.libraryPager.pageSelections()
.onEach {
preferences.lastUsedCategory().set(it)
activeCategory = it
}
.launchInUI()
getColumnsPreferenceForCurrentOrientation().asObservable()
.doOnNext { mangaPerRow = it }

View File

@@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.ui.reader.viewer
import com.tfcporciuncula.flow.Preference
import eu.kanade.tachiyomi.util.lang.launchInUI
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.drop
import kotlinx.coroutines.flow.onEach
abstract class ViewerConfig {
@@ -16,7 +15,6 @@ abstract class ViewerConfig {
) {
asFlow()
.onEach { valueAssignment(it) }
.drop(1)
.distinctUntilChanged()
.onEach { onChanged(it) }
.launchInUI()