diff --git a/multisrc/overrides/madara/hikariscan/src/HikariScan.kt b/multisrc/overrides/madara/hikariscan/src/HikariScan.kt deleted file mode 100644 index 5c9f4a38a..000000000 --- a/multisrc/overrides/madara/hikariscan/src/HikariScan.kt +++ /dev/null @@ -1,21 +0,0 @@ -package eu.kanade.tachiyomi.extension.pt.hikariscan - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import okhttp3.OkHttpClient -import java.text.SimpleDateFormat -import java.util.Locale - -class HikariScan : Madara( - "HikariScan", - "https://hikariscan.org", - "pt-BR", - SimpleDateFormat("dd/MM/yyyy", Locale("pt", "BR")), -) { - - override val client: OkHttpClient = super.client.newBuilder() - .build() - - override val useNewChapterEndpoint = true - - override val popularMangaUrlSelector = "div.post-title a:last-child" -} diff --git a/multisrc/overrides/madara/hikariscan/res/drawable/ic_launcher_background.xml b/multisrc/overrides/mangathemesia/hikariscan/res/drawable/ic_launcher_background.xml similarity index 100% rename from multisrc/overrides/madara/hikariscan/res/drawable/ic_launcher_background.xml rename to multisrc/overrides/mangathemesia/hikariscan/res/drawable/ic_launcher_background.xml diff --git a/multisrc/overrides/madara/hikariscan/res/mipmap-anydpi-v26/ic_launcher.xml b/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from multisrc/overrides/madara/hikariscan/res/mipmap-anydpi-v26/ic_launcher.xml rename to multisrc/overrides/mangathemesia/hikariscan/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/multisrc/overrides/madara/hikariscan/res/mipmap-anydpi-v26/ic_launcher_round.xml b/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from multisrc/overrides/madara/hikariscan/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to multisrc/overrides/mangathemesia/hikariscan/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/multisrc/overrides/madara/hikariscan/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/hikariscan/res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/hikariscan/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/hikariscan/res/mipmap-hdpi/ic_launcher_foreground.png b/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-hdpi/ic_launcher_foreground.png similarity index 100% rename from multisrc/overrides/madara/hikariscan/res/mipmap-hdpi/ic_launcher_foreground.png rename to multisrc/overrides/mangathemesia/hikariscan/res/mipmap-hdpi/ic_launcher_foreground.png diff --git a/multisrc/overrides/madara/hikariscan/res/mipmap-hdpi/ic_launcher_round.png b/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from multisrc/overrides/madara/hikariscan/res/mipmap-hdpi/ic_launcher_round.png rename to multisrc/overrides/mangathemesia/hikariscan/res/mipmap-hdpi/ic_launcher_round.png diff --git a/multisrc/overrides/madara/hikariscan/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/hikariscan/res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/hikariscan/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/hikariscan/res/mipmap-mdpi/ic_launcher_foreground.png b/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-mdpi/ic_launcher_foreground.png similarity index 100% rename from multisrc/overrides/madara/hikariscan/res/mipmap-mdpi/ic_launcher_foreground.png rename to multisrc/overrides/mangathemesia/hikariscan/res/mipmap-mdpi/ic_launcher_foreground.png diff --git a/multisrc/overrides/madara/hikariscan/res/mipmap-mdpi/ic_launcher_round.png b/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from multisrc/overrides/madara/hikariscan/res/mipmap-mdpi/ic_launcher_round.png rename to multisrc/overrides/mangathemesia/hikariscan/res/mipmap-mdpi/ic_launcher_round.png diff --git a/multisrc/overrides/madara/hikariscan/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/hikariscan/res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/hikariscan/res/mipmap-xhdpi/ic_launcher_foreground.png b/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xhdpi/ic_launcher_foreground.png similarity index 100% rename from multisrc/overrides/madara/hikariscan/res/mipmap-xhdpi/ic_launcher_foreground.png rename to multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/multisrc/overrides/madara/hikariscan/res/mipmap-xhdpi/ic_launcher_round.png b/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from multisrc/overrides/madara/hikariscan/res/mipmap-xhdpi/ic_launcher_round.png rename to multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/multisrc/overrides/madara/hikariscan/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/hikariscan/res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/hikariscan/res/mipmap-xxhdpi/ic_launcher_foreground.png b/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xxhdpi/ic_launcher_foreground.png similarity index 100% rename from multisrc/overrides/madara/hikariscan/res/mipmap-xxhdpi/ic_launcher_foreground.png rename to multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/multisrc/overrides/madara/hikariscan/res/mipmap-xxhdpi/ic_launcher_round.png b/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from multisrc/overrides/madara/hikariscan/res/mipmap-xxhdpi/ic_launcher_round.png rename to multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/multisrc/overrides/madara/hikariscan/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/hikariscan/res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/hikariscan/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xxxhdpi/ic_launcher_foreground.png similarity index 100% rename from multisrc/overrides/madara/hikariscan/res/mipmap-xxxhdpi/ic_launcher_foreground.png rename to multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/multisrc/overrides/madara/hikariscan/res/mipmap-xxxhdpi/ic_launcher_round.png b/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from multisrc/overrides/madara/hikariscan/res/mipmap-xxxhdpi/ic_launcher_round.png rename to multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/multisrc/overrides/madara/hikariscan/res/web_hi_res_512.png b/multisrc/overrides/mangathemesia/hikariscan/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/madara/hikariscan/res/web_hi_res_512.png rename to multisrc/overrides/mangathemesia/hikariscan/res/web_hi_res_512.png diff --git a/multisrc/overrides/mangathemesia/hikariscan/src/HikariScan.kt b/multisrc/overrides/mangathemesia/hikariscan/src/HikariScan.kt new file mode 100644 index 000000000..4a503c046 --- /dev/null +++ b/multisrc/overrides/mangathemesia/hikariscan/src/HikariScan.kt @@ -0,0 +1,23 @@ +package eu.kanade.tachiyomi.extension.pt.hikariscan + +import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia +import okhttp3.OkHttpClient +import java.text.SimpleDateFormat +import java.util.Locale + +class HikariScan : MangaThemesia( + "Hikari Scan", + "https://hikariscan.org", + "pt-BR", + dateFormat = SimpleDateFormat("MMMMM dd, yyyy", Locale("pt", "BR")), +) { + + override val client: OkHttpClient = super.client.newBuilder() + .build() + + override val altNamePrefix = "Nomes alternativos: " + + override val seriesArtistSelector = ".tsinfo .imptdt:contains(Artista) > i" + override val seriesAuthorSelector = ".tsinfo .imptdt:contains(Autor) > i" + override val seriesTypeSelector = ".tsinfo .imptdt:contains(Tipo) > a" +} 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 17357a7fd..3bec43fe7 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 @@ -15,11 +15,9 @@ class MadaraGenerator : ThemeSourceGenerator { override val sources = listOf( // Extenções Minhas: - SingleLang("Hikari Scan", "https://hikariscan.org", "pt-BR", isNsfw = true, overrideVersionCode = 4), SingleLang("Hunters Scan", "https://huntersscan.xyz", "pt-BR", isNsfw = true, overrideVersionCode = 2), // Extenções Modificadas: - SingleLang("Momo no Hana Scan", "https://momonohanascan.com", "pt-BR", className = "MomoNoHanaScan", overrideVersionCode = 2), SingleLang("Zero Scan", "https://zeroscan.com.br", "pt-BR", isNsfw = true, overrideVersionCode = 1), SingleLang("Drope Scan", "https://dropescan.com", "pt-BR", overrideVersionCode = 5), 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 585dac6d2..8cf266946 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 @@ -15,7 +15,7 @@ class MangaThemesiaGenerator : ThemeSourceGenerator { override val sources = listOf( // Extenções Modificadas: - + SingleLang("Hikari Scan", "https://hikariscan.org", "pt-BR", isNsfw = true), SingleLang("Mundo Mangá-Kun", "https://mundomangakun.com.br", "pt-BR", className = "MundoMangaKun", isNsfw = true, overrideVersionCode = 1), SingleLang("Mangás Chan", "https://mangaschan.com", "pt-BR", className = "MangasChan", overrideVersionCode = 1), SingleLang("Silence Scan", "https://silencescan.com.br", "pt-BR", isNsfw = true, overrideVersionCode = 6),