diff --git a/multisrc/overrides/madara/mangagg/src/MangaGG.kt b/multisrc/overrides/madara/mangagg/src/MangaGG.kt index 5308a49fa..4e74d0cbd 100644 --- a/multisrc/overrides/madara/mangagg/src/MangaGG.kt +++ b/multisrc/overrides/madara/mangagg/src/MangaGG.kt @@ -1,11 +1,5 @@ package eu.kanade.tachiyomi.extension.en.mangagg import eu.kanade.tachiyomi.multisrc.madara.Madara -import eu.kanade.tachiyomi.network.GET -import okhttp3.Request -class MangaGG : Madara("MangaGG", "https://mangagg.com", "en") { - - override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/comic-list/$page?m_orderby=views", headers) - override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/comic-list/$page?m_orderby=latest", headers) -} +class MangaGG : Madara("MangaGG", "https://mangagg.com", "en") diff --git a/multisrc/overrides/madara/mangalibrary/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/mangalibrary/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 8860c017c..000000000 Binary files a/multisrc/overrides/madara/mangalibrary/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangalibrary/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/mangalibrary/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index a735ef76b..000000000 Binary files a/multisrc/overrides/madara/mangalibrary/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangalibrary/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/mangalibrary/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 0754a1701..000000000 Binary files a/multisrc/overrides/madara/mangalibrary/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangalibrary/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangalibrary/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 5f5b968d3..000000000 Binary files a/multisrc/overrides/madara/mangalibrary/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangalibrary/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangalibrary/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index d4ba726c9..000000000 Binary files a/multisrc/overrides/madara/mangalibrary/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangalibrary/res/web_hi_res_512.png b/multisrc/overrides/madara/mangalibrary/res/web_hi_res_512.png deleted file mode 100644 index 663cd11c5..000000000 Binary files a/multisrc/overrides/madara/mangalibrary/res/web_hi_res_512.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangalibrary/src/MangaLibrary.kt b/multisrc/overrides/madara/mangalibrary/src/MangaLibrary.kt deleted file mode 100644 index 0ba8a1398..000000000 --- a/multisrc/overrides/madara/mangalibrary/src/MangaLibrary.kt +++ /dev/null @@ -1,11 +0,0 @@ -package eu.kanade.tachiyomi.extension.en.mangalibrary - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import eu.kanade.tachiyomi.network.GET -import okhttp3.Request - -class MangaLibrary : Madara("Manga Library", "https://mangalibrary.net", "en") { - - override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/manga-library/$page?m_orderby=views", headers) - override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/manga-library/$page?m_orderby=latest", headers) -} diff --git a/multisrc/overrides/madara/webtoon18/src/WebToon18.kt b/multisrc/overrides/madara/webtoon18/src/WebToon18.kt index d79dee59a..6ba1aacf9 100644 --- a/multisrc/overrides/madara/webtoon18/src/WebToon18.kt +++ b/multisrc/overrides/madara/webtoon18/src/WebToon18.kt @@ -2,14 +2,8 @@ package eu.kanade.tachiyomi.extension.en.webtoon18 import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw -import eu.kanade.tachiyomi.network.GET -import okhttp3.Request import java.text.SimpleDateFormat import java.util.Locale @Nsfw -class WebToon18 : Madara("WebToon18", "http://webtoon18.net", "en", dateFormat = SimpleDateFormat("d MMMM, yyyy", Locale.US)) { - private fun pagePath(page: Int) = if (page > 1) "page/$page/" else "" - override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/webtoons/${pagePath(page)}?m_orderby=views", headers) - override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/webtoons/${pagePath(page)}?m_orderby=latest", headers) -} +class WebToon18 : Madara("WebToon18", "http://webtoon18.net", "en", dateFormat = SimpleDateFormat("d MMMM, yyyy", Locale.US)) diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt index 316bf82f8..8e62d7ddc 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt @@ -146,7 +146,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Manga Kiss", "https://mangakiss.org", "en", overrideVersionCode = 1), SingleLang("Manga Land Arabic", "https://mangalandarabic.com", "ar", overrideVersionCode = 1), SingleLang("Manga Leveling", "https://mangaleveling.com", "en"), - SingleLang("Manga Library", "https://mangalibrary.net", "en", overrideVersionCode = 2), SingleLang("Manga Lord", "https://mangalord.com", "en", overrideVersionCode = 1), SingleLang("Manga Mitsu", "https://mangamitsu.com", "en", isNsfw = true, overrideVersionCode = 2), SingleLang("Manga Mix", "https://mangamix.me", "ar"), @@ -184,7 +183,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Manga-fast.com", "https://manga-fast.com", "en", className = "Mangafastcom", overrideVersionCode = 3), SingleLang("MangaFort", "https://mangafort.com", "en"), SingleLang("MangaFoxFull", "https://mangafoxfull.com", "en"), - SingleLang("MangaGG", "https://mangagg.com", "en"), + SingleLang("MangaGG", "https://mangagg.com", "en", overrideVersionCode = 1), SingleLang("MangaGreat", "https://mangagreat.com", "en", overrideVersionCode = 1), SingleLang("MangaHZ", "https://www.mangahz.com", "en", isNsfw = true, overrideVersionCode = 2), SingleLang("MangaKitsune", "https://mangakitsune.com", "en", isNsfw = true, overrideVersionCode = 4), @@ -355,7 +354,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Wakascan", "https://wakascan.com", "fr", overrideVersionCode = 1), SingleLang("War Queen Scan", "https://wqscan.com.br", "pt-BR", overrideVersionCode = 4), SingleLang("WebNovel", "https://webnovel.live", "en", className = "WebNovelLive", overrideVersionCode = 3), - SingleLang("WebToon18", "http://webtoon18.net", "en", isNsfw = true, overrideVersionCode = 1), + SingleLang("WebToon18", "http://webtoon18.net", "en", isNsfw = true, overrideVersionCode = 2), SingleLang("WebToon69", "https://webtoon18.com", "en", isNsfw = true), SingleLang("WebToonily", "https://webtoonily.com", "en", isNsfw = true, overrideVersionCode = 1), SingleLang("Webtoon Hatti", "https://webtoonhatti.com/", "tr"),