diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a11ffb434..28039525a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -192,7 +192,7 @@ a.k.a. the Latest source entry point in the app (invoked by tapping on the "Late - When the user searches inside the app, `fetchSearchManga` will be called and the rest of the flow is similar to what happens with `fetchPopularManga`. - If search functionality is not available, return `Observable.just(MangasPage(emptyList(), false))` -- `getFilterList` will be called to get all filters and filter types. **TODO: explain more about `Filter`** +- `getAnimeFilterList` will be called to get all filters and filter types. **TODO: explain more about `AnimeFilter`** #### Manga Details diff --git a/common-dependencies.gradle b/common-dependencies.gradle index 9fbc5db68..afa22910f 100644 --- a/common-dependencies.gradle +++ b/common-dependencies.gradle @@ -1,7 +1,7 @@ // used both in common.gradle and themesources library dependencies { // Lib 1.3, but using specific commit so we don't need to bump up the version - compileOnly "com.github.jmir1:extensions-lib:87f8a8e" + compileOnly "com.github.jmir1:extensions-lib:dd07b94" // These are provided by the app itself compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" diff --git a/src/en/fouranime/build.gradle b/src/en/fouranime/build.gradle index 4d39078e9..c13937ba5 100644 --- a/src/en/fouranime/build.gradle +++ b/src/en/fouranime/build.gradle @@ -5,8 +5,8 @@ ext { extName = '4anime.to' pkgNameSuffix = 'en.fouranime' extClass = '.FourAnime' - extVersionCode = 4 - libVersion = '1.3' + extVersionCode = 5 + libVersion = '10' } dependencies { ext.coroutinesVersion = "1.4.3" diff --git a/src/en/fouranime/src/eu/kanade/tachiyomi/animeextension/en/fouranime/FourAnime.kt b/src/en/fouranime/src/eu/kanade/tachiyomi/animeextension/en/fouranime/FourAnime.kt index 019d76987..72e0575da 100644 --- a/src/en/fouranime/src/eu/kanade/tachiyomi/animeextension/en/fouranime/FourAnime.kt +++ b/src/en/fouranime/src/eu/kanade/tachiyomi/animeextension/en/fouranime/FourAnime.kt @@ -1,6 +1,6 @@ package eu.kanade.tachiyomi.animeextension.en.fouranime -import eu.kanade.tachiyomi.animesource.model.FilterList +import eu.kanade.tachiyomi.animesource.model.AnimeFilterList import eu.kanade.tachiyomi.animesource.model.SAnime import eu.kanade.tachiyomi.animesource.model.SEpisode import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource @@ -61,7 +61,7 @@ class FourAnime : ParsedAnimeHttpSource() { override fun searchAnimeSelector(): String = "#headerDIV_95" - override fun searchAnimeRequest(page: Int, query: String, filters: FilterList): Request = GET("$baseUrl/?s=$query") + override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request = GET("$baseUrl/?s=$query") override fun animeDetailsParse(document: Document): SAnime { val anime = SAnime.create() diff --git a/src/en/tenshimoe/build.gradle b/src/en/tenshimoe/build.gradle index 0bb49e71e..064a33928 100644 --- a/src/en/tenshimoe/build.gradle +++ b/src/en/tenshimoe/build.gradle @@ -5,8 +5,8 @@ ext { extName = 'tenshi.moe' pkgNameSuffix = 'en.tenshimoe' extClass = '.TenshiMoe' - extVersionCode = 7 - libVersion = '1.3' + extVersionCode = 8 + libVersion = '10' } dependencies { ext.coroutinesVersion = "1.4.3" diff --git a/src/en/tenshimoe/src/eu/kanade/tachiyomi/animeextension/en/tenshimoe/TenshiMoe.kt b/src/en/tenshimoe/src/eu/kanade/tachiyomi/animeextension/en/tenshimoe/TenshiMoe.kt index eddb6b68c..6d740a8b2 100644 --- a/src/en/tenshimoe/src/eu/kanade/tachiyomi/animeextension/en/tenshimoe/TenshiMoe.kt +++ b/src/en/tenshimoe/src/eu/kanade/tachiyomi/animeextension/en/tenshimoe/TenshiMoe.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.animeextension.en.tenshimoe import android.annotation.SuppressLint -import eu.kanade.tachiyomi.animesource.model.FilterList +import eu.kanade.tachiyomi.animesource.model.AnimeFilterList import eu.kanade.tachiyomi.animesource.model.SAnime import eu.kanade.tachiyomi.animesource.model.SEpisode import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource @@ -93,7 +93,7 @@ class TenshiMoe : ParsedAnimeHttpSource() { override fun searchAnimeSelector(): String = "ul.anime-loop.loop li a" - override fun searchAnimeRequest(page: Int, query: String, filters: FilterList): Request = GET("$baseUrl/anime?q=$query") + override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request = GET("$baseUrl/anime?q=$query") override fun animeDetailsParse(document: Document): SAnime { val anime = SAnime.create() diff --git a/src/en/twodgirlstech/build.gradle b/src/en/twodgirlstech/build.gradle index b485dd295..1ca80cf1f 100644 --- a/src/en/twodgirlstech/build.gradle +++ b/src/en/twodgirlstech/build.gradle @@ -5,8 +5,8 @@ ext { extName = '2dgirls.tech' pkgNameSuffix = 'en.twodgirlstech' extClass = '.TwoDGirlsTech' - extVersionCode = 6 - libVersion = '1.3' + extVersionCode = 7 + libVersion = '10' } dependencies { ext.coroutinesVersion = "1.4.3" diff --git a/src/en/twodgirlstech/src/eu/kanade/tachiyomi/animeextension/en/twodgirlstech/TwoDGirlsTech.kt b/src/en/twodgirlstech/src/eu/kanade/tachiyomi/animeextension/en/twodgirlstech/TwoDGirlsTech.kt index 2f4fa4179..f3c33e455 100644 --- a/src/en/twodgirlstech/src/eu/kanade/tachiyomi/animeextension/en/twodgirlstech/TwoDGirlsTech.kt +++ b/src/en/twodgirlstech/src/eu/kanade/tachiyomi/animeextension/en/twodgirlstech/TwoDGirlsTech.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.animeextension.en.twodgirlstech +import eu.kanade.tachiyomi.animesource.model.AnimeFilterList import eu.kanade.tachiyomi.animesource.model.AnimesPage -import eu.kanade.tachiyomi.animesource.model.FilterList import eu.kanade.tachiyomi.animesource.model.SAnime import eu.kanade.tachiyomi.animesource.model.SEpisode import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource @@ -95,7 +95,7 @@ class TwoDGirlsTech : ParsedAnimeHttpSource() { } } - override fun fetchSearchAnime(page: Int, query: String, filters: FilterList): Observable { + override fun fetchSearchAnime(page: Int, query: String, filters: AnimeFilterList): Observable { return Observable.just(runBlocking { getSearch(page, query) }) } @@ -170,7 +170,7 @@ class TwoDGirlsTech : ParsedAnimeHttpSource() { override fun popularAnimeRequest(page: Int): Request = throw Exception("Not used") - override fun searchAnimeRequest(page: Int, query: String, filters: FilterList): Request = throw Exception("Not used") + override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request = throw Exception("Not used") override fun popularAnimeNextPageSelector(): String? = throw Exception("Not used")