Browse Source

Make Selection toolbar take precedence over search toolbar (#7611)

Andreas 2 years ago
parent
commit
2b96709799

+ 5 - 5
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,