diff --git a/common.gradle b/common.gradle index 89ed95806..2a7ff1aff 100644 --- a/common.gradle +++ b/common.gradle @@ -6,6 +6,8 @@ apply plugin: 'org.jmailen.kotlinter' assert !ext.has("pkgNameSuffix") assert !ext.has("libVersion") +assert extName.chars().max().asInt < 0x180 : "Extension name should be romanized" + android { compileSdk AndroidConfig.compileSdk diff --git a/multisrc/overrides/madara/falconmanga/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/falconmanga/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 95bdbee52..000000000 Binary files a/multisrc/overrides/madara/falconmanga/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/falconmanga/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/falconmanga/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index fcbc380af..000000000 Binary files a/multisrc/overrides/madara/falconmanga/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/falconmanga/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/falconmanga/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 4dd12c2f5..000000000 Binary files a/multisrc/overrides/madara/falconmanga/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/falconmanga/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/falconmanga/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 46d634b90..000000000 Binary files a/multisrc/overrides/madara/falconmanga/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/falconmanga/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/falconmanga/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 004a8231c..000000000 Binary files a/multisrc/overrides/madara/falconmanga/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/falconmanga/src/FalconManga.kt b/multisrc/overrides/madara/falconmanga/src/FalconManga.kt deleted file mode 100644 index 8f2069dad..000000000 --- a/multisrc/overrides/madara/falconmanga/src/FalconManga.kt +++ /dev/null @@ -1,22 +0,0 @@ -package eu.kanade.tachiyomi.extension.ar.falconmanga - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import java.text.SimpleDateFormat -import java.util.Locale - -class FalconManga : Madara( - "فالكون مانجا", - "https://falconmanga.com", - "ar", - dateFormat = SimpleDateFormat("dd MMMM، yyyy", Locale("ar")), -) { - override val useNewChapterEndpoint = true - - override fun searchPage(page: Int): String { - return if (page > 1) { - "page/$page/" - } else { - "" - } - } -} diff --git a/multisrc/overrides/madara/mangaleks/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/mangaleks/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 348915430..000000000 Binary files a/multisrc/overrides/madara/mangaleks/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangaleks/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/mangaleks/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 345012bc3..000000000 Binary files a/multisrc/overrides/madara/mangaleks/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangaleks/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/mangaleks/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 2e7af18d5..000000000 Binary files a/multisrc/overrides/madara/mangaleks/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangaleks/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangaleks/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 7ae8ef32a..000000000 Binary files a/multisrc/overrides/madara/mangaleks/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangaleks/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangaleks/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 884307091..000000000 Binary files a/multisrc/overrides/madara/mangaleks/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangaleks/src/MangaLeks.kt b/multisrc/overrides/madara/mangaleks/src/MangaLeks.kt deleted file mode 100644 index c17a92efb..000000000 --- a/multisrc/overrides/madara/mangaleks/src/MangaLeks.kt +++ /dev/null @@ -1,20 +0,0 @@ -package eu.kanade.tachiyomi.extension.ar.mangaleks - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import java.text.SimpleDateFormat -import java.util.Locale - -class MangaLeks : Madara( - "مانجا ليكس", - "https://mangaleks.com", - "ar", - SimpleDateFormat("dd/MM/yyyy", Locale.ENGLISH), -) { - override fun searchPage(page: Int): String { - return if (page > 1) { - "page/$page/" - } else { - "" - } - } -} diff --git a/multisrc/overrides/madara/mangalinkio/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/mangalinkio/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index cbfd334f6..000000000 Binary files a/multisrc/overrides/madara/mangalinkio/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangalinkio/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/mangalinkio/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 2855d0d98..000000000 Binary files a/multisrc/overrides/madara/mangalinkio/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangalinkio/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/mangalinkio/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index f33b177df..000000000 Binary files a/multisrc/overrides/madara/mangalinkio/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangalinkio/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangalinkio/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 295d50f82..000000000 Binary files a/multisrc/overrides/madara/mangalinkio/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangalinkio/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangalinkio/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 63e01f0a3..000000000 Binary files a/multisrc/overrides/madara/mangalinkio/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangalinkio/src/MangaLinkio.kt b/multisrc/overrides/madara/mangalinkio/src/MangaLinkio.kt deleted file mode 100644 index 76bd09fa7..000000000 --- a/multisrc/overrides/madara/mangalinkio/src/MangaLinkio.kt +++ /dev/null @@ -1,8 +0,0 @@ -package eu.kanade.tachiyomi.extension.ar.mangalinkio - -import eu.kanade.tachiyomi.multisrc.madara.Madara - -class MangaLinkio : Madara("مانجا لينك", "https://mangalink.io", "ar") { - - override val chapterUrlSuffix = "" -} diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/flixscans/FlixScansGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/flixscans/FlixScansGenerator.kt index 85e1a3ed4..e6cdbbcb1 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/flixscans/FlixScansGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/flixscans/FlixScansGenerator.kt @@ -13,7 +13,7 @@ class FlixScansGenerator : ThemeSourceGenerator { override val sources = listOf( SingleLang("Flix Scans", "https://flixscans.org", "en", className = "FlixScansNet", pkgName = "flixscans"), - SingleLang("جالاكسي مانجا", "https://flixscans.com", "ar", className = "GalaxyManga", overrideVersionCode = 26), + SingleLang("Galaxy Manga", "https://flixscans.com", "ar", sourceName = "جالاكسي مانجا", overrideVersionCode = 26), ) companion object { 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 580ad18e1..b0023d398 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 @@ -485,14 +485,11 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Zinmanhwa", "https://zinmanhwa.com", "en"), SingleLang("ZuttoManga", "https://zuttomanga.com", "en", overrideVersionCode = 1), SingleLang("Çizgi Roman Arşivi", "https://cizgiromanarsivi.com", "tr", className = "CizgiRomanArsivi"), - SingleLang("شبكة كونان العربية", "https://manga.detectiveconanar.com", "ar", className = "DetectiveConanAr", overrideVersionCode = 2), - SingleLang("عرب تونز", "https://arabtoons.net", "ar", isNsfw = true, className = "ArabToons"), - SingleLang("فالكون مانجا", "https://falconmanga.com", "ar", className = "FalconManga"), - SingleLang("كوميك العرب", "https://comicarab.com", "ar", isNsfw = true, className = "ComicArab"), - SingleLang("مانجا العاشق", "https://3asq.org", "ar", className = "Manga3asq", overrideVersionCode = 2), - SingleLang("مانجا ليك", "https://manga-lek.net", "ar", className = "Mangalek", overrideVersionCode = 4), - SingleLang("مانجا ليكس", "https://mangaleks.com", "ar", className = "MangaLeks"), - SingleLang("مانجا لينك", "https://mangalink.io", "ar", className = "MangaLinkio", overrideVersionCode = 3), + SingleLang("Detective Conan Ar", "https://manga.detectiveconanar.com", "ar", sourceName = "شبكة كونان العربية", overrideVersionCode = 2), + SingleLang("Arab Toons", "https://arabtoons.net", "ar", isNsfw = true, sourceName = "عرب تونز"), + SingleLang("Comic Arab", "https://comicarab.com", "ar", isNsfw = true, sourceName = "كوميك العرب"), + SingleLang("3asq", "https://3asq.org", "ar", className = "Manga3asq", sourceName = "مانجا العاشق", overrideVersionCode = 2), + SingleLang("Mangalek", "https://manga-lek.net", "ar", sourceName = "مانجا ليك", overrideVersionCode = 4), ) companion object { 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 8c06d5518..bef650d19 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 @@ -156,9 +156,9 @@ class MangaThemesiaGenerator : ThemeSourceGenerator { SingleLang("xCaliBR Scans", "https://xcalibrscans.com", "en", overrideVersionCode = 5), SingleLang("YumeKomik", "https://yumekomik.com", "id", isNsfw = true, className = "YumeKomik", pkgName = "inazumanga", overrideVersionCode = 6), SingleLang("Zahard", "https://zahard.xyz", "en"), - SingleLang("أريا مانجا", "https://www.areascans.net", "ar", className = "AreaManga"), - SingleLang("فيكس مانجا", "https://vexmanga.com", "ar", className = "VexManga", overrideVersionCode = 3), - SingleLang("สดใสเมะ", "https://www.xn--l3c0azab5a2gta.com", "th", isNsfw = true, className = "Sodsaime", overrideVersionCode = 1), + SingleLang("Area Manga", "https://www.areascans.net", "ar", sourceName = "أريا مانجا"), + SingleLang("Vex Manga", "https://vexmanga.com", "ar", sourceName = "فيكس مانجا", overrideVersionCode = 3), + SingleLang("Sodsaime", "https://www.xn--l3c0azab5a2gta.com", "th", isNsfw = true, sourceName = "สดใสเมะ", overrideVersionCode = 1), ) companion object { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSGenerator.kt index 35a86d1bf..39076a647 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSGenerator.kt @@ -12,7 +12,7 @@ class MMRCMSGenerator : ThemeSourceGenerator { override val baseVersionCode = 8 override val sources = listOf( - SingleLang("مانجا اون لاين", "https://onma.top", "ar", className = "Onma"), + SingleLang("Onma", "https://onma.top", "ar", sourceName = "مانجا اون لاين"), SingleLang("Read Comics Online", "https://readcomicsonline.ru", "en"), SingleLang("Scan VF", "https://www.scan-vf.net", "fr", overrideVersionCode = 1), SingleLang("Komikid", "https://www.komikid.com", "id"),