From c7ad5b9b76d0e581a79af03502c6dda4edb8bd7a Mon Sep 17 00:00:00 2001 From: h-hyuuga <83582211+h-hyuuga@users.noreply.github.com> Date: Thu, 15 Jul 2021 08:47:43 -0400 Subject: [PATCH] migrate to madara (#8123) --- .../seafoamscans/res/mipmap-hdpi/ic_launcher.png | Bin .../seafoamscans/res/mipmap-mdpi/ic_launcher.png | Bin .../seafoamscans/res/mipmap-xhdpi/ic_launcher.png | Bin .../seafoamscans/res/mipmap-xxhdpi/ic_launcher.png | Bin .../seafoamscans/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../seafoamscans/res/web_hi_res_512.png | Bin .../madara/seafoamscans/src/SeafoamScans.kt | 6 ++++++ .../wpmangareader/seafoamscans/src/SeafoamScans.kt | 5 ----- .../tachiyomi/multisrc/madara/MadaraGenerator.kt | 1 + .../wpmangareader/WPMangaReaderGenerator.kt | 1 - 10 files changed, 7 insertions(+), 6 deletions(-) rename multisrc/overrides/{wpmangareader => madara}/seafoamscans/res/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{wpmangareader => madara}/seafoamscans/res/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{wpmangareader => madara}/seafoamscans/res/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{wpmangareader => madara}/seafoamscans/res/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{wpmangareader => madara}/seafoamscans/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{wpmangareader => madara}/seafoamscans/res/web_hi_res_512.png (100%) create mode 100644 multisrc/overrides/madara/seafoamscans/src/SeafoamScans.kt delete mode 100644 multisrc/overrides/wpmangareader/seafoamscans/src/SeafoamScans.kt diff --git a/multisrc/overrides/wpmangareader/seafoamscans/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/seafoamscans/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/wpmangareader/seafoamscans/res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/madara/seafoamscans/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/wpmangareader/seafoamscans/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/seafoamscans/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/wpmangareader/seafoamscans/res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/madara/seafoamscans/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/wpmangareader/seafoamscans/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/seafoamscans/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/wpmangareader/seafoamscans/res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/madara/seafoamscans/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/wpmangareader/seafoamscans/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/seafoamscans/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/wpmangareader/seafoamscans/res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/madara/seafoamscans/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/wpmangareader/seafoamscans/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/seafoamscans/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/wpmangareader/seafoamscans/res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/madara/seafoamscans/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/wpmangareader/seafoamscans/res/web_hi_res_512.png b/multisrc/overrides/madara/seafoamscans/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/wpmangareader/seafoamscans/res/web_hi_res_512.png rename to multisrc/overrides/madara/seafoamscans/res/web_hi_res_512.png diff --git a/multisrc/overrides/madara/seafoamscans/src/SeafoamScans.kt b/multisrc/overrides/madara/seafoamscans/src/SeafoamScans.kt new file mode 100644 index 000000000..07fe15665 --- /dev/null +++ b/multisrc/overrides/madara/seafoamscans/src/SeafoamScans.kt @@ -0,0 +1,6 @@ +package eu.kanade.tachiyomi.extension.en.seafoamscans + +import eu.kanade.tachiyomi.multisrc.madara.Madara +import java.text.SimpleDateFormat + +class SeafoamScans : Madara("Seafoam Scans", "https://seafoamscans.com", "en", SimpleDateFormat("dd/MM/yyyy")) diff --git a/multisrc/overrides/wpmangareader/seafoamscans/src/SeafoamScans.kt b/multisrc/overrides/wpmangareader/seafoamscans/src/SeafoamScans.kt deleted file mode 100644 index 60e1e3672..000000000 --- a/multisrc/overrides/wpmangareader/seafoamscans/src/SeafoamScans.kt +++ /dev/null @@ -1,5 +0,0 @@ -package eu.kanade.tachiyomi.extension.en.seafoamscans - -import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader - -class SeafoamScans : WPMangaReader("Seafoam Scans", "https://seafoamscans.com", "en", "/comic") 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 a9090d8d6..7023e9977 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 @@ -278,6 +278,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Sani-Go", "https://sani-go.net", "ar", className = "SaniGo", overrideVersionCode = 1), SingleLang("Sawamics", "https://sawamics.com", "en"), SingleLang("Scans Raw", "https://scansraw.com", "en"), + SingleLang("Seafoam Scans", "https://seafoamscans.com", "en", overrideVersionCode = 2), SingleLang("Setsu Scans", "https://setsuscans.com", "en", overrideVersionCode = 1), SingleLang("Shield Manga", "https://shieldmanga.club", "en", overrideVersionCode = 2), SingleLang("Shooting Star Scans", "https://shootingstarscans.xyz", "en", overrideVersionCode = 1), diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt index 560b79004..8898e4a99 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt @@ -29,7 +29,6 @@ class WPMangaReaderGenerator : ThemeSourceGenerator { SingleLang("Skull Scans", "https://www.skullscans.com", "en"), SingleLang("Luminous Scans", "https://www.luminousscans.com", "en"), SingleLang("Azure Scans", "https://azuremanga.com", "en"), - SingleLang("Seafoam Scans", "https://seafoamscans.com", "en"), SingleLang("GS Nation", "https://gs-nation.fr", "fr", overrideVersionCode = 1), SingleLang("YugenMangas", "https://yugenmangas.com", "es"), SingleLang("DragonTranslation", "https://dragontranslation.com", "es", isNsfw = true, overrideVersionCode = 1),