Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
(cherry picked from commit 6b2b21edfa63f01b956ec27386b0c729be2e6d18)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
This commit is contained in:
Andreas 2022-09-04 17:15:13 +02:00 committed by Jobobby04
parent 25ad9c7fab
commit 138fc03d1b
4 changed files with 44 additions and 28 deletions
Show Stats 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

@ -110,7 +110,7 @@ fun BrowseSourceScreen(
}, },
floatingActionButton = { floatingActionButton = {
BrowseSourceFloatingActionButton( BrowseSourceFloatingActionButton(
isVisible = presenter.filters.isNotEmpty(), isVisible = presenter.filters.isNotEmpty() && presenter.currentFilter is BrowseSourcePresenter.Filter.UserInput,
onFabClick = onFabClick, onFabClick = onFabClick,
) )
}, },
@ -145,7 +145,7 @@ fun BrowseSourceScreen(
modifier = Modifier.horizontalScroll(rememberScrollState()), modifier = Modifier.horizontalScroll(rememberScrollState()),
) { ) {
FilterChip( FilterChip(
selected = presenter.currentQuery == GetRemoteManga.QUERY_POPULAR, selected = presenter.currentFilter == BrowseSourcePresenter.Filter.Popular,
onClick = { onClick = {
presenter.resetFilter() presenter.resetFilter()
presenter.search(GetRemoteManga.QUERY_POPULAR) presenter.search(GetRemoteManga.QUERY_POPULAR)
@ -164,7 +164,7 @@ fun BrowseSourceScreen(
) )
if (presenter.source?.supportsLatest == true) { if (presenter.source?.supportsLatest == true) {
FilterChip( FilterChip(
selected = presenter.currentQuery == GetRemoteManga.QUERY_LATEST, selected = presenter.currentFilter == BrowseSourcePresenter.Filter.Latest,
onClick = { onClick = {
presenter.resetFilter() presenter.resetFilter()
presenter.search(GetRemoteManga.QUERY_LATEST) presenter.search(GetRemoteManga.QUERY_LATEST)
@ -184,7 +184,7 @@ fun BrowseSourceScreen(
} }
/* SY --> if (presenter.filters.isNotEmpty())*/ run /* SY <-- */ { /* SY --> if (presenter.filters.isNotEmpty())*/ run /* SY <-- */ {
FilterChip( FilterChip(
selected = presenter.currentQuery != GetRemoteManga.QUERY_POPULAR && presenter.currentQuery != GetRemoteManga.QUERY_LATEST, selected = presenter.currentFilter is BrowseSourcePresenter.Filter.UserInput,
onClick = onFabClick, onClick = onFabClick,
leadingIcon = { leadingIcon = {
Icon( Icon(

22
app/src/main/java/eu/kanade/presentation/browse/BrowseSourceState.kt
View File

@ -6,42 +6,36 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import eu.davidea.flexibleadapter.items.IFlexible import eu.davidea.flexibleadapter.items.IFlexible
import eu.kanade.domain.source.interactor.GetRemoteManga
import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.CatalogueSource
import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.FilterList
import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourcePresenter import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourcePresenter
import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourcePresenter.Filter
import eu.kanade.tachiyomi.ui.browse.source.browse.toItems import eu.kanade.tachiyomi.ui.browse.source.browse.toItems
@Stable @Stable
interface BrowseSourceState { interface BrowseSourceState {
val source: CatalogueSource? val source: CatalogueSource?
var searchQuery: String? var searchQuery: String?
val currentQuery: String val currentFilter: Filter
val isUserQuery: Boolean val isUserQuery: Boolean
val filters: FilterList val filters: FilterList
val filterItems: List<IFlexible<*>> val filterItems: List<IFlexible<*>>
val currentFilters: FilterList
var dialog: BrowseSourcePresenter.Dialog? var dialog: BrowseSourcePresenter.Dialog?
} }
fun BrowseSourceState(initialQuery: String?): BrowseSourceState { fun BrowseSourceState(initialQuery: String?): BrowseSourceState {
if (initialQuery == GetRemoteManga.QUERY_POPULAR || initialQuery == GetRemoteManga.QUERY_LATEST) { return when (val filter = Filter.valueOf(initialQuery ?: "")) {
return BrowseSourceStateImpl(initialCurrentQuery = initialQuery) Filter.Latest, Filter.Popular -> BrowseSourceStateImpl(initialCurrentFilter = filter)
is Filter.UserInput -> BrowseSourceStateImpl(initialQuery = initialQuery, initialCurrentFilter = filter)
} }
return BrowseSourceStateImpl(initialQuery = initialQuery)
} }
class BrowseSourceStateImpl(initialQuery: String? = null, initialCurrentQuery: String? = initialQuery) : BrowseSourceState { class BrowseSourceStateImpl(initialQuery: String? = null, initialCurrentFilter: Filter) : BrowseSourceState {
override var source: CatalogueSource? by mutableStateOf(null) override var source: CatalogueSource? by mutableStateOf(null)
override var searchQuery: String? by mutableStateOf(initialQuery) override var searchQuery: String? by mutableStateOf(initialQuery)
override var currentQuery: String by mutableStateOf(initialCurrentQuery ?: "") override var currentFilter: Filter by mutableStateOf(initialCurrentFilter)
override val isUserQuery: Boolean by derivedStateOf { override val isUserQuery: Boolean by derivedStateOf { currentFilter is Filter.UserInput && currentFilter.query.isNotEmpty() }
currentQuery.isNotEmpty() &&
currentQuery != GetRemoteManga.QUERY_POPULAR &&
currentQuery != GetRemoteManga.QUERY_LATEST
}
override var filters: FilterList by mutableStateOf(FilterList()) override var filters: FilterList by mutableStateOf(FilterList())
override val filterItems: List<IFlexible<*>> by derivedStateOf { filters.toItems() } override val filterItems: List<IFlexible<*>> by derivedStateOf { filters.toItems() }
override var currentFilters by mutableStateOf(FilterList())
override var dialog: BrowseSourcePresenter.Dialog? by mutableStateOf(null) override var dialog: BrowseSourcePresenter.Dialog? by mutableStateOf(null)
} }

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

@ -49,7 +49,7 @@ fun BrowseSourceToolbar(
) { ) {
if (state.searchQuery == null) { if (state.searchQuery == null) {
BrowseSourceRegularToolbar( BrowseSourceRegularToolbar(
title = if (state.isUserQuery) state.currentQuery else source.name, title = if (state.isUserQuery) state.currentFilter.query else source.name,
isLocalSource = source is LocalSource, isLocalSource = source is LocalSource,
// SY --> // SY -->
isConfigurableSource = source.anyIs<ConfigurableSource>(), isConfigurableSource = source.anyIs<ConfigurableSource>(),
@ -57,7 +57,7 @@ fun BrowseSourceToolbar(
displayMode = displayMode, displayMode = displayMode,
onDisplayModeChange = onDisplayModeChange, onDisplayModeChange = onDisplayModeChange,
navigateUp = navigateUp, navigateUp = navigateUp,
onSearchClick = { state.searchQuery = if (state.isUserQuery) state.currentQuery else "" }, onSearchClick = { state.searchQuery = if (state.isUserQuery) state.currentFilter.query else "" },
onWebViewClick = onWebViewClick, onWebViewClick = onWebViewClick,
onHelpClick = onHelpClick, onHelpClick = onHelpClick,
// SY --> // SY -->

38
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
View File

@ -156,11 +156,11 @@ open class BrowseSourcePresenter(
@Composable @Composable
fun getMangaList(): Flow<PagingData</* SY --> */Pair<DomainManga, RaisedSearchMetadata?>/* SY <-- */>> { fun getMangaList(): Flow<PagingData</* SY --> */Pair<DomainManga, RaisedSearchMetadata?>/* SY <-- */>> {
return remember(currentQuery, currentFilters) { return remember(currentFilter) {
Pager( Pager(
PagingConfig(pageSize = 25), PagingConfig(pageSize = 25),
) { ) {
createSourcePagingSource(currentQuery, currentFilters) createSourcePagingSource(currentFilter.query, currentFilter.filters)
}.flow }.flow
.map { .map {
it.map { it.map {
@ -208,13 +208,16 @@ open class BrowseSourcePresenter(
} }
fun resetFilter() { fun resetFilter() {
val newFilters = source!!.getFilterList() if (currentFilter !is Filter.UserInput) return
state.filters = newFilters state.currentFilter = (currentFilter as Filter.UserInput).copy(filters = source!!.getFilterList())
state.currentFilters = state.filters
} }
fun search(query: String? = null) { fun search(query: String? = null) {
state.currentQuery = query ?: searchQuery ?: "" var new = Filter.valueOf(query ?: searchQuery ?: "")
if (new is Filter.UserInput && currentFilter is Filter.UserInput) {
new = new.copy(filters = currentFilter.filters)
}
state.currentFilter = new
} }
// SY --> // SY -->
@ -393,12 +396,15 @@ open class BrowseSourcePresenter(
* @param filters a list of active filters. * @param filters a list of active filters.
*/ */
fun setSourceFilter(filters: FilterList) { fun setSourceFilter(filters: FilterList) {
state.currentFilters = filters state.currentFilter = when (val filter = currentFilter) {
Filter.Latest, Filter.Popular -> Filter.UserInput(filters = filters)
is Filter.UserInput -> filter.copy(filters = filters)
}
} }
// SY --> // SY -->
open fun createSourcePagingSource(query: String, filters: FilterList): SourcePagingSourceType { open fun createSourcePagingSource(query: String, filters: FilterList): SourcePagingSourceType {
return getRemoteManga.subscribe(sourceId, currentQuery, currentFilters) return getRemoteManga.subscribe(sourceId, currentFilter.query, currentFilter.filters)
} }
// SY <-- // SY <--
@ -431,6 +437,22 @@ open class BrowseSourcePresenter(
} }
} }
sealed class Filter(open val query: String, open val filters: FilterList) {
object Popular : Filter(query = GetRemoteManga.QUERY_POPULAR, filters = FilterList())
object Latest : Filter(query = GetRemoteManga.QUERY_LATEST, filters = FilterList())
data class UserInput(override val query: String = "", override val filters: FilterList = FilterList()) : Filter(query = query, filters = filters)
companion object {
fun valueOf(query: String): Filter {
return when (query) {
GetRemoteManga.QUERY_POPULAR -> Popular
GetRemoteManga.QUERY_LATEST -> Latest
else -> UserInput(query = query)
}
}
}
}
sealed class Dialog { sealed class Dialog {
data class RemoveManga(val manga: DomainManga) : Dialog() data class RemoveManga(val manga: DomainManga) : Dialog()
data class AddDuplicateManga(val manga: DomainManga, val duplicate: DomainManga) : Dialog() data class AddDuplicateManga(val manga: DomainManga, val duplicate: DomainManga) : Dialog()