From bc1dc90963009aada24a5cf25fc148d70cf561b8 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 6 May 2023 12:27:44 -0400 Subject: [PATCH] Fix filter FAB not working in migrate screen I feel like this needs to be aligned with the browse screen/deduped somehow, but that can happen separately. Fixes #9444 (cherry picked from commit 1b25290d399037fe2d9744a899f86ca128699f8e) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt --- .../migration/search/SourceSearchScreen.kt | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt index 8f98f2a8a..18c39a22c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt @@ -19,6 +19,7 @@ import eu.kanade.presentation.util.Screen import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.ui.browse.migration.advanced.process.MigrationListScreen import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceScreenModel +import eu.kanade.tachiyomi.ui.browse.source.browse.SourceFilterDialog import eu.kanade.tachiyomi.ui.manga.MangaScreen import eu.kanade.tachiyomi.ui.webview.WebViewScreen import tachiyomi.core.Constants @@ -98,5 +99,28 @@ data class SourceSearchScreen( onMangaLongClick = { navigator.push(MangaScreen(it.id, true)) }, ) } + + val onDismissRequest = { screenModel.setDialog(null) } + when (val dialog = state.dialog) { + is BrowseSourceScreenModel.Dialog.Filter -> { + SourceFilterDialog( + onDismissRequest = onDismissRequest, + filters = state.filters, + onReset = screenModel::resetFilters, + onFilter = { screenModel.search(filters = state.filters) }, + onUpdate = screenModel::setFilters, + // SY --> + startExpanded = screenModel.startExpanded, + onSave = {}, + savedSearches = emptyList(), + onSavedSearch = {}, + onSavedSearchPress = {}, + openMangaDexRandom = null, + openMangaDexFollows = null, + // SY <-- + ) + } + else -> {} + } } }