From 88aa796f2f71c889e8f1fc3f7414271c3a9d4787 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 25 Feb 2023 15:16:48 -0500 Subject: [PATCH] Close source filter dialog when filtering (cherry picked from commit 487622c592bf8bb859e3e1afacbd29243733c4b9) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterDialog.kt --- .../tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt | 1 - .../tachiyomi/ui/browse/source/browse/SourceFilterDialog.kt | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt index 81c52bd03..c0bc17e43 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt @@ -277,7 +277,6 @@ data class BrowseSourceScreen( }, onFilter = { screenModel.search(filters = state.filters) - onDismissRequest() }, onUpdate = { screenModel.setFilters(it) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterDialog.kt index e89399f8f..49f4466ee 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterDialog.kt @@ -86,7 +86,10 @@ fun SourceFilterDialog( ) } // SY <-- - Button(onClick = onFilter) { + Button(onClick = { + onFilter() + onDismissRequest() + },) { Text(stringResource(R.string.action_filter)) } }