From 75943902f412167456d7991bee4d788088e6a328 Mon Sep 17 00:00:00 2001 From: Rolando Lecca <90949336+bapeey@users.noreply.github.com> Date: Sun, 16 Jul 2023 13:14:10 -0500 Subject: [PATCH] LegionScan: Move from Madara to MangaThemesia (#17141) Move to MangaThemesia --- .../madara/legionscan/src/LegionScan.kt | 7 ------- .../legionscan/res/mipmap-hdpi/ic_launcher.png | Bin .../legionscan/res/mipmap-mdpi/ic_launcher.png | Bin .../legionscan/res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../legionscan/res/web_hi_res_512.png | Bin .../mangathemesia/legionscan/src/LegionScan.kt | 16 ++++++++++++++++ .../multisrc/madara/MadaraGenerator.kt | 1 - .../mangathemesia/MangaThemesiaGenerator.kt | 1 + 10 files changed, 17 insertions(+), 8 deletions(-) delete mode 100644 multisrc/overrides/madara/legionscan/src/LegionScan.kt rename multisrc/overrides/{madara => mangathemesia}/legionscan/res/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{madara => mangathemesia}/legionscan/res/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{madara => mangathemesia}/legionscan/res/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{madara => mangathemesia}/legionscan/res/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{madara => mangathemesia}/legionscan/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{madara => mangathemesia}/legionscan/res/web_hi_res_512.png (100%) create mode 100644 multisrc/overrides/mangathemesia/legionscan/src/LegionScan.kt diff --git a/multisrc/overrides/madara/legionscan/src/LegionScan.kt b/multisrc/overrides/madara/legionscan/src/LegionScan.kt deleted file mode 100644 index 7ed52c549..000000000 --- a/multisrc/overrides/madara/legionscan/src/LegionScan.kt +++ /dev/null @@ -1,7 +0,0 @@ -package eu.kanade.tachiyomi.extension.es.legionscan - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import java.text.SimpleDateFormat -import java.util.Locale - -class LegionScan : Madara("Legion Scan", "https://legionscans.com", "es", dateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale("es"))) diff --git a/multisrc/overrides/madara/legionscan/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/legionscan/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/legionscan/res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/legionscan/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/legionscan/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/legionscan/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/legionscan/res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/legionscan/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/legionscan/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/legionscan/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/legionscan/res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/legionscan/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/legionscan/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/legionscan/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/legionscan/res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/legionscan/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/legionscan/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/legionscan/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/legionscan/res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/legionscan/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/legionscan/res/web_hi_res_512.png b/multisrc/overrides/mangathemesia/legionscan/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/madara/legionscan/res/web_hi_res_512.png rename to multisrc/overrides/mangathemesia/legionscan/res/web_hi_res_512.png diff --git a/multisrc/overrides/mangathemesia/legionscan/src/LegionScan.kt b/multisrc/overrides/mangathemesia/legionscan/src/LegionScan.kt new file mode 100644 index 000000000..9c3afd684 --- /dev/null +++ b/multisrc/overrides/mangathemesia/legionscan/src/LegionScan.kt @@ -0,0 +1,16 @@ +package eu.kanade.tachiyomi.extension.es.legionscan + +import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia +import java.text.SimpleDateFormat +import java.util.Locale + +class LegionScan : MangaThemesia( + "Legion Scan", + "https://legionscans.com", + "es", + dateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale("es")), +) { + // Theme changed from Madara to MangaThemesia + override val versionId = 2 + override val seriesAltNameSelector = ".infotable tr:contains(alt) td:last-child" +} 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 5d199187d..f7e154bec 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 @@ -177,7 +177,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Lady Manga", "https://ladymanga.com", "en"), SingleLang("Lala Manga", "https://lalamanga.com", "en", isNsfw = true), SingleLang("Lara Manga", "https://laramanga.love", "en", overrideVersionCode = 1), - SingleLang("Legion Scan", "https://legionscans.com", "es"), SingleLang("Ler Yaoi", "https://leryaoi.com", "pt-BR", isNsfw = true), SingleLang("LHTranslation", "https://lhtranslation.net", "en", overrideVersionCode = 1), SingleLang("Lily Manga", "https://lilymanga.net", "en", isNsfw = true, overrideVersionCode = 3), 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 23bf8083b..d44313fe2 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 @@ -60,6 +60,7 @@ class MangaThemesiaGenerator : ThemeSourceGenerator { SingleLang("Komiku.com", "https://komiku.com", "id", className = "KomikuCom"), SingleLang("Kuma Scans (Kuma Translation)", "https://kumascans.com", "en", className = "KumaScans", overrideVersionCode = 1), SingleLang("Legacy Scans", "https://legacy-scans.com", "fr", pkgName = "flamescansfr"), + SingleLang("Legion Scan", "https://legionscans.com", "es", overrideVersionCode = 6), SingleLang("LianScans", "https://www.lianscans.my.id", "id", isNsfw = true), SingleLang("Lunar Scans", "https://lunarscan.org", "en", isNsfw = true), SingleLang("Magus Manga", "https://magusmanga.com", "ar"),