From 2b96709799c14372e11f6de50167fac642a7dbc4 Mon Sep 17 00:00:00 2001 From: Andreas Date: Tue, 26 Jul 2022 15:05:08 +0200 Subject: [PATCH] Make Selection toolbar take precedence over search toolbar (#7611) --- .../presentation/library/components/LibraryToolbar.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt index 90ae523e7b..f959c28dc8 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt @@ -47,17 +47,17 @@ fun LibraryToolbar( onClickFilter: () -> Unit, onClickRefresh: () -> Unit, ) = when { - state.searchQuery != null -> LibrarySearchToolbar( - searchQuery = state.searchQuery!!, - onChangeSearchQuery = { state.searchQuery = it }, - onClickCloseSearch = { state.searchQuery = null }, - ) state.selectionMode -> LibrarySelectionToolbar( state = state, onClickUnselectAll = onClickUnselectAll, onClickSelectAll = onClickSelectAll, onClickInvertSelection = onClickInvertSelection, ) + state.searchQuery != null -> LibrarySearchToolbar( + searchQuery = state.searchQuery!!, + onChangeSearchQuery = { state.searchQuery = it }, + onClickCloseSearch = { state.searchQuery = null }, + ) else -> LibraryRegularToolbar( title = title, hasFilters = state.hasActiveFilters,