From 7b011e1edcf3d3df0543465c6d715b83fecd23b8 Mon Sep 17 00:00:00 2001 From: happywillow0 <45346080+happywillow0@users.noreply.github.com> Date: Tue, 30 Aug 2022 22:36:51 -0400 Subject: [PATCH] Migrate Nocturnal Scans (#13277) Fixes #13273 * Migrates Nocturnal Scans from Madara to MangaThemesia --- .../nocturnalscans/res/mipmap-hdpi/ic_launcher.png | Bin .../nocturnalscans/res/mipmap-mdpi/ic_launcher.png | Bin .../nocturnalscans/res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../nocturnalscans/res/web_hi_res_512.png | Bin .../nocturnalscans/src/NocturnalScans.kt | 7 +++++++ .../tachiyomi/multisrc/madara/MadaraGenerator.kt | 1 - .../mangathemesia/MangaThemesiaGenerator.kt | 1 + 9 files changed, 8 insertions(+), 1 deletion(-) rename multisrc/overrides/{madara => mangathemesia}/nocturnalscans/res/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{madara => mangathemesia}/nocturnalscans/res/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{madara => mangathemesia}/nocturnalscans/res/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{madara => mangathemesia}/nocturnalscans/res/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{madara => mangathemesia}/nocturnalscans/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{madara => mangathemesia}/nocturnalscans/res/web_hi_res_512.png (100%) create mode 100644 multisrc/overrides/mangathemesia/nocturnalscans/src/NocturnalScans.kt diff --git a/multisrc/overrides/madara/nocturnalscans/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/nocturnalscans/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/nocturnalscans/res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/nocturnalscans/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/nocturnalscans/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/nocturnalscans/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/nocturnalscans/res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/nocturnalscans/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/nocturnalscans/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/nocturnalscans/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/nocturnalscans/res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/nocturnalscans/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/nocturnalscans/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/nocturnalscans/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/nocturnalscans/res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/nocturnalscans/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/nocturnalscans/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/nocturnalscans/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/nocturnalscans/res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/nocturnalscans/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/nocturnalscans/res/web_hi_res_512.png b/multisrc/overrides/mangathemesia/nocturnalscans/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/madara/nocturnalscans/res/web_hi_res_512.png rename to multisrc/overrides/mangathemesia/nocturnalscans/res/web_hi_res_512.png diff --git a/multisrc/overrides/mangathemesia/nocturnalscans/src/NocturnalScans.kt b/multisrc/overrides/mangathemesia/nocturnalscans/src/NocturnalScans.kt new file mode 100644 index 000000000..cdbe3f485 --- /dev/null +++ b/multisrc/overrides/mangathemesia/nocturnalscans/src/NocturnalScans.kt @@ -0,0 +1,7 @@ +package eu.kanade.tachiyomi.extension.en.nocturnalscans + +import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia + +class NocturnalScans : MangaThemesia("Nocturnal Scans", "https://nocturnalscans.com", "en", "/MANGA") { + override val hasProjectPage = true +} 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 d75cc61f8..23ea30f6c 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 @@ -368,7 +368,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Ninja Scan", "https://ninjascan.xyz", "pt-BR", overrideVersionCode = 1), SingleLang("Nitro Scans", "https://nitroscans.com", "en"), SingleLang("Noblesse Translations", "https://www.noblessetranslations.com", "es"), - SingleLang("Nocturnal Scans", "https://nocturnalscans.com", "en"), SingleLang("NovelCrow", "https://novelcrow.com", "en", isNsfw = true), SingleLang("NovelMic", "https://novelmic.com", "en", overrideVersionCode = 1), SingleLang("Novels Town", "https://novelstown.cyou", "ar"), 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 7e9a94330..81b62a1ed 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 @@ -70,6 +70,7 @@ class MangaThemesiaGenerator : ThemeSourceGenerator { SingleLang("Mode Scanlator", "https://modescanlator.com", "pt-BR", overrideVersionCode = 8), SingleLang("Nekomik", "https://nekomik.com", "id"), SingleLang("Ngomik", "https://ngomik.net", "id", overrideVersionCode = 1), + SingleLang("Nocturnal Scans", "https://nocturnalscans.com", "en", overrideVersionCode = 1), SingleLang("Non-Stop Scans", "https://www.nonstopscans.com", "en", className = "NonStopScans"), SingleLang("NoxSubs", "https://noxsubs.com", "tr"), SingleLang("Omega Scans", "https://omegascans.org", "en", isNsfw = true),