From b1c9a204c1eaaaa03f8e56395c496e5164a0c01b Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sat, 16 May 2020 22:44:16 -0400
Subject: [PATCH] Minor edits

(cherry picked from commit d4ffb09a8bde73656f460636f56c82b7ae9c280e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
---
 .../eu/kanade/tachiyomi/ui/browse/source/SourceController.kt  | 4 ++--
 .../ui/browse/source/browse/BrowseSourceController.kt         | 3 ++-
 .../ui/browse/source/globalsearch/GlobalSearchController.kt   | 4 ++--
 .../eu/kanade/tachiyomi/ui/recent/history/HistoryPresenter.kt | 2 +-
 4 files changed, 7 insertions(+), 6 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 50deeb012..845b6bd69 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
@@ -32,7 +32,7 @@ import eu.kanade.tachiyomi.ui.browse.source.latest.LatestUpdatesController
 import eu.kanade.tachiyomi.ui.setting.SettingsSourcesController
 import exh.ui.smartsearch.SmartSearchController
 import kotlinx.android.parcel.Parcelize
-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
@@ -236,7 +236,7 @@ class SourceController(bundle: Bundle? = null) :
 
         // Create query listener which opens the global search view.
         searchView.queryTextEvents()
-            .filter { it is QueryTextEvent.QuerySubmitted }
+            .filterIsInstance<QueryTextEvent.QuerySubmitted>()
             .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 9d78b1232..7f69c989f 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
@@ -54,6 +54,7 @@ import eu.kanade.tachiyomi.widget.EmptyView
 import exh.EXHSavedSearch
 import kotlinx.android.parcel.Parcelize
 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
@@ -384,7 +385,7 @@ open class BrowseSourceController(bundle: Bundle) :
 
         searchView.queryTextEvents()
             .filter { router.backstack.lastOrNull()?.controller() == this@BrowseSourceController }
-            .filter { it is QueryTextEvent.QuerySubmitted }
+            .filterIsInstance<QueryTextEvent.QuerySubmitted>()
             .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 1bd32da37..a116604f1 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
@@ -19,7 +19,7 @@ import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController
 import eu.kanade.tachiyomi.ui.manga.MangaAllInOneController
 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
@@ -129,7 +129,7 @@ open class GlobalSearchController(
         })
 
         searchView.queryTextEvents()
-            .filter { it is QueryTextEvent.QuerySubmitted }
+            .filterIsInstance<QueryTextEvent.QuerySubmitted>()
             .onEach {
                 presenter.search(it.queryText.toString())
                 searchItem.collapseActionView()
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryPresenter.kt
index 68e68c610..f2a0bcd68 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryPresenter.kt
@@ -167,7 +167,7 @@ class HistoryPresenter : BasePresenter<HistoryController>() {
             }
             Manga.SORTING_UPLOAD_DATE -> {
                 chapters.drop(currChapterIndex + 1)
-                        .firstOrNull { it.date_upload >= chapter.date_upload}
+                    .firstOrNull { it.date_upload >= chapter.date_upload }
             }
             else -> throw NotImplementedError("Unknown sorting method")
         }