From d4ffb09a8bde73656f460636f56c82b7ae9c280e Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 16 May 2020 22:44:16 -0400 Subject: [PATCH] Minor edits --- .../eu/kanade/tachiyomi/ui/browse/source/SourceController.kt | 4 ++-- .../ui/browse/source/browse/BrowseSourceController.kt | 3 ++- .../ui/browse/source/globalsearch/GlobalSearchController.kt | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt index 2c604992c7..95556100b4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt @@ -28,7 +28,7 @@ import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController import eu.kanade.tachiyomi.ui.browse.source.latest.LatestUpdatesController import eu.kanade.tachiyomi.ui.setting.SettingsSourcesController -import kotlinx.coroutines.flow.filter +import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import reactivecircus.flowbinding.appcompat.QueryTextEvent @@ -208,7 +208,7 @@ class SourceController : // Create query listener which opens the global search view. searchView.queryTextEvents() - .filter { it is QueryTextEvent.QuerySubmitted } + .filterIsInstance() .onEach { performGlobalSearch(it.queryText.toString()) } .launchIn(scope) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt index 001471920d..9211f957b9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt @@ -45,6 +45,7 @@ import eu.kanade.tachiyomi.util.view.visible import eu.kanade.tachiyomi.widget.AutofitRecyclerView import eu.kanade.tachiyomi.widget.EmptyView import kotlinx.coroutines.flow.filter +import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import reactivecircus.flowbinding.appcompat.QueryTextEvent @@ -251,7 +252,7 @@ open class BrowseSourceController(bundle: Bundle) : searchView.queryTextEvents() .filter { router.backstack.lastOrNull()?.controller() == this@BrowseSourceController } - .filter { it is QueryTextEvent.QuerySubmitted } + .filterIsInstance() .onEach { searchWithQuery(it.queryText.toString()) } .launchIn(scope) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt index be1da5ecdd..68656da18c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt @@ -16,7 +16,7 @@ import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.ui.base.controller.NucleusController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.manga.MangaController -import kotlinx.coroutines.flow.filter +import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import reactivecircus.flowbinding.appcompat.QueryTextEvent @@ -115,7 +115,7 @@ open class GlobalSearchController( }) searchView.queryTextEvents() - .filter { it is QueryTextEvent.QuerySubmitted } + .filterIsInstance() .onEach { presenter.search(it.queryText.toString()) searchItem.collapseActionView()