diff --git a/multisrc/overrides/madara/mangachill/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/mangachill/res/mipmap-hdpi/ic_launcher.png index e300549d3..8c027870a 100644 Binary files a/multisrc/overrides/madara/mangachill/res/mipmap-hdpi/ic_launcher.png and b/multisrc/overrides/madara/mangachill/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangachill/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/mangachill/res/mipmap-mdpi/ic_launcher.png index 2457a5c99..84527f9a8 100644 Binary files a/multisrc/overrides/madara/mangachill/res/mipmap-mdpi/ic_launcher.png and b/multisrc/overrides/madara/mangachill/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangachill/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/mangachill/res/mipmap-xhdpi/ic_launcher.png index 07ddc81a8..973068520 100644 Binary files a/multisrc/overrides/madara/mangachill/res/mipmap-xhdpi/ic_launcher.png and b/multisrc/overrides/madara/mangachill/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangachill/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangachill/res/mipmap-xxhdpi/ic_launcher.png index eb40cb526..2545726ee 100644 Binary files a/multisrc/overrides/madara/mangachill/res/mipmap-xxhdpi/ic_launcher.png and b/multisrc/overrides/madara/mangachill/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangachill/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangachill/res/mipmap-xxxhdpi/ic_launcher.png index 6ed3dd3e0..de804b0a3 100644 Binary files a/multisrc/overrides/madara/mangachill/res/mipmap-xxxhdpi/ic_launcher.png and b/multisrc/overrides/madara/mangachill/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangachill/res/web_hi_res_512.png b/multisrc/overrides/madara/mangachill/res/web_hi_res_512.png index 75c6ce6a7..ab35cbb08 100644 Binary files a/multisrc/overrides/madara/mangachill/res/web_hi_res_512.png and b/multisrc/overrides/madara/mangachill/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/madara/teenmanhua/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/teenmanhua/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..45cc3d4c7 Binary files /dev/null and b/multisrc/overrides/madara/teenmanhua/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/teenmanhua/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/teenmanhua/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..73909ff0d Binary files /dev/null and b/multisrc/overrides/madara/teenmanhua/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/teenmanhua/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/teenmanhua/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..94b930f27 Binary files /dev/null and b/multisrc/overrides/madara/teenmanhua/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/teenmanhua/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/teenmanhua/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..2ec88038a Binary files /dev/null and b/multisrc/overrides/madara/teenmanhua/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/teenmanhua/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/teenmanhua/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..69e8e5ac4 Binary files /dev/null and b/multisrc/overrides/madara/teenmanhua/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/teenmanhua/res/web_hi_res_512.png b/multisrc/overrides/madara/teenmanhua/res/web_hi_res_512.png new file mode 100644 index 000000000..b2e362d2b Binary files /dev/null and b/multisrc/overrides/madara/teenmanhua/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/madara/teenmanhua/src/TeenManhua.kt b/multisrc/overrides/madara/teenmanhua/src/TeenManhua.kt new file mode 100644 index 000000000..de663a8c3 --- /dev/null +++ b/multisrc/overrides/madara/teenmanhua/src/TeenManhua.kt @@ -0,0 +1,12 @@ +package eu.kanade.tachiyomi.extension.en.teenmanhua + +import eu.kanade.tachiyomi.multisrc.madara.Madara +import java.text.SimpleDateFormat +import java.util.Locale + +class TeenManhua : Madara( + "TeenManhua", + "https://teenmanhua.com", + "en", + dateFormat = SimpleDateFormat("dd/MM/yy", Locale.US) +) diff --git a/multisrc/overrides/madara/toongod/src/ToonGod.kt b/multisrc/overrides/madara/toongod/src/ToonGod.kt index a3f78d090..93d8cd75f 100644 --- a/multisrc/overrides/madara/toongod/src/ToonGod.kt +++ b/multisrc/overrides/madara/toongod/src/ToonGod.kt @@ -1,7 +1,9 @@ package eu.kanade.tachiyomi.extension.en.toongod +import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale +@Nsfw class ToonGod : Madara("ToonGod", "https://www.toongod.com", "en", SimpleDateFormat("dd MMM yyyy", Locale.US)) diff --git a/multisrc/overrides/madara/webtoonily/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/webtoonily/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..db6cd48e7 Binary files /dev/null and b/multisrc/overrides/madara/webtoonily/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/webtoonily/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/webtoonily/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..ba78b2fde Binary files /dev/null and b/multisrc/overrides/madara/webtoonily/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/webtoonily/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/webtoonily/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..d576015a7 Binary files /dev/null and b/multisrc/overrides/madara/webtoonily/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/webtoonily/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/webtoonily/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..ba41bb57b Binary files /dev/null and b/multisrc/overrides/madara/webtoonily/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/webtoonily/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/webtoonily/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..9eefdbe27 Binary files /dev/null and b/multisrc/overrides/madara/webtoonily/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/webtoonily/res/web_hi_res_512.png b/multisrc/overrides/madara/webtoonily/res/web_hi_res_512.png new file mode 100644 index 000000000..198a7e843 Binary files /dev/null and b/multisrc/overrides/madara/webtoonily/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/madara/webtoonily/src/WebToonily.kt b/multisrc/overrides/madara/webtoonily/src/WebToonily.kt new file mode 100644 index 000000000..f44f6841d --- /dev/null +++ b/multisrc/overrides/madara/webtoonily/src/WebToonily.kt @@ -0,0 +1,7 @@ +package eu.kanade.tachiyomi.extension.en.webtoonily + +import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara + +@Nsfw +class WebToonily : Madara("WebToonily", "https://www.webtoonily.com", "en") diff --git a/multisrc/overrides/madara/webtoonuk/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/webtoonuk/res/mipmap-hdpi/ic_launcher.png index d9dec4e14..5109b48c5 100644 Binary files a/multisrc/overrides/madara/webtoonuk/res/mipmap-hdpi/ic_launcher.png and b/multisrc/overrides/madara/webtoonuk/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/webtoonuk/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/webtoonuk/res/mipmap-mdpi/ic_launcher.png index 310206740..507249c24 100644 Binary files a/multisrc/overrides/madara/webtoonuk/res/mipmap-mdpi/ic_launcher.png and b/multisrc/overrides/madara/webtoonuk/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/webtoonuk/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/webtoonuk/res/mipmap-xhdpi/ic_launcher.png index 354af42a1..2e46ae730 100644 Binary files a/multisrc/overrides/madara/webtoonuk/res/mipmap-xhdpi/ic_launcher.png and b/multisrc/overrides/madara/webtoonuk/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/webtoonuk/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/webtoonuk/res/mipmap-xxhdpi/ic_launcher.png index 0f18a7a16..e603c1a30 100644 Binary files a/multisrc/overrides/madara/webtoonuk/res/mipmap-xxhdpi/ic_launcher.png and b/multisrc/overrides/madara/webtoonuk/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/webtoonuk/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/webtoonuk/res/mipmap-xxxhdpi/ic_launcher.png index 293bfbd7f..58cf6b9a8 100644 Binary files a/multisrc/overrides/madara/webtoonuk/res/mipmap-xxxhdpi/ic_launcher.png and b/multisrc/overrides/madara/webtoonuk/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/webtoonuk/res/web_hi_res_512.png b/multisrc/overrides/madara/webtoonuk/res/web_hi_res_512.png index b8a758081..13155b8a9 100644 Binary files a/multisrc/overrides/madara/webtoonuk/res/web_hi_res_512.png and b/multisrc/overrides/madara/webtoonuk/res/web_hi_res_512.png 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 36e30ff2e..2e9a8b592 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 @@ -123,7 +123,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("MMScans", "https://mm-scans.com/", "en", overrideVersionCode = 1), SingleLang("Manga Action", "https://manga-action.com", "ar", overrideVersionCode = 1), SingleLang("Manga Bin", "https://mangabin.com/", "en", overrideVersionCode = 1), - SingleLang("Manga Chill", "https://mangachill.com/", "en", overrideVersionCode = 1), + SingleLang("Manga Chill", "https://mangachill.com/", "en", overrideVersionCode = 2), SingleLang("Manga Crab", "https://mangacrab.com", "es"), SingleLang("Manga Diyari", "https://manga-diyari.com", "tr", overrideVersionCode = 1), SingleLang("Manga Drop Out", "https://www.mangadropout.xyz", "id", isNsfw = true, overrideVersionCode = 1), @@ -290,11 +290,12 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("StageComics", "https://stagecomics.com", "pt-BR", overrideVersionCode = 2), SingleLang("Sugar Babies", "https://sugarbscan.com", "en", overrideVersionCode = 1), SingleLang("Sweet Time Scan", "https://sweetscan.net", "pt-BR", overrideVersionCode = 1), + SingleLang("TeenManhua", "https://teenmanhua.com", "en"), SingleLang("TheFluffyHangoutGroup", "https://www.fluffyhangout.club", "en", overrideVersionCode = 2), SingleLang("Three Queens Scanlator", "https://tqscan.com.br", "pt-BR", overrideVersionCode = 2), SingleLang("Time Naight", "https://timenaight.com", "tr"), SingleLang("Todaymic", "https://todaymic.com", "en"), - SingleLang("ToonGod", "https://www.toongod.com", "en", overrideVersionCode = 1), + SingleLang("ToonGod", "https://www.toongod.com", "en", isNsfw = true, overrideVersionCode = 2), SingleLang("Toonily", "https://toonily.com", "en", isNsfw = true, overrideVersionCode = 2), SingleLang("Toonily.net", "https://toonily.net", "en", isNsfw = true, className = "ToonilyNet", overrideVersionCode = 1), SingleLang("Top Manhua", "https://topmanhua.com", "en", overrideVersionCode = 1), @@ -316,9 +317,9 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Wakascan", "https://wakascan.com", "fr", overrideVersionCode = 1), SingleLang("War Queen Scan", "https://wqscan.com.br", "pt-BR", overrideVersionCode = 3), SingleLang("WebNovel", "https://webnovel.live", "en", className = "WebNovelLive", overrideVersionCode = 3), - SingleLang("WebToonily", "https://webtoonily.com", "en"), + SingleLang("WebToonily", "https://webtoonily.com", "en", isNsfw = true, overrideVersionCode = 1), SingleLang("Webtoon Hatti", "https://webtoonhatti.com/", "tr"), - SingleLang("WebtoonUK", "https://webtoon.uk", "en", overrideVersionCode = 1), + SingleLang("WebtoonUK", "https://webtoon.uk", "en", overrideVersionCode = 2), SingleLang("WebtoonXYZ", "https://www.webtoon.xyz", "en", overrideVersionCode = 2), SingleLang("Winter Scan", "https://winterscan.com.br", "pt-BR", overrideVersionCode = 2), SingleLang("Wonderland", "https://landwebtoons.site", "pt-BR", overrideVersionCode = 2), diff --git a/src/en/mangaowl/src/eu/kanade/tachiyomi/extension/en/mangaowl/MangaOwl.kt b/src/en/mangaowl/src/eu/kanade/tachiyomi/extension/en/mangaowl/MangaOwl.kt index 3f093c1d8..fca8f68a7 100644 --- a/src/en/mangaowl/src/eu/kanade/tachiyomi/extension/en/mangaowl/MangaOwl.kt +++ b/src/en/mangaowl/src/eu/kanade/tachiyomi/extension/en/mangaowl/MangaOwl.kt @@ -70,7 +70,7 @@ class MangaOwl : ParsedHttpSource() { // Search override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { - val url = "$baseUrl/search/$page".toHttpUrlOrNull()?.newBuilder()!! + val url = ("$baseUrl/search/$page" + if (page > 1) "/$page" else "").toHttpUrlOrNull()!!.newBuilder() url.addQueryParameter("search", query) filters.forEach { filter ->