From f23ff43498a8e2820350181e4cbfbaed63fda9ab Mon Sep 17 00:00:00 2001 From: Rolando Lecca <90949336+bapeey@users.noreply.github.com> Date: Fri, 26 May 2023 15:50:11 -0500 Subject: [PATCH] PhoenixFansub: Move to Madara (#16510) Move to Madara --- .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../phoenixfansub/res/web_hi_res_512.png | Bin .../madara/phoenixfansub/src/PhoenixFansub.kt | 16 ++++++++++++++++ .../phoenixfansub/src/PhoenixFansub.kt | 15 --------------- .../multisrc/madara/MadaraGenerator.kt | 1 + .../mangathemesia/MangaThemesiaGenerator.kt | 1 - 10 files changed, 17 insertions(+), 16 deletions(-) rename multisrc/overrides/{mangathemesia => madara}/phoenixfansub/res/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{mangathemesia => madara}/phoenixfansub/res/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{mangathemesia => madara}/phoenixfansub/res/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{mangathemesia => madara}/phoenixfansub/res/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{mangathemesia => madara}/phoenixfansub/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{mangathemesia => madara}/phoenixfansub/res/web_hi_res_512.png (100%) create mode 100644 multisrc/overrides/madara/phoenixfansub/src/PhoenixFansub.kt delete mode 100644 multisrc/overrides/mangathemesia/phoenixfansub/src/PhoenixFansub.kt diff --git a/multisrc/overrides/mangathemesia/phoenixfansub/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/phoenixfansub/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangathemesia/phoenixfansub/res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/madara/phoenixfansub/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/mangathemesia/phoenixfansub/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/phoenixfansub/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangathemesia/phoenixfansub/res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/madara/phoenixfansub/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/mangathemesia/phoenixfansub/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/phoenixfansub/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangathemesia/phoenixfansub/res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/madara/phoenixfansub/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/mangathemesia/phoenixfansub/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/phoenixfansub/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangathemesia/phoenixfansub/res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/madara/phoenixfansub/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/mangathemesia/phoenixfansub/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/phoenixfansub/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangathemesia/phoenixfansub/res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/madara/phoenixfansub/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/mangathemesia/phoenixfansub/res/web_hi_res_512.png b/multisrc/overrides/madara/phoenixfansub/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/mangathemesia/phoenixfansub/res/web_hi_res_512.png rename to multisrc/overrides/madara/phoenixfansub/res/web_hi_res_512.png diff --git a/multisrc/overrides/madara/phoenixfansub/src/PhoenixFansub.kt b/multisrc/overrides/madara/phoenixfansub/src/PhoenixFansub.kt new file mode 100644 index 000000000..0437b0b69 --- /dev/null +++ b/multisrc/overrides/madara/phoenixfansub/src/PhoenixFansub.kt @@ -0,0 +1,16 @@ +package eu.kanade.tachiyomi.extension.es.phoenixfansub + +import eu.kanade.tachiyomi.multisrc.madara.Madara +import java.text.SimpleDateFormat +import java.util.Locale + +class PhoenixFansub : Madara( + "Phoenix Fansub", + "https://phoenixmangas.com", + "es", + dateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale("es")), +) { + // Site moved from MangaThemesia to Madara + override val versionId = 2 + override val useNewChapterEndpoint = true +} diff --git a/multisrc/overrides/mangathemesia/phoenixfansub/src/PhoenixFansub.kt b/multisrc/overrides/mangathemesia/phoenixfansub/src/PhoenixFansub.kt deleted file mode 100644 index 588b0f471..000000000 --- a/multisrc/overrides/mangathemesia/phoenixfansub/src/PhoenixFansub.kt +++ /dev/null @@ -1,15 +0,0 @@ -package eu.kanade.tachiyomi.extension.es.phoenixfansub - -import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia -import java.text.SimpleDateFormat -import java.util.Locale - -class PhoenixFansub : MangaThemesia( - "Phoenix Fansub", - "https://phoenixfansub.com", - "es", - dateFormat = SimpleDateFormat("MMM d, yyyy", Locale("es")), -) { - - override val altNamePrefix: String = "Nombre alternativo: " -} 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 92bb88f34..ea2e89fb7 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 @@ -339,6 +339,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Painful Nightz Scan", "https://painfulnightz.com", "en", overrideVersionCode = 1), SingleLang("Peach Scan", "https://www.peachscan.com", "pt-BR", isNsfw = true), SingleLang("Petrotechsociety", "https://www.petrotechsociety.org", "en", isNsfw = true), + SingleLang("Phoenix Fansub", "https://phoenixmangas.com", "es"), SingleLang("Pian Manga", "https://pianmanga.me", "en", isNsfw = true, overrideVersionCode = 1), SingleLang("Pirulito Rosa", "https://pirulitorosa.site", "pt-BR", isNsfw = true), SingleLang("Platinum Crown", "https://platinumscans.com", "en", overrideVersionCode = 1), 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 4b90605aa..20d19b636 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 @@ -94,7 +94,6 @@ class MangaThemesiaGenerator : ThemeSourceGenerator { SingleLang("Ozul Scans", "https://ozulscans.com", "ar"), SingleLang("Patatescans", "https://patatescans.com", "fr", isNsfw = true, overrideVersionCode = 2), SingleLang("Phantom Scans", "https://phantomscans.com", "en", overrideVersionCode = 1), - SingleLang("Phoenix Fansub", "https://phoenixfansub.com", "es", overrideVersionCode = 2), SingleLang("Pi Scans", "https://piscans.in", "id", overrideVersionCode = 1), SingleLang("PMScans", "https://rackusreads.com", "en", overrideVersionCode = 3), SingleLang("Raiki Scan", "https://raikiscan.com", "es"),