diff --git a/multisrc/overrides/madara/exoscans/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/exoscans/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index dc4abb334..000000000 Binary files a/multisrc/overrides/madara/exoscans/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/exoscans/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/exoscans/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 9c2d500af..000000000 Binary files a/multisrc/overrides/madara/exoscans/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/exoscans/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/exoscans/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index cd2cf723f..000000000 Binary files a/multisrc/overrides/madara/exoscans/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/exoscans/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/exoscans/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 72f81355f..000000000 Binary files a/multisrc/overrides/madara/exoscans/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/exoscans/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/exoscans/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 429423675..000000000 Binary files a/multisrc/overrides/madara/exoscans/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/exoscans/res/web_hi_res_512.png b/multisrc/overrides/madara/exoscans/res/web_hi_res_512.png deleted file mode 100644 index 428832fd0..000000000 Binary files a/multisrc/overrides/madara/exoscans/res/web_hi_res_512.png and /dev/null differ diff --git a/multisrc/overrides/madara/exoscans/src/ExoScans.kt b/multisrc/overrides/madara/exoscans/src/ExoScans.kt deleted file mode 100644 index e36079da0..000000000 --- a/multisrc/overrides/madara/exoscans/src/ExoScans.kt +++ /dev/null @@ -1,18 +0,0 @@ -package eu.kanade.tachiyomi.extension.en.exoscans - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import eu.kanade.tachiyomi.source.model.Page -import org.jsoup.nodes.Document - -class ExoScans : Madara("Exo Scans", "https://exoscans.club", "en") { - - override fun pageListParse(document: Document): List { - return document.select(pageListParseSelector).mapIndexed { index, element -> - Page( - index, - "", - element.select("img.wp-manga-chapter-img").attr("src") - ) - } - } -} diff --git a/multisrc/overrides/madara/fastmanhwa/src/FastManhwa.kt b/multisrc/overrides/madara/fastmanhwa/src/FastManhwa.kt index d74122ea0..88149a648 100644 --- a/multisrc/overrides/madara/fastmanhwa/src/FastManhwa.kt +++ b/multisrc/overrides/madara/fastmanhwa/src/FastManhwa.kt @@ -6,6 +6,6 @@ import java.text.SimpleDateFormat import java.util.Locale @Nsfw -class FastManhwa : Madara("FastManhwa", "https://fastmanhwa.com", "en", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.US)) { +class FastManhwa : Madara("FastManhwa", "https://fastmanhwa.net", "en", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.US)) { } diff --git a/multisrc/overrides/madara/himerafansub/src/HimeraFansub.kt b/multisrc/overrides/madara/himerafansub/src/HimeraFansub.kt deleted file mode 100644 index 72a8a0373..000000000 --- a/multisrc/overrides/madara/himerafansub/src/HimeraFansub.kt +++ /dev/null @@ -1,7 +0,0 @@ -package eu.kanade.tachiyomi.extension.tr.himerafansub - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import java.text.SimpleDateFormat -import java.util.Locale - -class HimeraFansub : Madara("Himera Fansub", "https://himera-fansub.com", "tr", SimpleDateFormat("dd MMMM yyyy", Locale.forLanguageTag("tr"))) diff --git a/multisrc/overrides/madara/jjutsuscans/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/jjutsuscans/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 10b8a25a7..000000000 Binary files a/multisrc/overrides/madara/jjutsuscans/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/jjutsuscans/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/jjutsuscans/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 84195da0d..000000000 Binary files a/multisrc/overrides/madara/jjutsuscans/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/jjutsuscans/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/jjutsuscans/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index fe2cb7257..000000000 Binary files a/multisrc/overrides/madara/jjutsuscans/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/jjutsuscans/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/jjutsuscans/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 62ca65750..000000000 Binary files a/multisrc/overrides/madara/jjutsuscans/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/jjutsuscans/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/jjutsuscans/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 5a95c1cb8..000000000 Binary files a/multisrc/overrides/madara/jjutsuscans/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/jjutsuscans/res/web_hi_res_512.png b/multisrc/overrides/madara/jjutsuscans/res/web_hi_res_512.png deleted file mode 100644 index 13213478d..000000000 Binary files a/multisrc/overrides/madara/jjutsuscans/res/web_hi_res_512.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangaaction/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/mangaaction/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..ca387b84e Binary files /dev/null and b/multisrc/overrides/madara/mangaaction/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangaaction/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/mangaaction/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..203b65f88 Binary files /dev/null and b/multisrc/overrides/madara/mangaaction/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangaaction/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/mangaaction/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..4184957a6 Binary files /dev/null and b/multisrc/overrides/madara/mangaaction/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangaaction/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangaaction/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..394351532 Binary files /dev/null and b/multisrc/overrides/madara/mangaaction/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangaaction/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangaaction/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..06b77da87 Binary files /dev/null and b/multisrc/overrides/madara/mangaaction/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangaaction/res/web_hi_res_512.png b/multisrc/overrides/madara/mangaaction/res/web_hi_res_512.png new file mode 100644 index 000000000..545a85d46 Binary files /dev/null and b/multisrc/overrides/madara/mangaaction/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/madara/mangaaction/src/MangaAction.kt b/multisrc/overrides/madara/mangaaction/src/MangaAction.kt deleted file mode 100644 index 805d539a5..000000000 --- a/multisrc/overrides/madara/mangaaction/src/MangaAction.kt +++ /dev/null @@ -1,7 +0,0 @@ -package eu.kanade.tachiyomi.extension.ar.mangaaction - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import java.text.SimpleDateFormat -import java.util.Locale - -class MangaAction : Madara("Manga Action", "https://mangaaction.com", "ar", SimpleDateFormat("yyyy-MM-dd", Locale("ar"))) diff --git a/multisrc/overrides/madara/mangagg/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/mangagg/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..e3391ee66 Binary files /dev/null and b/multisrc/overrides/madara/mangagg/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangagg/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/mangagg/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..cff2a91dd Binary files /dev/null and b/multisrc/overrides/madara/mangagg/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangagg/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/mangagg/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..1f6edeb21 Binary files /dev/null and b/multisrc/overrides/madara/mangagg/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangagg/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangagg/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..ad590d122 Binary files /dev/null and b/multisrc/overrides/madara/mangagg/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangagg/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangagg/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..6c69ffdad Binary files /dev/null and b/multisrc/overrides/madara/mangagg/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangagg/res/web_hi_res_512.png b/multisrc/overrides/madara/mangagg/res/web_hi_res_512.png new file mode 100644 index 000000000..4420be656 Binary files /dev/null and b/multisrc/overrides/madara/mangagg/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/madara/mangagg/src/MangaGG.kt b/multisrc/overrides/madara/mangagg/src/MangaGG.kt new file mode 100644 index 000000000..5308a49fa --- /dev/null +++ b/multisrc/overrides/madara/mangagg/src/MangaGG.kt @@ -0,0 +1,11 @@ +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) +} diff --git a/multisrc/overrides/madara/mangahero/src/MangaHero.kt b/multisrc/overrides/madara/mangahero/src/MangaHero.kt new file mode 100644 index 000000000..cd2442689 --- /dev/null +++ b/multisrc/overrides/madara/mangahero/src/MangaHero.kt @@ -0,0 +1,11 @@ +package eu.kanade.tachiyomi.extension.en.mangahero + +import eu.kanade.tachiyomi.multisrc.madara.Madara +import eu.kanade.tachiyomi.source.model.SChapter +import okhttp3.Response + +class MangaHero : Madara("Manga Hero", "https://manga47.xyz", "en") { + + override fun chapterListParse(response: Response): List = super.chapterListParse(response).reversed() + +} diff --git a/multisrc/overrides/madara/mangalibrary/src/MangaLibrary.kt b/multisrc/overrides/madara/mangalibrary/src/MangaLibrary.kt index 7ae3e598d..0ba8a1398 100644 --- a/multisrc/overrides/madara/mangalibrary/src/MangaLibrary.kt +++ b/multisrc/overrides/madara/mangalibrary/src/MangaLibrary.kt @@ -6,8 +6,6 @@ import okhttp3.Request class MangaLibrary : Madara("Manga Library", "https://mangalibrary.net", "en") { - override fun chapterListSelector() = "li.wp-manga-chapter " - 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/mangarave/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/mangarave/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index df45ced4e..000000000 Binary files a/multisrc/overrides/madara/mangarave/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangarave/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/mangarave/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 612317089..000000000 Binary files a/multisrc/overrides/madara/mangarave/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangarave/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/mangarave/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 5bda3968f..000000000 Binary files a/multisrc/overrides/madara/mangarave/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangarave/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangarave/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 29018e3f2..000000000 Binary files a/multisrc/overrides/madara/mangarave/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangarave/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangarave/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index fe14bd9b8..000000000 Binary files a/multisrc/overrides/madara/mangarave/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangarave/res/web_hi_res_512.png b/multisrc/overrides/madara/mangarave/res/web_hi_res_512.png deleted file mode 100644 index 6e2c3bc7b..000000000 Binary files a/multisrc/overrides/madara/mangarave/res/web_hi_res_512.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangarave/src/MangaRave.kt b/multisrc/overrides/madara/mangarave/src/MangaRave.kt deleted file mode 100644 index 4f6653922..000000000 --- a/multisrc/overrides/madara/mangarave/src/MangaRave.kt +++ /dev/null @@ -1,7 +0,0 @@ -package eu.kanade.tachiyomi.extension.en.mangarave - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import java.text.SimpleDateFormat -import java.util.Locale - -class MangaRave : Madara("MangaRave", "https://www.mangarave.com", "en", SimpleDateFormat("MMM-dd-yy", Locale.US)) diff --git a/multisrc/overrides/madara/mangavb/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/mangavb/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 256dd89ab..000000000 Binary files a/multisrc/overrides/madara/mangavb/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangavb/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/mangavb/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 6f2736a81..000000000 Binary files a/multisrc/overrides/madara/mangavb/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangavb/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/mangavb/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 421d425a8..000000000 Binary files a/multisrc/overrides/madara/mangavb/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangavb/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangavb/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 01146a81a..000000000 Binary files a/multisrc/overrides/madara/mangavb/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangavb/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangavb/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index e671b09bc..000000000 Binary files a/multisrc/overrides/madara/mangavb/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangavb/res/web_hi_res_512.png b/multisrc/overrides/madara/mangavb/res/web_hi_res_512.png deleted file mode 100644 index dc2aca5b9..000000000 Binary files a/multisrc/overrides/madara/mangavb/res/web_hi_res_512.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangavb/src/MangaVB.kt b/multisrc/overrides/madara/mangavb/src/MangaVB.kt deleted file mode 100644 index 413668e61..000000000 --- a/multisrc/overrides/madara/mangavb/src/MangaVB.kt +++ /dev/null @@ -1,9 +0,0 @@ -package eu.kanade.tachiyomi.extension.en.mangavb - -import eu.kanade.tachiyomi.annotations.Nsfw -import eu.kanade.tachiyomi.multisrc.madara.Madara - -@Nsfw -class MangaVB : Madara("MangaVB", "https://mangavb.com", "en") { - -} diff --git a/multisrc/overrides/madara/mangayaku/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/mangayaku/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index b5a60ad0e..000000000 Binary files a/multisrc/overrides/madara/mangayaku/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangayaku/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/mangayaku/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index a89b97cdf..000000000 Binary files a/multisrc/overrides/madara/mangayaku/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangayaku/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/mangayaku/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index b0a3f6016..000000000 Binary files a/multisrc/overrides/madara/mangayaku/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangayaku/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangayaku/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 118507636..000000000 Binary files a/multisrc/overrides/madara/mangayaku/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangayaku/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangayaku/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index eb8d4ad30..000000000 Binary files a/multisrc/overrides/madara/mangayaku/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangayaku/res/web_hi_res_512.png b/multisrc/overrides/madara/mangayaku/res/web_hi_res_512.png deleted file mode 100644 index fde22c1f4..000000000 Binary files a/multisrc/overrides/madara/mangayaku/res/web_hi_res_512.png and /dev/null differ diff --git a/multisrc/overrides/madara/manwhaclub/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/manwhaclub/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 43ecbf446..000000000 Binary files a/multisrc/overrides/madara/manwhaclub/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/manwhaclub/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/manwhaclub/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index ff019243b..000000000 Binary files a/multisrc/overrides/madara/manwhaclub/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/manwhaclub/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/manwhaclub/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index a81b1260e..000000000 Binary files a/multisrc/overrides/madara/manwhaclub/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/manwhaclub/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/manwhaclub/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 294a471b6..000000000 Binary files a/multisrc/overrides/madara/manwhaclub/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/manwhaclub/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/manwhaclub/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 56f8cad99..000000000 Binary files a/multisrc/overrides/madara/manwhaclub/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/manwhaclub/res/web_hi_res_512.png b/multisrc/overrides/madara/manwhaclub/res/web_hi_res_512.png deleted file mode 100644 index 19a7d4596..000000000 Binary files a/multisrc/overrides/madara/manwhaclub/res/web_hi_res_512.png and /dev/null differ diff --git a/multisrc/overrides/madara/manwhaclub/src/ManwhaClub.kt b/multisrc/overrides/madara/manwhaclub/src/ManwhaClub.kt deleted file mode 100644 index 388e87db8..000000000 --- a/multisrc/overrides/madara/manwhaclub/src/ManwhaClub.kt +++ /dev/null @@ -1,45 +0,0 @@ -package eu.kanade.tachiyomi.extension.en.manwhaclub - -import eu.kanade.tachiyomi.multisrc.madara.Madara - -class ManwhaClub : Madara("Manhwa.club", "https://manhwa.club", "en") { - override val id = 6951399865568003192 - override fun getGenreList() = listOf( - Genre("Action", "action"), - Genre("Adult", "adult"), - Genre("Adventure", "adventure"), - Genre("Comedy", "comedy"), - Genre("Crime", "crime"), - Genre("Drama", "drama"), - Genre("Fantasy", "fantasy"), - Genre("Gender bender", "gender-bender"), - Genre("Gossip", "gossip"), - Genre("Harem", "harem"), - Genre("Historical", "historical"), - Genre("Horror", "horror"), - Genre("Incest", "incest"), - Genre("Isekai", "isekai"), - Genre("Martial arts", "martial-arts"), - Genre("Mecha", "mecha"), - Genre("Medical", "medical"), - Genre("Monster/Tentacle", "monster-tentacle"), - Genre("Mystery", "mystery"), - Genre("One shot", "one-shot"), - Genre("Psychological", "psychological"), - Genre("Revenge", "revenge"), - Genre("Romance", "romance"), - Genre("School Life", "school-life"), - Genre("Sci Fi", "sci-fi"), - Genre("Seinen", "seinen"), - Genre("Shoujo", "shoujo"), - Genre("Shounen", "shounen"), - Genre("Slice of Life", "slice-of-life"), - Genre("Smut", "smut"), - Genre("Sports", "sports"), - Genre("Supernatural", "supernatural"), - Genre("Thriller", "thriller"), - Genre("Tragedy", "tragedy"), - Genre("Yaoi", "yaoi"), - Genre("Yuri", "yuri"), - ) -} diff --git a/multisrc/overrides/madara/onmanga/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/onmanga/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 13f167050..000000000 Binary files a/multisrc/overrides/madara/onmanga/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/onmanga/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/onmanga/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 8d8f03c66..000000000 Binary files a/multisrc/overrides/madara/onmanga/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/onmanga/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/onmanga/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 277128ed5..000000000 Binary files a/multisrc/overrides/madara/onmanga/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/onmanga/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/onmanga/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 5f6d55219..000000000 Binary files a/multisrc/overrides/madara/onmanga/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/onmanga/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/onmanga/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 69b9506bf..000000000 Binary files a/multisrc/overrides/madara/onmanga/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/onmanga/res/web_hi_res_512.png b/multisrc/overrides/madara/onmanga/res/web_hi_res_512.png deleted file mode 100644 index 68996bdd6..000000000 Binary files a/multisrc/overrides/madara/onmanga/res/web_hi_res_512.png and /dev/null differ diff --git a/multisrc/overrides/madara/webtoon18/src/Webtoon18.kt b/multisrc/overrides/madara/webtoon18/src/WebToon18.kt similarity index 91% rename from multisrc/overrides/madara/webtoon18/src/Webtoon18.kt rename to multisrc/overrides/madara/webtoon18/src/WebToon18.kt index c65ddf91a..c17f8891d 100644 --- a/multisrc/overrides/madara/webtoon18/src/Webtoon18.kt +++ b/multisrc/overrides/madara/webtoon18/src/WebToon18.kt @@ -8,7 +8,7 @@ import java.text.SimpleDateFormat import java.util.Locale @Nsfw -class Webtoon18 : Madara("Webtoon18", "https://webtoon18.net", "en", dateFormat = SimpleDateFormat("d MMMM, yyyy", Locale.US)) { +class WebToon18 : Madara("WebToon18", "https://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) diff --git a/multisrc/overrides/madara/webtoon69/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/webtoon69/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..e4e442c02 Binary files /dev/null and b/multisrc/overrides/madara/webtoon69/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/webtoon69/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/webtoon69/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..25f95deaa Binary files /dev/null and b/multisrc/overrides/madara/webtoon69/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/webtoon69/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/webtoon69/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..56c27307a Binary files /dev/null and b/multisrc/overrides/madara/webtoon69/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/webtoon69/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/webtoon69/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..c03f171de Binary files /dev/null and b/multisrc/overrides/madara/webtoon69/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/webtoon69/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/webtoon69/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..5769fc032 Binary files /dev/null and b/multisrc/overrides/madara/webtoon69/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/webtoon69/res/web_hi_res_512.png b/multisrc/overrides/madara/webtoon69/res/web_hi_res_512.png new file mode 100644 index 000000000..b40926c58 Binary files /dev/null and b/multisrc/overrides/madara/webtoon69/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/madara/webtoon69/src/WebToon69.kt b/multisrc/overrides/madara/webtoon69/src/WebToon69.kt new file mode 100644 index 000000000..e52b4302d --- /dev/null +++ b/multisrc/overrides/madara/webtoon69/src/WebToon69.kt @@ -0,0 +1,7 @@ +package eu.kanade.tachiyomi.extension.en.webtoon69 + +import eu.kanade.tachiyomi.multisrc.madara.Madara +import eu.kanade.tachiyomi.annotations.Nsfw + +@Nsfw +class WebToon69 : Madara("WebToon69", "https://webtoon69.com", "en") diff --git a/multisrc/overrides/madara/xmanhwa/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/xmanhwa/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 0db8deb51..000000000 Binary files a/multisrc/overrides/madara/xmanhwa/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/xmanhwa/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/xmanhwa/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index a737a1a91..000000000 Binary files a/multisrc/overrides/madara/xmanhwa/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/xmanhwa/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/xmanhwa/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 16319c713..000000000 Binary files a/multisrc/overrides/madara/xmanhwa/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/xmanhwa/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/xmanhwa/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index b6141ec96..000000000 Binary files a/multisrc/overrides/madara/xmanhwa/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/xmanhwa/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/xmanhwa/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 1d54ee77f..000000000 Binary files a/multisrc/overrides/madara/xmanhwa/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/xmanhwa/res/web_hi_res_512.png b/multisrc/overrides/madara/xmanhwa/res/web_hi_res_512.png deleted file mode 100644 index ec2998cbf..000000000 Binary files a/multisrc/overrides/madara/xmanhwa/res/web_hi_res_512.png and /dev/null differ diff --git a/multisrc/overrides/madara/xmanhwa/src/XManhwa.kt b/multisrc/overrides/madara/xmanhwa/src/XManhwa.kt deleted file mode 100644 index 35ac1c0e3..000000000 --- a/multisrc/overrides/madara/xmanhwa/src/XManhwa.kt +++ /dev/null @@ -1,7 +0,0 @@ -package eu.kanade.tachiyomi.extension.en.xmanhwa - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import eu.kanade.tachiyomi.annotations.Nsfw - -@Nsfw -class XManhwa : Madara("Xmanhwa", "https://xmanhwa.com", "en") 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 70166320a..8c37741bb 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 @@ -74,8 +74,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Drope Scan", "https://dropescan.com", "pt-BR", overrideVersionCode = 3), SingleLang("Dream Union Scan", "https://www.dreamunionscan.com", "pt-BR", overrideVersionCode = 1), SingleLang("Esomanga", "http://esomanga.com", "tr"), - SingleLang("Exo Scans", "https://exoscans.club", "en"), - SingleLang("FastManhwa", "https://fastmanhwa.com", "en", isNsfw = true), + SingleLang("FastManhwa", "https://fastmanhwa.net", "en", isNsfw = true, overrideVersionCode = 1), SingleLang("FDM Scan", "https://fdmscan.com", "pt-BR", overrideVersionCode = 3), SingleLang("Free Manga", "https://freemanga.me", "en", isNsfw = true, overrideVersionCode = 2), SingleLang("FreeWebtoonCoins", "https://freewebtooncoins.com", "en", overrideVersionCode = 1), @@ -94,11 +93,10 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Hayalistic", "https://hayalistic.com", "tr"), SingleLang("Hentai20", "https://hentai20.com", "en", isNsfw = true, overrideVersionCode = 1), SingleLang("Hentaidexy", "https://hentaidexy.com", "en", isNsfw = true, overrideVersionCode = 1), - SingleLang("HentaiRead", "https://hentairead.com", "en", isNsfw = true), + SingleLang("HentaiRead", "https://hentairead.com", "en", isNsfw = true, className = "Hentairead", overrideVersionCode = 1), SingleLang("HentaiWebtoon", "https://hentaiwebtoon.com", "en", isNsfw = true), SingleLang("Hero Manhua", "https://heromanhua.com", "en"), SingleLang("Heroz Scanlation", "https://herozscans.com", "en", overrideVersionCode = 1), - SingleLang("Himera Fansub", "https://himera-fansub.com", "tr"), SingleLang("Hiperdex", "https://hiperdex.com", "en", isNsfw = true, overrideVersionCode = 4), SingleLang("hManhwa", "https://hmanhwa.com", "en", isNsfw = true, overrideVersionCode = 1), SingleLang("Hscans", "https://hscans.com", "en", overrideVersionCode = 1), @@ -111,7 +109,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("IsekaiScan.com", "https://isekaiscan.com", "en", className = "IsekaiScanCom", overrideVersionCode = 2), SingleLang("IsekaiScanManga (unoriginal)", "https://isekaiscanmanga.com", "en", className = "IsekaiScanManga", overrideVersionCode = 1), SingleLang("Its Your Right Manhua", "https://itsyourightmanhua.com/", "en", overrideVersionCode = 1), - SingleLang("JJutsuScans", "https://jjutsuscans.com", "en", overrideVersionCode = 1), SingleLang("KawaScans", "https://kawascans.com", "en"), SingleLang("KisekiManga", "https://kisekimanga.com", "en", overrideVersionCode = 1), SingleLang("Kissmanga.in", "https://kissmanga.in", "en", className= "KissmangaIn", overrideVersionCode = 1), @@ -129,7 +126,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("LovableSubs", "https://lovablesubs.com", "tr", overrideVersionCode = 1), SingleLang("MG Komik", "https://mgkomik.com", "id", overrideVersionCode = 2), SingleLang("MMScans", "https://mm-scans.com/", "en", overrideVersionCode = 1), - SingleLang("Manga Action", "https://manga-action.com", "ar", overrideVersionCode = 1), + SingleLang("Manga Action", "https://mangaaction.com", "en", overrideVersionCode = 2), SingleLang("Manga Bin", "https://mangabin.com/", "en", overrideVersionCode = 1), SingleLang("Manga Chill", "https://mangachill.com/", "en", overrideVersionCode = 2), SingleLang("Manga Crab", "https://mangacrab.com", "es"), @@ -138,11 +135,11 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Manga Fenix", "https://manga-fenix.com", "es", overrideVersionCode = 1), SingleLang("Manga Funny", "https://mangafunny.com", "en"), SingleLang("Manga Hentai", "https://mangahentai.me", "en", isNsfw = true, overrideVersionCode = 1), - SingleLang("Manga Hero", "https://mangahero.xyz", "en"), + SingleLang("Manga Hero", "https://mangahero.xyz", "en", overrideVersionCode = 1), 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 = 1), + 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"), @@ -179,6 +176,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("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), @@ -189,7 +187,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("MangaMe", "https://mangame.org", "en", overrideVersionCode = 1), SingleLang("MangaMG", "https://mangamg.com", "en"), SingleLang("MangaPL", "https://mangapl.com", "en", isNsfw = true, overrideVersionCode = 1), - SingleLang("MangaRave", "https://www.mangarave.com", "en", overrideVersionCode = 2), SingleLang("MangaRead.org", "https://www.mangaread.org", "en", className = "MangaReadOrg", overrideVersionCode = 1), SingleLang("MangaRex", "https://mangarex.co", "en"), SingleLang("MangaSco", "https://mangasco.com", "en", overrideVersionCode = 1), @@ -205,13 +202,11 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("MangaTeca", "https://www.mangateca.com", "pt-BR", overrideVersionCode = 3), SingleLang("MangaTuli", "https://mangatuli.com", "en", isNsfw = true, overrideVersionCode = 2), SingleLang("MangaUS", "https://mangaus.xyz", "en", overrideVersionCode = 2), - SingleLang("MangaVB", "https://mangavb.com", "en", isNsfw = true), SingleLang("MangaWise", "https://mangawise.com", "en"), SingleLang("MangaWT", "https://mangawt.com", "tr", overrideVersionCode = 1), SingleLang("MangaX1", "https://mangax1.com", "en"), SingleLang("MangaX18", "https://mangax18.com", "en", isNsfw = true), SingleLang("MangaXP", "https://mangaxp.com", "en", overrideVersionCode = 1), - SingleLang("MangaYaku", "https://mangayaku.com", "id", overrideVersionCode = 1), SingleLang("MangaYami", "https://www.mangayami.club", "en", overrideVersionCode = 2), SingleLang("Mangaka3rb", "https://mangaka3rb.com", "ar"), SingleLang("Mangakik", "https://mangakik.com", "en"), @@ -236,7 +231,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Manhuas.net", "https://manhuas.net", "en", className = "Manhuasnet", overrideVersionCode = 2), SingleLang("Manhwa Raw", "https://manhwaraw.com", "ko", isNsfw = true, overrideVersionCode = 1), SingleLang("Manhwaraw.net", "https://manhwaraw.net", "en", className = "Manhwarawnet"), - SingleLang("Manhwa.club", "https://manhwa.club", "en", className="ManwhaClub", overrideVersionCode = 2), // wrong class name for backward compatibility SingleLang("Manhwa18.app", "https://manhwa18.app", "en", isNsfw = true, className = "Manhwa18app"), SingleLang("Manhwa18.org", "https://manhwa18.org", "en", isNsfw = true, className = "Manhwa18Org", overrideVersionCode = 1), SingleLang("Manhwa68", "https://manhwa68.com", "en", isNsfw = true, overrideVersionCode = 2), @@ -277,7 +271,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("NovelMic", "https://novelmic.com", "en", overrideVersionCode = 1), SingleLang("Oh No Manga", "https://ohnomanga.com", "en", isNsfw = true), SingleLang("Off Scan", "https://offscan.top", "pt-BR", overrideVersionCode = 3), - SingleLang("OnManga", "https://onmanga.com", "en", overrideVersionCode = 1), SingleLang("Origami Orpheans", "https://origami-orpheans.com.br", "pt-BR", overrideVersionCode = 3), SingleLang("Paean Scans", "https://paeanscans.com", "en", overrideVersionCode = 1), SingleLang("Painful Nightz Scan", "https://painfulnightzscan.com", "en"), @@ -350,6 +343,8 @@ 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", "https://webtoon18.net", "en", isNsfw = true), + 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"), SingleLang("WebtoonScan", "https://webtoonscan.com", "en", isNsfw = true), @@ -360,7 +355,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("WoopRead", "https://woopread.com", "en", overrideVersionCode = 1), SingleLang("WuxiaWorld", "https://wuxiaworld.site", "en", overrideVersionCode = 1), SingleLang("XManga", "https://xmanga.io", "en", isNsfw = true), - SingleLang("XManhwa", "https://xmanhwa.com", "en", isNsfw = true), SingleLang("XuN Scans", "https://xunscans.xyz", "en", overrideVersionCode = 2), SingleLang("Yaoi Fan Clube", "https://yaoifanclube.com.br", "pt-BR", isNsfw = true, overrideVersionCode = 2), SingleLang("Yaoi.mobi", "https://yaoi.mobi", "en", isNsfw = true, className = "YaoiManga", pkgName = "yaoimanga", overrideVersionCode = 4), @@ -371,7 +365,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("ZuttoManga", "https://zuttomanga.com", "en"), SingleLang("شبكة كونان العربية", "https://www.manga.detectiveconanar.com", "ar", className = "DetectiveConanAr", overrideVersionCode = 1), SingleLang("مانجا العاشق", "https://3asq.org", "ar", className = "Manga3asq", overrideVersionCode = 1), - SingleLang("مانجا العرب", "https://www.manhwa.ae", "ar", className = "ManhwaAe"), SingleLang("مانجا عرب تيم Manga Arab Team", "https://mangaarabteam.com", "ar", className = "MangaArabTeam"), SingleLang("مانجا ليك", "https://mangalek.com", "ar", className = "Mangalek", overrideVersionCode = 1), SingleLang("مانجا لينك", "https://mangalink.io", "ar", className = "MangaLinkio", overrideVersionCode = 2),