diff --git a/multisrc/overrides/madara/manga4all/src/Manga4All.kt b/multisrc/overrides/madara/manga4all/src/Manga4All.kt index df0d867a5..29bf0ac85 100644 --- a/multisrc/overrides/madara/manga4all/src/Manga4All.kt +++ b/multisrc/overrides/madara/manga4all/src/Manga4All.kt @@ -8,7 +8,7 @@ class Manga4All : Madara( "Manga4All", "https://manga4all.net", "en", - dateFormat = SimpleDateFormat("d MMM yyyy ", Locale.US) + dateFormat = SimpleDateFormat("d MMM yyyy", Locale.US) ) { } diff --git a/multisrc/overrides/madara/mangacv/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/mangacv/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..c4eb5c816 Binary files /dev/null and b/multisrc/overrides/madara/mangacv/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangacv/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/mangacv/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..4669618f7 Binary files /dev/null and b/multisrc/overrides/madara/mangacv/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangacv/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/mangacv/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..576850559 Binary files /dev/null and b/multisrc/overrides/madara/mangacv/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangacv/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangacv/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..394f9d358 Binary files /dev/null and b/multisrc/overrides/madara/mangacv/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangacv/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangacv/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..676a2b4f9 Binary files /dev/null and b/multisrc/overrides/madara/mangacv/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangacv/res/web_hi_res_512.png b/multisrc/overrides/madara/mangacv/res/web_hi_res_512.png new file mode 100644 index 000000000..69f7e480a Binary files /dev/null and b/multisrc/overrides/madara/mangacv/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/madara/mangacv/src/MangaCV.kt b/multisrc/overrides/madara/mangacv/src/MangaCV.kt new file mode 100644 index 000000000..c69f2d336 --- /dev/null +++ b/multisrc/overrides/madara/mangacv/src/MangaCV.kt @@ -0,0 +1,48 @@ +package eu.kanade.tachiyomi.extension.en.mangacv + +import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara + +@Nsfw +class MangaCV : Madara("MangaCV", "https://mangacv.com", "en") { + + override fun getGenreList() = listOf( + Genre("Action", "action"), + Genre("Adult", "adult"), + Genre("Adventure", "adventure"), + Genre("Comedy", "comedy"), + Genre("Doujinshi", "doujinshi"), + Genre("Drama", "drama"), + Genre("Ecchi", "ecchi"), + Genre("Fanstasy", "fantasy"), + Genre("Gender bender", "gender-bender"), + Genre("Harem", "harem"), + Genre("Historical", "historical"), + Genre("Horror", "horror"), + Genre("Josei", "josei"), + Genre("Lolicon", "lolicon"), + Genre("Martial arts", "martial-arts"), + Genre("Mature", "mature"), + Genre("Mecha", "mecha"), + Genre("Medical", "medical"), + Genre("Mystery", "mystery"), + Genre("One shot", "one-shot"), + Genre("Psychological", "psychological"), + Genre("Romance", "romance"), + Genre("School Life", "school-life"), + Genre("Sci-fi", "sci-fi"), + Genre("Seinen", "seinen"), + Genre("Shoujo", "shoujo"), + Genre("Shoujo ai", "shoujo-ai"), + Genre("Shounen", "shounen"), + Genre("Shounen ai", "shounen-ai"), + Genre("Slice of Life", "slice-of-life"), + Genre("Smut", "smut"), + Genre("Sports", "sports"), + Genre("Supernatural", "supernatural"), + Genre("Tragedy", "tragedy"), + Genre("Webtoons", "webtoons"), + Genre("Yaoi", "yaoi"), + Genre("Yuri", "yuri"), + ) +} diff --git a/multisrc/overrides/madara/mangafastcom/src/Mangafastcom.kt b/multisrc/overrides/madara/mangafastcom/src/Mangafastcom.kt index c9228897e..b581c7b42 100644 --- a/multisrc/overrides/madara/mangafastcom/src/Mangafastcom.kt +++ b/multisrc/overrides/madara/mangafastcom/src/Mangafastcom.kt @@ -8,7 +8,7 @@ class Mangafastcom : Madara( "Manga-fast.com", "https://manga-fast.com", "en", - dateFormat = SimpleDateFormat("dd MMM yyyy ", Locale.US) + dateFormat = SimpleDateFormat("dd MMM yyyy", Locale.US) ) { } diff --git a/multisrc/overrides/madara/mangasmile/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/mangasmile/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..d5f426c06 Binary files /dev/null and b/multisrc/overrides/madara/mangasmile/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangasmile/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/mangasmile/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..063c457b1 Binary files /dev/null and b/multisrc/overrides/madara/mangasmile/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangasmile/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/mangasmile/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..6bff71acd Binary files /dev/null and b/multisrc/overrides/madara/mangasmile/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangasmile/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangasmile/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..c4720f159 Binary files /dev/null and b/multisrc/overrides/madara/mangasmile/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangasmile/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangasmile/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..89e6b68e5 Binary files /dev/null and b/multisrc/overrides/madara/mangasmile/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangasmile/res/web_hi_res_512.png b/multisrc/overrides/madara/mangasmile/res/web_hi_res_512.png new file mode 100644 index 000000000..2046cfbad Binary files /dev/null and b/multisrc/overrides/madara/mangasmile/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/madara/manhwa68/src/Manhwa68.kt b/multisrc/overrides/madara/manhwa68/src/Manhwa68.kt index 481873cf8..5e94d2e28 100644 --- a/multisrc/overrides/madara/manhwa68/src/Manhwa68.kt +++ b/multisrc/overrides/madara/manhwa68/src/Manhwa68.kt @@ -10,7 +10,7 @@ class Manhwa68 : Madara( "Manhwa68", "https://manhwa68.com", "en", - dateFormat = SimpleDateFormat("MMM d yyyy ", Locale.US) + dateFormat = SimpleDateFormat("MMM d yyyy", Locale.US) ) { } diff --git a/multisrc/overrides/madara/muctau/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/muctau/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..aa256ef92 Binary files /dev/null and b/multisrc/overrides/madara/muctau/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/muctau/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/muctau/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..e65021082 Binary files /dev/null and b/multisrc/overrides/madara/muctau/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/muctau/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/muctau/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..39f2b734c Binary files /dev/null and b/multisrc/overrides/madara/muctau/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/muctau/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/muctau/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..e986dfbbd Binary files /dev/null and b/multisrc/overrides/madara/muctau/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/muctau/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/muctau/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..badb982b4 Binary files /dev/null and b/multisrc/overrides/madara/muctau/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/muctau/res/web_hi_res_512.png b/multisrc/overrides/madara/muctau/res/web_hi_res_512.png new file mode 100644 index 000000000..025372bc0 Binary files /dev/null and b/multisrc/overrides/madara/muctau/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/madara/zinmanga/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/zinmanga/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..4f44f2c34 Binary files /dev/null and b/multisrc/overrides/madara/zinmanga/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/zinmanga/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/zinmanga/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..fb6c14fc0 Binary files /dev/null and b/multisrc/overrides/madara/zinmanga/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/zinmanga/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/zinmanga/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..84a36fd40 Binary files /dev/null and b/multisrc/overrides/madara/zinmanga/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/zinmanga/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/zinmanga/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..9a619af8c Binary files /dev/null and b/multisrc/overrides/madara/zinmanga/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/zinmanga/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/zinmanga/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..33552655d Binary files /dev/null and b/multisrc/overrides/madara/zinmanga/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/zinmanga/res/web_hi_res_512.png b/multisrc/overrides/madara/zinmanga/res/web_hi_res_512.png new file mode 100644 index 000000000..74f742c4a Binary files /dev/null and b/multisrc/overrides/madara/zinmanga/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/madara/zinmanga/src/ZinManga.kt b/multisrc/overrides/madara/zinmanga/src/ZinManga.kt deleted file mode 100644 index 6c08e3c1d..000000000 --- a/multisrc/overrides/madara/zinmanga/src/ZinManga.kt +++ /dev/null @@ -1,9 +0,0 @@ -package eu.kanade.tachiyomi.extension.en.zinmanga - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import okhttp3.Headers - -class ZinManga : Madara("Zin Translator", "https://zinmanga.com", "en") { - override fun headersBuilder(): Headers.Builder = super.headersBuilder() - .add("Referer", "https://zinmanga.com/") -} diff --git a/multisrc/overrides/madara/zinmanhwa/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/zinmanhwa/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..4f44f2c34 Binary files /dev/null and b/multisrc/overrides/madara/zinmanhwa/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/zinmanhwa/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/zinmanhwa/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..fb6c14fc0 Binary files /dev/null and b/multisrc/overrides/madara/zinmanhwa/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/zinmanhwa/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/zinmanhwa/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..84a36fd40 Binary files /dev/null and b/multisrc/overrides/madara/zinmanhwa/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/zinmanhwa/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/zinmanhwa/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..9a619af8c Binary files /dev/null and b/multisrc/overrides/madara/zinmanhwa/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/zinmanhwa/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/zinmanhwa/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..33552655d Binary files /dev/null and b/multisrc/overrides/madara/zinmanhwa/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/zinmanhwa/res/web_hi_res_512.png b/multisrc/overrides/madara/zinmanhwa/res/web_hi_res_512.png new file mode 100644 index 000000000..74f742c4a Binary files /dev/null and b/multisrc/overrides/madara/zinmanhwa/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/madara/zinmanhwa/src/Zinmanhwa.kt b/multisrc/overrides/madara/zinmanhwa/src/Zinmanhwa.kt new file mode 100644 index 000000000..acd5d725d --- /dev/null +++ b/multisrc/overrides/madara/zinmanhwa/src/Zinmanhwa.kt @@ -0,0 +1,12 @@ +package eu.kanade.tachiyomi.extension.en.zinmanhwa + +import eu.kanade.tachiyomi.multisrc.madara.Madara +import java.text.SimpleDateFormat +import java.util.Locale + +class Zinmanhwa : Madara( + "Zinmanhwa", + "https://zinmanhwa.com", + "en", + dateFormat = SimpleDateFormat("dd/MM/yy", Locale.US) +) diff --git a/multisrc/overrides/madara/zintranslator/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/zintranslator/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 2a617d5a4..000000000 Binary files a/multisrc/overrides/madara/zintranslator/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/zintranslator/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/zintranslator/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index f04158baa..000000000 Binary files a/multisrc/overrides/madara/zintranslator/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/zintranslator/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/zintranslator/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index de02b53a3..000000000 Binary files a/multisrc/overrides/madara/zintranslator/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/zintranslator/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/zintranslator/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index afe749208..000000000 Binary files a/multisrc/overrides/madara/zintranslator/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/zintranslator/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/zintranslator/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 2d6ca6642..000000000 Binary files a/multisrc/overrides/madara/zintranslator/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/zintranslator/res/web_hi_res_512.png b/multisrc/overrides/madara/zintranslator/res/web_hi_res_512.png deleted file mode 100644 index 5c1d25eb8..000000000 Binary files a/multisrc/overrides/madara/zintranslator/res/web_hi_res_512.png and /dev/null differ 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 706de3908..cacbd0317 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 @@ -150,16 +150,17 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Manga1st.online", "https://manga1st.online", "en", className = "MangaFirstOnline", overrideVersionCode = 1), SingleLang("Manga347", "https://manga347.com", "en", overrideVersionCode = 3), SingleLang("Manga3S", "https://manga3s.com", "en", overrideVersionCode = 1), - SingleLang("Manga4All", "https://manga4all.net", "en", overrideVersionCode = 2), + SingleLang("Manga4All", "https://manga4all.net", "en", overrideVersionCode = 3), SingleLang("Manga68", "https://manga68.com", "en", overrideVersionCode = 1), SingleLang("MangaBaz", "https://mangabaz.com", "tr"), SingleLang("MangaBob", "https://mangabob.com", "en", overrideVersionCode = 1), SingleLang("MangaBox", "https://mangabox.org", "en"), SingleLang("MangaClash", "https://mangaclash.com", "en", overrideVersionCode = 3), SingleLang("MangaCultivator", "https://mangacultivator.com", "en", overrideVersionCode = 1), + SingleLang("MangaCV", "https://mangacv.com", "en", isNsfw = true), SingleLang("MangaDods", "https://www.mangadods.com", "en", overrideVersionCode = 2), SingleLang("MangaEffect", "https://mangaeffect.com", "en", overrideVersionCode = 1), - SingleLang("Manga-fast.com", "https://manga-fast.com", "en", className = "Mangafastcom"), + SingleLang("Manga-fast.com", "https://manga-fast.com", "en", className = "Mangafastcom", overrideVersionCode = 1), SingleLang("MangaFort", "https://mangafort.com", "en"), SingleLang("MangaFoxFull", "https://mangafoxfull.com", "en"), SingleLang("MangaGreat", "https://mangagreat.com", "en", overrideVersionCode = 1), @@ -212,7 +213,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Manhwaraw.net", "https://manhwaraw.net", "en", className = "Manhwarawnet"), SingleLang("Manhwa.club", "https://manhwa.club", "en", className="ManwhaClub", overrideVersionCode = 2), // wrong class name for backward compatibility SingleLang("Manhwa18.org", "https://manhwa18.org", "en", isNsfw = true, className = "Manhwa18Org", overrideVersionCode = 1), - SingleLang("Manhwa68", "https://manhwa68.com", "en", isNsfw = true), + SingleLang("Manhwa68", "https://manhwa68.com", "en", isNsfw = true, overrideVersionCode = 1), SingleLang("ManhwaBookShelf", "https://manhwabookshelf.com", "en"), SingleLang("Manhwafull", "https://manhwafull.com", "en"), SingleLang("ManhwaNelo", "https://manhwanelo.com", "en"), @@ -232,6 +233,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Mode Scanlator", "https://modescanlator.com", "pt-BR", overrideVersionCode = 1), SingleLang("Moon Witch In Love", "https://moonwitchinlove.com", "pt-BR"), SingleLang("Mortals Groove", "https://mortalsgroove.com", "en"), + SingleLang("Muctau", "https://muctau.com", "en"), SingleLang("Mystical Merries", "https://mysticalmerries.com", "en", overrideVersionCode = 1), SingleLang("NeatManga", "https://neatmanga.com", "en", overrideVersionCode = 1), SingleLang("NekoScan", "https://nekoscan.com", "en", overrideVersionCode = 1), @@ -322,7 +324,8 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Yaoi.mobi", "https://yaoi.mobi", "en", isNsfw = true, className = "YaoiManga", pkgName = "yaoimanga", overrideVersionCode = 4), SingleLang("Yaoi Toshokan", "https://yaoitoshokan.net", "pt-BR", isNsfw = true, overrideVersionCode = 2), SingleLang("Yuri Verso", "https://yuri.live", "pt-BR", overrideVersionCode = 2), - SingleLang("Zin Translator", "https://zinmanga.com", "en", overrideVersionCode = 1), + SingleLang("Zinmanga", "https://zinmanga.com", "en"), + SingleLang("Zinmanhwa", "https://zinmanhwa.com", "en"), SingleLang("ZuttoManga", "https://zuttomanga.com", "en"), SingleLang("شبكة كونان العربية", "https://www.manga.detectiveconanar.com", "ar", className = "DetectiveConanAr", overrideVersionCode = 1), SingleLang("مانجا العاشق", "https://3asq.org", "ar", className = "Manga3asq", overrideVersionCode = 1),