mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-11-12 03:58:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix filter search not triggering when clicking genre from Manga details (#8156)

Browse Source
This commit is contained in:
Andreas
2022-10-08 15:48:19 +02:00
committed by GitHub
parent 7be6863910
commit dcd5541e96
5 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
View File

@@ -92,7 +92,7 @@ fun BrowseSourceScreen(
navigateUp = navigateUp,
onWebViewClick = onWebViewClick,
onHelpClick = onHelpClick,
onSearch = { presenter.search() },
onSearch = { presenter.search(it) },
)
Row(
@@ -104,7 +104,7 @@ fun BrowseSourceScreen(
FilterChip(
selected = presenter.currentFilter == BrowseSourcePresenter.Filter.Popular,
onClick = {
presenter.resetFilter()
presenter.reset()
presenter.search(GetRemoteManga.QUERY_POPULAR)
},
leadingIcon = {
@@ -123,7 +123,7 @@ fun BrowseSourceScreen(
FilterChip(
selected = presenter.currentFilter == BrowseSourcePresenter.Filter.Latest,
onClick = {
presenter.resetFilter()
presenter.reset()
presenter.search(GetRemoteManga.QUERY_LATEST)
},
leadingIcon = {

2
app/src/main/java/eu/kanade/presentation/browse/SourceSearchScreen.kt
View File

@@ -44,7 +44,7 @@ fun SourceSearchScreen(
placeholderText = stringResource(R.string.action_search_hint),
navigateUp = navigateUp,
onResetClick = { presenter.searchQuery = "" },
onSearchClick = { presenter.search() },
onSearchClick = { presenter.search(it) },
scrollBehavior = scrollBehavior,
)
},

14
app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
View File

@@ -40,7 +40,7 @@ fun BrowseSourceToolbar(
navigateUp: () -> Unit,
onWebViewClick: () -> Unit,
onHelpClick: () -> Unit,
onSearch: () -> Unit,
onSearch: (String) -> Unit,
scrollBehavior: TopAppBarScrollBehavior? = null,
) {
if (state.searchQuery == null) {
@@ -56,13 +56,17 @@ fun BrowseSourceToolbar(
scrollBehavior = scrollBehavior,
)
} else {
val cancelSearch = { state.searchQuery = null }
BrowseSourceSearchToolbar(
searchQuery = state.searchQuery!!,
onSearchQueryChanged = { state.searchQuery = it },
placeholderText = stringResource(R.string.action_search_hint),
navigateUp = { state.searchQuery = null },
navigateUp = cancelSearch,
onResetClick = { state.searchQuery = "" },
onSearchClick = onSearch,
onSearchClick = {
onSearch(it)
cancelSearch()
},
scrollBehavior = scrollBehavior,
)
}
@@ -165,7 +169,7 @@ fun BrowseSourceSearchToolbar(
placeholderText: String?,
navigateUp: () -> Unit,
onResetClick: () -> Unit,
onSearchClick: () -> Unit,
onSearchClick: (String) -> Unit,
scrollBehavior: TopAppBarScrollBehavior?,
) {
val keyboardController = LocalSoftwareKeyboardController.current
@@ -178,7 +182,7 @@ fun BrowseSourceSearchToolbar(
keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
keyboardActions = KeyboardActions(
onSearch = {
onSearchClick()
onSearchClick(searchQuery)
focusManager.clearFocus()
keyboardController?.hide()
},