copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

feat(navigation): Allow clearing search when Back on Extensions Screen (#1506)

Browse source
This commit is contained in:
Cuong-Tran 2025-10-10 12:00:00 +07:00
parent a09e55270c
commit 78f9cf65c0
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionsTab.kt
View file

@ -1,5 +1,6 @@
package eu.kanade.tachiyomi.ui.browse.extension
import androidx.activity.compose.BackHandler
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined._18UpRating
import androidx.compose.material3.AlertDialog
@ -66,6 +67,9 @@ fun extensionsTab(
),
),
content = { contentPadding, _ ->
BackHandler(enabled = state.searchQuery != null) {
extensionsScreenModel.search(null)
}
ExtensionScreen(
state = state,
contentPadding = contentPadding,

13
app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedTab.kt
View file

@ -58,13 +58,6 @@ fun Screen.feedTab(
val haptic = LocalHapticFeedback.current
BackHandler(enabled = bulkFavoriteState.selectionMode || showingFeedOrderScreen.value) {
when {
bulkFavoriteState.selectionMode -> bulkFavoriteScreenModel.backHandler()
showingFeedOrderScreen.value -> showingFeedOrderScreen.value = false
}
}
LaunchedEffect(bulkFavoriteState.selectionMode) {
HomeScreen.showBottomNav(!bulkFavoriteState.selectionMode)
}
@ -122,6 +115,12 @@ fun Screen.feedTab(
},
content = { contentPadding, snackbarHostState ->
// KMK -->
BackHandler(enabled = bulkFavoriteState.selectionMode || showingFeedOrderScreen.value) {
when {
bulkFavoriteState.selectionMode -> bulkFavoriteScreenModel.backHandler()
showingFeedOrderScreen.value -> showingFeedOrderScreen.value = false
}
}
Crossfade(
targetState = showingFeedOrderScreen.value,
label = "feed_order_crossfade",