fix three madara sources chapter timestamp & added four more sources to madara (#8054)

* Update Manga4All.kt

* Update Mangafastcom.kt

* Update Manhwa68.kt

* muctau icon

* bump versions and added muctau

* mangacv icon

* mangacv nsfw override

* added mangacv

* mangasmile icon

* Delete multisrc/overrides/madara/zinmanga/src directory

* Delete multisrc/overrides/madara/zintranslator/res directory

* zinmanga/manhwa icons

* Create Zinmanhwa.kt

* added zinmanhwa

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)
 ) {
 
 }

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"),
+    )
+}

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)
 ) {
 
 }

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)
 ) {
 
 }

multisrc/overrides/madara/zinmanga/src/ZinManga.kt

@@ -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/")
-}

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)
+)

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),