Fixes MangaThemesia Filters (#13160)
* Changes SelectFilter from val to fun
This commit is contained in:
parent
a3c19fbc23
commit
9caf625776
|
@ -94,13 +94,13 @@ abstract class MangaThemesia(
|
||||||
url.addQueryParameter("yearx", filter.state)
|
url.addQueryParameter("yearx", filter.state)
|
||||||
}
|
}
|
||||||
is StatusFilter -> {
|
is StatusFilter -> {
|
||||||
url.addQueryParameter("status", filter.selectedValue)
|
url.addQueryParameter("status", filter.selectedValue())
|
||||||
}
|
}
|
||||||
is TypeFilter -> {
|
is TypeFilter -> {
|
||||||
url.addQueryParameter("type", filter.selectedValue)
|
url.addQueryParameter("type", filter.selectedValue())
|
||||||
}
|
}
|
||||||
is OrderByFilter -> {
|
is OrderByFilter -> {
|
||||||
url.addQueryParameter("order", filter.selectedValue)
|
url.addQueryParameter("order", filter.selectedValue())
|
||||||
}
|
}
|
||||||
is GenreListFilter -> {
|
is GenreListFilter -> {
|
||||||
filter.state
|
filter.state
|
||||||
|
@ -112,7 +112,7 @@ abstract class MangaThemesia(
|
||||||
}
|
}
|
||||||
// if site has project page, default value "hasProjectPage" = false
|
// if site has project page, default value "hasProjectPage" = false
|
||||||
is ProjectFilter -> {
|
is ProjectFilter -> {
|
||||||
if (filter.selectedValue == "project-filter-on") {
|
if (filter.selectedValue() == "project-filter-on") {
|
||||||
url.setPathSegment(0, projectPageString.substring(1))
|
url.setPathSegment(0, projectPageString.substring(1))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -310,14 +310,14 @@ abstract class MangaThemesia(
|
||||||
|
|
||||||
open class SelectFilter(
|
open class SelectFilter(
|
||||||
displayName: String,
|
displayName: String,
|
||||||
vals: Array<Pair<String, String>>,
|
val vals: Array<Pair<String, String>>,
|
||||||
defaultValue: String? = null
|
defaultValue: String? = null
|
||||||
) : Filter.Select<String>(
|
) : Filter.Select<String>(
|
||||||
displayName,
|
displayName,
|
||||||
vals.map { it.first }.toTypedArray(),
|
vals.map { it.first }.toTypedArray(),
|
||||||
vals.indexOfFirst { it.second == defaultValue }.takeIf { it != -1 } ?: 0
|
vals.indexOfFirst { it.second == defaultValue }.takeIf { it != -1 } ?: 0
|
||||||
) {
|
) {
|
||||||
val selectedValue = vals[state].second
|
fun selectedValue() = vals[state].second
|
||||||
}
|
}
|
||||||
|
|
||||||
protected class StatusFilter : SelectFilter(
|
protected class StatusFilter : SelectFilter(
|
||||||
|
|
|
@ -10,7 +10,7 @@ class MangaThemesiaGenerator : ThemeSourceGenerator {
|
||||||
|
|
||||||
override val themeClass = "MangaThemesia"
|
override val themeClass = "MangaThemesia"
|
||||||
|
|
||||||
override val baseVersionCode: Int = 17
|
override val baseVersionCode: Int = 18
|
||||||
|
|
||||||
override val sources = listOf(
|
override val sources = listOf(
|
||||||
MultiLang("Asura Scans", "https://www.asurascans.com", listOf("en", "tr"), className = "AsuraScansFactory", pkgName = "asurascans", overrideVersionCode = 16),
|
MultiLang("Asura Scans", "https://www.asurascans.com", listOf("en", "tr"), className = "AsuraScansFactory", pkgName = "asurascans", overrideVersionCode = 16),
|
||||||
|
|
Loading…
Reference in New Issue