yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix Filter not being applied in Browse Source (#7945)

Browse Source
This commit is contained in:
Andreas
2022-09-04 17:15:13 +02:00
committed by GitHub
parent 99270e370e
commit 6b2b21edfa
4 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,7 +100,7 @@ fun BrowseSourceScreen(
},
floatingActionButton = {
BrowseSourceFloatingActionButton(
isVisible = presenter.filters.isNotEmpty(),
isVisible = presenter.filters.isNotEmpty() && presenter.currentFilter is BrowseSourcePresenter.Filter.UserInput,
onFabClick = onFabClick,
)
},
@@ -126,7 +126,7 @@ fun BrowseSourceScreen(
horizontalArrangement = Arrangement.spacedBy(8.dp),
) {
FilterChip(
selected = presenter.currentQuery == GetRemoteManga.QUERY_POPULAR,
selected = presenter.currentFilter == BrowseSourcePresenter.Filter.Popular,
onClick = {
presenter.resetFilter()
presenter.search(GetRemoteManga.QUERY_POPULAR)
@@ -145,7 +145,7 @@ fun BrowseSourceScreen(
)
if (presenter.source?.supportsLatest == true) {
FilterChip(
selected = presenter.currentQuery == GetRemoteManga.QUERY_LATEST,
selected = presenter.currentFilter == BrowseSourcePresenter.Filter.Latest,
onClick = {
presenter.resetFilter()
presenter.search(GetRemoteManga.QUERY_LATEST)
@@ -165,7 +165,7 @@ fun BrowseSourceScreen(
}
if (presenter.filters.isNotEmpty()) {
FilterChip(
selected = presenter.currentQuery != GetRemoteManga.QUERY_POPULAR && presenter.currentQuery != GetRemoteManga.QUERY_LATEST,
selected = presenter.currentFilter is BrowseSourcePresenter.Filter.UserInput,
onClick = onFabClick,
leadingIcon = {
Icon(