From 9caf6257761f3e293164da6969642007bf22e107 Mon Sep 17 00:00:00 2001 From: happywillow0 <45346080+happywillow0@users.noreply.github.com> Date: Tue, 23 Aug 2022 22:09:56 -0400 Subject: [PATCH] Fixes MangaThemesia Filters (#13160) * Changes SelectFilter from val to fun --- .../multisrc/mangathemesia/MangaThemesia.kt | 12 ++++++------ .../multisrc/mangathemesia/MangaThemesiaGenerator.kt | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesia.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesia.kt index b66f67a94..22cea2bee 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesia.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesia.kt @@ -94,13 +94,13 @@ abstract class MangaThemesia( url.addQueryParameter("yearx", filter.state) } is StatusFilter -> { - url.addQueryParameter("status", filter.selectedValue) + url.addQueryParameter("status", filter.selectedValue()) } is TypeFilter -> { - url.addQueryParameter("type", filter.selectedValue) + url.addQueryParameter("type", filter.selectedValue()) } is OrderByFilter -> { - url.addQueryParameter("order", filter.selectedValue) + url.addQueryParameter("order", filter.selectedValue()) } is GenreListFilter -> { filter.state @@ -112,7 +112,7 @@ abstract class MangaThemesia( } // if site has project page, default value "hasProjectPage" = false is ProjectFilter -> { - if (filter.selectedValue == "project-filter-on") { + if (filter.selectedValue() == "project-filter-on") { url.setPathSegment(0, projectPageString.substring(1)) } } @@ -310,14 +310,14 @@ abstract class MangaThemesia( open class SelectFilter( displayName: String, - vals: Array>, + val vals: Array>, defaultValue: String? = null ) : Filter.Select( displayName, vals.map { it.first }.toTypedArray(), vals.indexOfFirst { it.second == defaultValue }.takeIf { it != -1 } ?: 0 ) { - val selectedValue = vals[state].second + fun selectedValue() = vals[state].second } protected class StatusFilter : SelectFilter( diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt index 6d5c299d9..e36192316 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt @@ -10,7 +10,7 @@ class MangaThemesiaGenerator : ThemeSourceGenerator { override val themeClass = "MangaThemesia" - override val baseVersionCode: Int = 17 + override val baseVersionCode: Int = 18 override val sources = listOf( MultiLang("Asura Scans", "https://www.asurascans.com", listOf("en", "tr"), className = "AsuraScansFactory", pkgName = "asurascans", overrideVersionCode = 16),