diff --git a/multisrc/overrides/madara/bluesolo/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/bluesolo/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..eee3f0f8c Binary files /dev/null and b/multisrc/overrides/madara/bluesolo/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/bluesolo/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/bluesolo/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..2f9e5ad2c Binary files /dev/null and b/multisrc/overrides/madara/bluesolo/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/bluesolo/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/bluesolo/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..3e672d550 Binary files /dev/null and b/multisrc/overrides/madara/bluesolo/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/bluesolo/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/bluesolo/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..a621b572f Binary files /dev/null and b/multisrc/overrides/madara/bluesolo/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/bluesolo/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/bluesolo/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..221931fe1 Binary files /dev/null and b/multisrc/overrides/madara/bluesolo/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/bluesolo/res/web_hi_res_512.png b/multisrc/overrides/madara/bluesolo/res/web_hi_res_512.png new file mode 100644 index 000000000..e3f91b4ed Binary files /dev/null and b/multisrc/overrides/madara/bluesolo/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/madara/bluesolo/src/BlueSolo.kt b/multisrc/overrides/madara/bluesolo/src/BlueSolo.kt new file mode 100644 index 000000000..03b1e65c4 --- /dev/null +++ b/multisrc/overrides/madara/bluesolo/src/BlueSolo.kt @@ -0,0 +1,9 @@ +package eu.kanade.tachiyomi.extension.fr.bluesolo + +import eu.kanade.tachiyomi.multisrc.madara.Madara +import java.text.SimpleDateFormat +import java.util.Locale + +class BlueSolo : Madara("Blue Solo", "https://www1.bluesolo.org", "fr", dateFormat = SimpleDateFormat("d MMMM yyyy", Locale.FRENCH)) { + override val mangaDetailsSelectorStatus = "div.summary-heading:contains(Statut) + .summary-content" +} diff --git a/multisrc/overrides/madara/hentaiscantrad/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/hentaiscantrad/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..b849c79b0 Binary files /dev/null and b/multisrc/overrides/madara/hentaiscantrad/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/hentaiscantrad/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/hentaiscantrad/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..2a4b44314 Binary files /dev/null and b/multisrc/overrides/madara/hentaiscantrad/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/hentaiscantrad/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/hentaiscantrad/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..e68e9d65d Binary files /dev/null and b/multisrc/overrides/madara/hentaiscantrad/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/hentaiscantrad/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/hentaiscantrad/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..2f84c7c2c Binary files /dev/null and b/multisrc/overrides/madara/hentaiscantrad/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/hentaiscantrad/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/hentaiscantrad/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..87704c21e Binary files /dev/null and b/multisrc/overrides/madara/hentaiscantrad/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/hentaiscantrad/res/web_hi_res_512.png b/multisrc/overrides/madara/hentaiscantrad/res/web_hi_res_512.png new file mode 100644 index 000000000..5302c3131 Binary files /dev/null and b/multisrc/overrides/madara/hentaiscantrad/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/madara/pantheonscan/src/PantheonScan.kt b/multisrc/overrides/madara/pantheonscan/src/PantheonScan.kt index 45b2fa7b5..da7ac93fd 100644 --- a/multisrc/overrides/madara/pantheonscan/src/PantheonScan.kt +++ b/multisrc/overrides/madara/pantheonscan/src/PantheonScan.kt @@ -4,6 +4,6 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -class PantheonScan : Madara("Pantheon Scan", "https://pantheon-scan.com", "fr", dateFormat = SimpleDateFormat("dd/mm/yyyy", Locale.FRANCE)) { +class PantheonScan : Madara("Pantheon Scan", "https://pantheon-scan.com", "fr", dateFormat = SimpleDateFormat("d MMMM yyyy", Locale.FRANCE)) { override val useNewChapterEndpoint = true } diff --git a/multisrc/overrides/madara/scanhentaimenu/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/scanhentaimenu/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..3920023c0 Binary files /dev/null and b/multisrc/overrides/madara/scanhentaimenu/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/scanhentaimenu/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/scanhentaimenu/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..c995dcc72 Binary files /dev/null and b/multisrc/overrides/madara/scanhentaimenu/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/scanhentaimenu/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/scanhentaimenu/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..104cbedf1 Binary files /dev/null and b/multisrc/overrides/madara/scanhentaimenu/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/scanhentaimenu/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/scanhentaimenu/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..2d61561eb Binary files /dev/null and b/multisrc/overrides/madara/scanhentaimenu/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/scanhentaimenu/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/scanhentaimenu/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..15867a3fb Binary files /dev/null and b/multisrc/overrides/madara/scanhentaimenu/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/scanhentaimenu/res/web_hi_res_512.png b/multisrc/overrides/madara/scanhentaimenu/res/web_hi_res_512.png new file mode 100644 index 000000000..f43dc1b8d Binary files /dev/null and b/multisrc/overrides/madara/scanhentaimenu/res/web_hi_res_512.png differ diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt index d82a085a7..bd85da781 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt @@ -534,6 +534,7 @@ abstract class Madara( "Concluído", "Concluido", "Finalizado", + "Achevé", "Terminé", "Hoàn Thành", "مكتملة", @@ -543,7 +544,7 @@ abstract class Madara( protected val ongoingStatusList: Array = arrayOf( "OnGoing", "Продолжается", "Updating", "Em Lançamento", "Em lançamento", "Em andamento", - "Em Andamento", "En cours", "Ativo", "Lançando", "Đang Tiến Hành", "Devam Ediyor", + "Em Andamento", "En cours", "En cours de publication", "Ativo", "Lançando", "Đang Tiến Hành", "Devam Ediyor", "Devam ediyor", "In Corso", "In Arrivo", "مستمرة", "مستمر", "En Curso", "En curso", "Emision", "Curso", "En marcha", "Publicandose", "En emision", "连载中", ) 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 2a0580efc..253f1883a 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 @@ -54,6 +54,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Bichen Traduções", "https://bichentraducoes.com", "pt-BR", isNsfw = true, className = "BichenTraducoes"), SingleLang("BL Manhwa Club", "https://blmanhwa.club", "pt-BR", isNsfw = true, className = "BlManhwaClub", overrideVersionCode = 2), SingleLang("BlogManga", "https://blogmanga.net", "en"), + SingleLang("Blue Solo", "https://www1.bluesolo.org", "fr", isNsfw = true), SingleLang("BokugenTranslation", "https://bokugents.com", "es", overrideVersionCode = 1), SingleLang("Boruto Explorer", "https://leitor.borutoexplorer.com.br", "pt-BR", overrideVersionCode = 1), SingleLang("BoysLove", "https://boyslove.me", "en", isNsfw = true, overrideVersionCode = 3), @@ -129,6 +130,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Hentai Teca", "https://hentaiteca.net", "pt-BR", isNsfw = true, overrideVersionCode = 1), SingleLang("Hentai20", "https://hentai20.io", "en", isNsfw = true, overrideVersionCode = 3), SingleLang("HentaiRead", "https://hentairead.com", "en", isNsfw = true, className = "Hentairead", overrideVersionCode = 3), + SingleLang("Hentai-Scantrad", "https://hentai.scantrad-vf.cc", "fr", isNsfw = true, className = "HentaiScantrad"), SingleLang("HentaiWebtoon", "https://hentaiwebtoon.com", "en", isNsfw = true, overrideVersionCode = 1), SingleLang("HentaiXComic", "https://hentaixcomic.com", "en", isNsfw = true), SingleLang("HentaiXYuri", "https://hentaixyuri.com", "en", isNsfw = true), @@ -333,7 +335,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Novels Town", "https://novelstown.cyou", "ar"), SingleLang("Oh No Manga", "https://ohnomanga.com", "en", isNsfw = true), SingleLang("Painful Nightz Scan", "https://painfulnightz.com", "en", overrideVersionCode = 1), - SingleLang("Pantheon Scan", "https://pantheon-scan.com", "fr"), + SingleLang("Pantheon Scan", "https://pantheon-scan.com", "fr", 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"), @@ -373,6 +375,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("SamuraiScan", "https://samuraiscan.com", "es", overrideVersionCode = 1), SingleLang("Sawamics", "https://sawamics.com", "en"), SingleLang("ScamberTraslator", "https://scambertraslator.com", "es", overrideVersionCode = 3), + SingleLang("Scan Hentai Menu", "https://scan.hentai.menu", "fr", isNsfw = true), SingleLang("Scans Raw", "https://scansraw.com", "en", overrideVersionCode = 1), SingleLang("Scantrad-VF", "https://scantrad-vf.co", "fr", className = "ScantradVF"), SingleLang("Sdl scans", "https://sdlscans.com", "es", className = "SdlScans"),