From b8751f6d15672363b162a492bec4ed9b43a230b1 Mon Sep 17 00:00:00 2001 From: Clarence Castillo Date: Sat, 2 Jan 2021 05:46:44 +0800 Subject: [PATCH] Direct user back to global search when coming from source search results (#4196) (cherry picked from commit 71ece73d99ffc070741a6e121d2043954fbeab6e) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt --- .../ui/browse/source/browse/BrowseSourceController.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 9e5ad4e29..8f12d084e 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 @@ -43,6 +43,7 @@ import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.browse.extension.details.SourcePreferencesController import eu.kanade.tachiyomi.ui.browse.source.SourceController import eu.kanade.tachiyomi.ui.browse.source.browse.SourceFilterSheet.FilterNavigationView.Companion.MAX_SAVED_SEARCHES +import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController import eu.kanade.tachiyomi.ui.library.ChangeMangaCategoriesDialog import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.ui.manga.MangaController @@ -421,7 +422,12 @@ open class BrowseSourceController(bundle: Bundle) : searchItem.fixExpand( onExpand = { invalidateMenuOnExpand() }, onCollapse = { - searchWithQuery("") + if (router.backstackSize >= 2 && router.backstack[router.backstackSize - 2].controller() is GlobalSearchController) { + router.popController(this) + } else { + searchWithQuery("") + } + true } )