diff --git a/src/en/dynasty/build.gradle b/src/en/dynasty/build.gradle index 8bf84f7cb..f533a6d27 100644 --- a/src/en/dynasty/build.gradle +++ b/src/en/dynasty/build.gradle @@ -5,8 +5,8 @@ ext { appName = 'Tachiyomi: Dynasty' pkgNameSuffix = "en.dynasty" extClass = '.DynastyFactory' - extVersionCode = 3 - extVersionSuffix = 3 + extVersionCode = 4 + extVersionSuffix = 4 libVersion = '1.2' } diff --git a/src/en/dynasty/res/mipmap-hdpi/ic_launcher.png b/src/en/dynasty/res/mipmap-hdpi/ic_launcher.png index 5ad6b13ad..14534ba83 100644 Binary files a/src/en/dynasty/res/mipmap-hdpi/ic_launcher.png and b/src/en/dynasty/res/mipmap-hdpi/ic_launcher.png differ diff --git a/src/en/dynasty/res/mipmap-mdpi/ic_launcher.png b/src/en/dynasty/res/mipmap-mdpi/ic_launcher.png index 819dad633..bd1d60cdd 100644 Binary files a/src/en/dynasty/res/mipmap-mdpi/ic_launcher.png and b/src/en/dynasty/res/mipmap-mdpi/ic_launcher.png differ diff --git a/src/en/dynasty/res/mipmap-xhdpi/ic_launcher.png b/src/en/dynasty/res/mipmap-xhdpi/ic_launcher.png index aea7c7268..c8947f327 100644 Binary files a/src/en/dynasty/res/mipmap-xhdpi/ic_launcher.png and b/src/en/dynasty/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/src/en/dynasty/res/mipmap-xxhdpi/ic_launcher.png b/src/en/dynasty/res/mipmap-xxhdpi/ic_launcher.png index 6fd0e0f0e..ee2058085 100644 Binary files a/src/en/dynasty/res/mipmap-xxhdpi/ic_launcher.png and b/src/en/dynasty/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/src/en/dynasty/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/dynasty/res/mipmap-xxxhdpi/ic_launcher.png index b0226c380..2db0d128a 100644 Binary files a/src/en/dynasty/res/mipmap-xxxhdpi/ic_launcher.png and b/src/en/dynasty/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/src/en/dynasty/res/web_hi_res_512.png b/src/en/dynasty/res/web_hi_res_512.png index 560554c52..f1eb35713 100644 Binary files a/src/en/dynasty/res/web_hi_res_512.png and b/src/en/dynasty/res/web_hi_res_512.png differ diff --git a/src/en/dynasty/src/eu/kanade/tachiyomi/extension/en/dynasty/DynastyOneshots.kt b/src/en/dynasty/src/eu/kanade/tachiyomi/extension/en/dynasty/DynastyChapters.kt similarity index 81% rename from src/en/dynasty/src/eu/kanade/tachiyomi/extension/en/dynasty/DynastyOneshots.kt rename to src/en/dynasty/src/eu/kanade/tachiyomi/extension/en/dynasty/DynastyChapters.kt index eddbb6eb4..82883f4ff 100644 --- a/src/en/dynasty/src/eu/kanade/tachiyomi/extension/en/dynasty/DynastyOneshots.kt +++ b/src/en/dynasty/src/eu/kanade/tachiyomi/extension/en/dynasty/DynastyChapters.kt @@ -12,16 +12,17 @@ import org.jsoup.nodes.Element import java.text.SimpleDateFormat import java.util.* -class DynastyOneshots : DynastyScans() { +class DynastyChapters : DynastyScans() { + override val name = "Dynasty-Chapters" + override fun popularMangaInitialUrl() = "" - override val name = "Dynasty- Oneshots" - - override fun popularMangaInitialUrl() = "$baseUrl/search?q=&with%5B%5D=5102&sort=" + private fun popularMangaInitialUrl(page: Int) = "$baseUrl/search?q=&classes%5B%5D=Chapter&page=$page=$&sort=" override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { - return GET("$baseUrl/search?q=$query&with%5B%5D=5102&sort=", headers) + return GET("$baseUrl/search?q=$query&classes%5B%5D=Chapter&sort=", headers) } + override fun mangaDetailsParse(document: Document): SManga = SManga.create() override fun searchMangaSelector() = "dd" @@ -66,6 +67,12 @@ class DynastyOneshots : DynastyScans() { return chapter } + override fun popularMangaRequest(page: Int): Request { + return GET(popularMangaInitialUrl(page), headers) + } + + override fun popularMangaNextPageSelector() = searchMangaNextPageSelector() + override fun popularMangaSelector() = searchMangaSelector() override fun popularMangaFromElement(element: Element) = searchMangaFromElement(element) diff --git a/src/en/dynasty/src/eu/kanade/tachiyomi/extension/en/dynasty/DynastyFactory.kt b/src/en/dynasty/src/eu/kanade/tachiyomi/extension/en/dynasty/DynastyFactory.kt index d75ec1789..2677cd3da 100644 --- a/src/en/dynasty/src/eu/kanade/tachiyomi/extension/en/dynasty/DynastyFactory.kt +++ b/src/en/dynasty/src/eu/kanade/tachiyomi/extension/en/dynasty/DynastyFactory.kt @@ -13,7 +13,7 @@ class DynastyFactory : SourceFactory { fun getAllDynasty() = listOf( DynastyAnthologies(), - DynastyOneshots(), + DynastyChapters(), DynastyDoujins(), DynastyIssues(), DynastySeries()) diff --git a/src/en/dynasty/src/eu/kanade/tachiyomi/extension/en/dynasty/DynastyScans.kt b/src/en/dynasty/src/eu/kanade/tachiyomi/extension/en/dynasty/DynastyScans.kt index 9a50f846d..7c406aa65 100644 --- a/src/en/dynasty/src/eu/kanade/tachiyomi/extension/en/dynasty/DynastyScans.kt +++ b/src/en/dynasty/src/eu/kanade/tachiyomi/extension/en/dynasty/DynastyScans.kt @@ -39,7 +39,7 @@ abstract class DynastyScans : ParsedHttpSource() { override fun popularMangaRequest(page: Int): Request { return GET(popularMangaInitialUrl(), headers) - } +} override fun popularMangaSelector() = "ul.thumbnails > li.span2"