diff --git a/multisrc/overrides/nyahentai/bughentaien/src/BugHentaiEnFactory.kt b/multisrc/overrides/nyahentai/bughentaien/src/BugHentaiEnFactory.kt deleted file mode 100644 index 0cbaeef1f..000000000 --- a/multisrc/overrides/nyahentai/bughentaien/src/BugHentaiEnFactory.kt +++ /dev/null @@ -1,18 +0,0 @@ -package eu.kanade.tachiyomi.extension.all.bughentaien - -import eu.kanade.tachiyomi.multisrc.nyahentai.NyaHentai -import eu.kanade.tachiyomi.source.Source -import eu.kanade.tachiyomi.source.SourceFactory - -class BugHentaiEnFactory : SourceFactory { - override fun createSources(): List = listOf( - BugHentaiEnEN(), - BugHentaiEnJA(), - BugHentaiEnZH(), - BugHentaiEnALL(), - ) -} -class BugHentaiEnEN : NyaHentai("BugHentai (en)", "https://en.bughentai.com", "en") -class BugHentaiEnJA : NyaHentai("BugHentai (en)", "https://en.bughentai.com", "ja") -class BugHentaiEnZH : NyaHentai("BugHentai (en)", "https://en.bughentai.com", "zh") -class BugHentaiEnALL : NyaHentai("BugHentai (en)", "https://en.bughentai.com", "all") diff --git a/multisrc/overrides/nyahentai/bughentaija/src/BugHentaiJaFactory.kt b/multisrc/overrides/nyahentai/bughentaija/src/BugHentaiJaFactory.kt deleted file mode 100644 index bb77014d9..000000000 --- a/multisrc/overrides/nyahentai/bughentaija/src/BugHentaiJaFactory.kt +++ /dev/null @@ -1,18 +0,0 @@ -package eu.kanade.tachiyomi.extension.all.bughentaija - -import eu.kanade.tachiyomi.multisrc.nyahentai.NyaHentai -import eu.kanade.tachiyomi.source.Source -import eu.kanade.tachiyomi.source.SourceFactory - -class BugHentaiJaFactory : SourceFactory { - override fun createSources(): List = listOf( - BugHentaiJaEN(), - BugHentaiJaJA(), - BugHentaiJaZH(), - BugHentaiJaALL(), - ) -} -class BugHentaiJaEN : NyaHentai("BugHentai (ja)", "https://ja.bughentai.com", "en") -class BugHentaiJaJA : NyaHentai("BugHentai (ja)", "https://ja.bughentai.com", "ja") -class BugHentaiJaZH : NyaHentai("BugHentai (ja)", "https://ja.bughentai.com", "zh") -class BugHentaiJaALL : NyaHentai("BugHentai (ja)", "https://ja.bughentai.com", "all") diff --git a/multisrc/overrides/nyahentai/cathentai/src/CatHentaiFactory.kt b/multisrc/overrides/nyahentai/cathentai/src/CatHentaiFactory.kt deleted file mode 100644 index fbb8761bb..000000000 --- a/multisrc/overrides/nyahentai/cathentai/src/CatHentaiFactory.kt +++ /dev/null @@ -1,18 +0,0 @@ -package eu.kanade.tachiyomi.extension.all.cathentai - -import eu.kanade.tachiyomi.multisrc.nyahentai.NyaHentai -import eu.kanade.tachiyomi.source.Source -import eu.kanade.tachiyomi.source.SourceFactory - -class CatHentaiFactory : SourceFactory { - override fun createSources(): List = listOf( - CatHentaiEN(), - CatHentaiJA(), - CatHentaiZH(), - CatHentaiALL(), - ) -} -class CatHentaiEN : NyaHentai("CatHentai", "https://cathentai.com", "en") -class CatHentaiJA : NyaHentai("CatHentai", "https://cathentai.com", "ja") -class CatHentaiZH : NyaHentai("CatHentai", "https://cathentai.com", "zh") -class CatHentaiALL : NyaHentai("CatHentai", "https://cathentai.com", "all") diff --git a/multisrc/overrides/nyahentai/ddhentai/src/DDHentaiFactory.kt b/multisrc/overrides/nyahentai/ddhentai/src/DDHentaiFactory.kt deleted file mode 100644 index d42ca0851..000000000 --- a/multisrc/overrides/nyahentai/ddhentai/src/DDHentaiFactory.kt +++ /dev/null @@ -1,18 +0,0 @@ -package eu.kanade.tachiyomi.extension.all.ddhentai - -import eu.kanade.tachiyomi.multisrc.nyahentai.NyaHentai -import eu.kanade.tachiyomi.source.Source -import eu.kanade.tachiyomi.source.SourceFactory - -class DDHentaiFactory : SourceFactory { - override fun createSources(): List = listOf( - DDHentaiEN(), - DDHentaiJA(), - DDHentaiZH(), - DDHentaiALL(), - ) -} -class DDHentaiEN : NyaHentai("DDHentai", "https://zh.ddhentai.com", "en") -class DDHentaiJA : NyaHentai("DDHentai", "https://zh.ddhentai.com", "ja") -class DDHentaiZH : NyaHentai("DDHentai", "https://zh.ddhentai.com", "zh") -class DDHentaiALL : NyaHentai("DDHentai", "https://zh.ddhentai.com", "all") diff --git a/multisrc/overrides/nyahentai/ddhentaia/src/DDHentaiAFactory.kt b/multisrc/overrides/nyahentai/ddhentaia/src/DDHentaiAFactory.kt deleted file mode 100644 index 4601f6518..000000000 --- a/multisrc/overrides/nyahentai/ddhentaia/src/DDHentaiAFactory.kt +++ /dev/null @@ -1,18 +0,0 @@ -package eu.kanade.tachiyomi.extension.all.ddhentaia - -import eu.kanade.tachiyomi.multisrc.nyahentai.NyaHentai -import eu.kanade.tachiyomi.source.Source -import eu.kanade.tachiyomi.source.SourceFactory - -class DDHentaiAFactory : SourceFactory { - override fun createSources(): List = listOf( - DDHentaiAEN(), - DDHentaiAJA(), - DDHentaiAZH(), - DDHentaiAALL(), - ) -} -class DDHentaiAEN : NyaHentai("DDHentai A", "https://zha.ddhentai.com", "en") -class DDHentaiAJA : NyaHentai("DDHentai A", "https://zha.ddhentai.com", "ja") -class DDHentaiAZH : NyaHentai("DDHentai A", "https://zha.ddhentai.com", "zh") -class DDHentaiAALL : NyaHentai("DDHentai A", "https://zha.ddhentai.com", "all") diff --git a/multisrc/overrides/nyahentai/default/AndroidManifest.xml b/multisrc/overrides/nyahentai/default/AndroidManifest.xml deleted file mode 100644 index 8b96299c7..000000000 --- a/multisrc/overrides/nyahentai/default/AndroidManifest.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/multisrc/overrides/nyahentai/default/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/nyahentai/default/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index aef11f4f6..000000000 Binary files a/multisrc/overrides/nyahentai/default/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/nyahentai/default/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/nyahentai/default/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 5d800867f..000000000 Binary files a/multisrc/overrides/nyahentai/default/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/nyahentai/default/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/nyahentai/default/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index e41ef67fd..000000000 Binary files a/multisrc/overrides/nyahentai/default/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/nyahentai/default/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/nyahentai/default/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index c47fb0725..000000000 Binary files a/multisrc/overrides/nyahentai/default/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/nyahentai/default/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/nyahentai/default/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 8d23b5c27..000000000 Binary files a/multisrc/overrides/nyahentai/default/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/nyahentai/default/res/web_hi_res_512.png b/multisrc/overrides/nyahentai/default/res/web_hi_res_512.png deleted file mode 100644 index a85a2f743..000000000 Binary files a/multisrc/overrides/nyahentai/default/res/web_hi_res_512.png and /dev/null differ diff --git a/multisrc/overrides/nyahentai/doghentai/src/DogHentaiFactory.kt b/multisrc/overrides/nyahentai/doghentai/src/DogHentaiFactory.kt deleted file mode 100644 index 670504f9d..000000000 --- a/multisrc/overrides/nyahentai/doghentai/src/DogHentaiFactory.kt +++ /dev/null @@ -1,18 +0,0 @@ -package eu.kanade.tachiyomi.extension.all.doghentai - -import eu.kanade.tachiyomi.multisrc.nyahentai.NyaHentai -import eu.kanade.tachiyomi.source.Source -import eu.kanade.tachiyomi.source.SourceFactory - -class DogHentaiFactory : SourceFactory { - override fun createSources(): List = listOf( - DogHentaiEN(), - DogHentaiJA(), - DogHentaiZH(), - DogHentaiALL(), - ) -} -class DogHentaiEN : NyaHentai("DogHentai", "https://zhb.doghentai.com", "en") -class DogHentaiJA : NyaHentai("DogHentai", "https://zhb.doghentai.com", "ja") -class DogHentaiZH : NyaHentai("DogHentai", "https://zhb.doghentai.com", "zh") -class DogHentaiALL : NyaHentai("DogHentai", "https://zhb.doghentai.com", "all") diff --git a/multisrc/overrides/nyahentai/foxhentai/src/FoxHentaiFactory.kt b/multisrc/overrides/nyahentai/foxhentai/src/FoxHentaiFactory.kt deleted file mode 100644 index 3afb59677..000000000 --- a/multisrc/overrides/nyahentai/foxhentai/src/FoxHentaiFactory.kt +++ /dev/null @@ -1,18 +0,0 @@ -package eu.kanade.tachiyomi.extension.all.foxhentai - -import eu.kanade.tachiyomi.multisrc.nyahentai.NyaHentai -import eu.kanade.tachiyomi.source.Source -import eu.kanade.tachiyomi.source.SourceFactory - -class FoxHentaiFactory : SourceFactory { - override fun createSources(): List = listOf( - FoxHentaiEN(), - FoxHentaiJA(), - FoxHentaiZH(), - FoxHentaiALL(), - ) -} -class FoxHentaiEN : NyaHentai("FoxHentai", "https://ja.foxhentai.com", "en") -class FoxHentaiJA : NyaHentai("FoxHentai", "https://ja.foxhentai.com", "ja") -class FoxHentaiZH : NyaHentai("FoxHentai", "https://ja.foxhentai.com", "zh") -class FoxHentaiALL : NyaHentai("FoxHentai", "https://ja.foxhentai.com", "all") diff --git a/multisrc/overrides/nyahentai/nyahentaiclub/src/NyaHentaiClubFactory.kt b/multisrc/overrides/nyahentai/nyahentaiclub/src/NyaHentaiClubFactory.kt deleted file mode 100644 index 9e209f067..000000000 --- a/multisrc/overrides/nyahentai/nyahentaiclub/src/NyaHentaiClubFactory.kt +++ /dev/null @@ -1,18 +0,0 @@ -package eu.kanade.tachiyomi.extension.all.nyahentaiclub - -import eu.kanade.tachiyomi.multisrc.nyahentai.NyaHentai -import eu.kanade.tachiyomi.source.Source -import eu.kanade.tachiyomi.source.SourceFactory - -class NyaHentaiClubFactory : SourceFactory { - override fun createSources(): List = listOf( - NyaHentaiClubEN(), - NyaHentaiClubJA(), - NyaHentaiClubZH(), - NyaHentaiClubALL(), - ) -} -class NyaHentaiClubEN : NyaHentai("NyaHentai.club", "https://nyahentai.club", "en") -class NyaHentaiClubJA : NyaHentai("NyaHentai.club", "https://nyahentai.club", "ja") -class NyaHentaiClubZH : NyaHentai("NyaHentai.club", "https://nyahentai.club", "zh") -class NyaHentaiClubALL : NyaHentai("NyaHentai.club", "https://nyahentai.club", "all") diff --git a/multisrc/overrides/nyahentai/nyahentaico/src/NyaHentaiCoFactory.kt b/multisrc/overrides/nyahentai/nyahentaico/src/NyaHentaiCoFactory.kt deleted file mode 100644 index feb93778e..000000000 --- a/multisrc/overrides/nyahentai/nyahentaico/src/NyaHentaiCoFactory.kt +++ /dev/null @@ -1,18 +0,0 @@ -package eu.kanade.tachiyomi.extension.all.nyahentaico - -import eu.kanade.tachiyomi.multisrc.nyahentai.NyaHentai -import eu.kanade.tachiyomi.source.Source -import eu.kanade.tachiyomi.source.SourceFactory - -class NyaHentaiCoFactory : SourceFactory { - override fun createSources(): List = listOf( - NyaHentaiCoEN(), - NyaHentaiCoJA(), - NyaHentaiCoZH(), - NyaHentaiCoALL(), - ) -} -class NyaHentaiCoEN : NyaHentai("NyaHentai.co", "https://nyahentai.co", "en") -class NyaHentaiCoJA : NyaHentai("NyaHentai.co", "https://nyahentai.co", "ja") -class NyaHentaiCoZH : NyaHentai("NyaHentai.co", "https://nyahentai.co", "zh") -class NyaHentaiCoALL : NyaHentai("NyaHentai.co", "https://nyahentai.co", "all") diff --git a/multisrc/overrides/nyahentai/nyahentaifun/src/NyaHentaiFunFactory.kt b/multisrc/overrides/nyahentai/nyahentaifun/src/NyaHentaiFunFactory.kt deleted file mode 100644 index aa4ed78c7..000000000 --- a/multisrc/overrides/nyahentai/nyahentaifun/src/NyaHentaiFunFactory.kt +++ /dev/null @@ -1,18 +0,0 @@ -package eu.kanade.tachiyomi.extension.all.nyahentaifun - -import eu.kanade.tachiyomi.multisrc.nyahentai.NyaHentai -import eu.kanade.tachiyomi.source.Source -import eu.kanade.tachiyomi.source.SourceFactory - -class NyaHentaiFunFactory : SourceFactory { - override fun createSources(): List = listOf( - NyaHentaiFunEN(), - NyaHentaiFunJA(), - NyaHentaiFunZH(), - NyaHentaiFunALL(), - ) -} -class NyaHentaiFunEN : NyaHentai("NyaHentai.fun", "https://nyahentai.fun", "en") -class NyaHentaiFunJA : NyaHentai("NyaHentai.fun", "https://nyahentai.fun", "ja") -class NyaHentaiFunZH : NyaHentai("NyaHentai.fun", "https://nyahentai.fun", "zh") -class NyaHentaiFunALL : NyaHentai("NyaHentai.fun", "https://nyahentai.fun", "all") diff --git a/multisrc/overrides/nyahentai/nyahentaime/src/NyaHentaiMeFactory.kt b/multisrc/overrides/nyahentai/nyahentaime/src/NyaHentaiMeFactory.kt deleted file mode 100644 index bdc293b9b..000000000 --- a/multisrc/overrides/nyahentai/nyahentaime/src/NyaHentaiMeFactory.kt +++ /dev/null @@ -1,18 +0,0 @@ -package eu.kanade.tachiyomi.extension.all.nyahentaime - -import eu.kanade.tachiyomi.multisrc.nyahentai.NyaHentai -import eu.kanade.tachiyomi.source.Source -import eu.kanade.tachiyomi.source.SourceFactory - -class NyaHentaiMeFactory : SourceFactory { - override fun createSources(): List = listOf( - NyaHentaiMeEN(), - NyaHentaiMeJA(), - NyaHentaiMeZH(), - NyaHentaiMeALL(), - ) -} -class NyaHentaiMeEN : NyaHentai("NyaHentai.me", "https://ja.nyahentai.me", "en") -class NyaHentaiMeJA : NyaHentai("NyaHentai.me", "https://ja.nyahentai.me", "ja") -class NyaHentaiMeZH : NyaHentai("NyaHentai.me", "https://ja.nyahentai.me", "zh") -class NyaHentaiMeALL : NyaHentai("NyaHentai.me", "https://ja.nyahentai.me", "all") diff --git a/multisrc/overrides/nyahentai/nyahentaisite/src/NyaHentaiSiteFactory.kt b/multisrc/overrides/nyahentai/nyahentaisite/src/NyaHentaiSiteFactory.kt deleted file mode 100644 index f80bdcdb7..000000000 --- a/multisrc/overrides/nyahentai/nyahentaisite/src/NyaHentaiSiteFactory.kt +++ /dev/null @@ -1,18 +0,0 @@ -package eu.kanade.tachiyomi.extension.all.nyahentaisite - -import eu.kanade.tachiyomi.multisrc.nyahentai.NyaHentai -import eu.kanade.tachiyomi.source.Source -import eu.kanade.tachiyomi.source.SourceFactory - -class NyaHentaiSiteFactory : SourceFactory { - override fun createSources(): List = listOf( - NyaHentaiSiteEN(), - NyaHentaiSiteJA(), - NyaHentaiSiteZH(), - NyaHentaiSiteALL(), - ) -} -class NyaHentaiSiteEN : NyaHentai("NyaHentai.site", "https://nyahentai.site", "en") -class NyaHentaiSiteJA : NyaHentai("NyaHentai.site", "https://nyahentai.site", "ja") -class NyaHentaiSiteZH : NyaHentai("NyaHentai.site", "https://nyahentai.site", "zh") -class NyaHentaiSiteALL : NyaHentai("NyaHentai.site", "https://nyahentai.site", "all") diff --git a/multisrc/overrides/nyahentai/nyahentaithreecom/src/NyaHentaiThreeComFactory.kt b/multisrc/overrides/nyahentai/nyahentaithreecom/src/NyaHentaiThreeComFactory.kt deleted file mode 100644 index 2812bafdc..000000000 --- a/multisrc/overrides/nyahentai/nyahentaithreecom/src/NyaHentaiThreeComFactory.kt +++ /dev/null @@ -1,18 +0,0 @@ -package eu.kanade.tachiyomi.extension.all.nyahentaithreecom - -import eu.kanade.tachiyomi.multisrc.nyahentai.NyaHentai -import eu.kanade.tachiyomi.source.Source -import eu.kanade.tachiyomi.source.SourceFactory - -class NyaHentaiThreeComFactory : SourceFactory { - override fun createSources(): List = listOf( - NyaHentaiThreeComEN(), - NyaHentaiThreeComJA(), - NyaHentaiThreeComZH(), - NyaHentaiThreeComALL(), - ) -} -class NyaHentaiThreeComEN : NyaHentai("NyaHentai3.com", "https://nyahentai3.com", "en") -class NyaHentaiThreeComJA : NyaHentai("NyaHentai3.com", "https://nyahentai3.com", "ja") -class NyaHentaiThreeComZH : NyaHentai("NyaHentai3.com", "https://nyahentai3.com", "zh") -class NyaHentaiThreeComALL : NyaHentai("NyaHentai3.com", "https://nyahentai3.com", "all") diff --git a/multisrc/overrides/nyahentai/nyahentaitwocom/src/NyaHentaiTwoComFactory.kt b/multisrc/overrides/nyahentai/nyahentaitwocom/src/NyaHentaiTwoComFactory.kt deleted file mode 100644 index a2afbe466..000000000 --- a/multisrc/overrides/nyahentai/nyahentaitwocom/src/NyaHentaiTwoComFactory.kt +++ /dev/null @@ -1,18 +0,0 @@ -package eu.kanade.tachiyomi.extension.all.nyahentaitwocom - -import eu.kanade.tachiyomi.multisrc.nyahentai.NyaHentai -import eu.kanade.tachiyomi.source.Source -import eu.kanade.tachiyomi.source.SourceFactory - -class NyaHentaiTwoComFactory : SourceFactory { - override fun createSources(): List = listOf( - NyaHentaiTwoComEN(), - NyaHentaiTwoComJA(), - NyaHentaiTwoComZH(), - NyaHentaiTwoComALL(), - ) -} -class NyaHentaiTwoComEN : NyaHentai("NyaHentai2.com", "https://nyahentai2.com", "en") -class NyaHentaiTwoComJA : NyaHentai("NyaHentai2.com", "https://nyahentai2.com", "ja") -class NyaHentaiTwoComZH : NyaHentai("NyaHentai2.com", "https://nyahentai2.com", "zh") -class NyaHentaiTwoComALL : NyaHentai("NyaHentai2.com", "https://nyahentai2.com", "all") diff --git a/multisrc/overrides/nyahentai/qqhentai/src/QQHentaiFactory.kt b/multisrc/overrides/nyahentai/qqhentai/src/QQHentaiFactory.kt deleted file mode 100644 index 99f7fdd83..000000000 --- a/multisrc/overrides/nyahentai/qqhentai/src/QQHentaiFactory.kt +++ /dev/null @@ -1,18 +0,0 @@ -package eu.kanade.tachiyomi.extension.all.qqhentai - -import eu.kanade.tachiyomi.multisrc.nyahentai.NyaHentai -import eu.kanade.tachiyomi.source.Source -import eu.kanade.tachiyomi.source.SourceFactory - -class QQHentaiFactory : SourceFactory { - override fun createSources(): List = listOf( - QQHentaiEN(), - QQHentaiJA(), - QQHentaiZH(), - QQHentaiALL(), - ) -} -class QQHentaiEN : NyaHentai("QQHentai", "https://zhb.qqhentai.com", "en") -class QQHentaiJA : NyaHentai("QQHentai", "https://zhb.qqhentai.com", "ja") -class QQHentaiZH : NyaHentai("QQHentai", "https://zhb.qqhentai.com", "zh") -class QQHentaiALL : NyaHentai("QQHentai", "https://zhb.qqhentai.com", "all") diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nyahentai/NyaHentaiGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nyahentai/NyaHentaiGenerator.kt deleted file mode 100644 index 4ede207db..000000000 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nyahentai/NyaHentaiGenerator.kt +++ /dev/null @@ -1,39 +0,0 @@ -package eu.kanade.tachiyomi.multisrc.nyahentai - -import generator.ThemeSourceData.MultiLang -import generator.ThemeSourceGenerator - -class NyaHentaiGenerator : ThemeSourceGenerator { - - override val themePkg = "nyahentai" - - override val themeClass = "NyaHentai" - - override val baseVersionCode: Int = 2 - - override val sources = listOf( - MultiLang("NyaHentai", "https://nyahentai.com", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "NyaHentaiFactory", overrideVersionCode = 3), - MultiLang("NyaHentai.site", "https://nyahentai.site", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "NyaHentaiSiteFactory", pkgName = "nyahentaisite"), - MultiLang("NyaHentai.me", "https://ja.nyahentai.me", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "NyaHentaiMeFactory", pkgName = "nyahentaime"), - MultiLang("NyaHentai.fun", "https://nyahentai.fun", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "NyaHentaiFunFactory", pkgName = "nyahentaifun"), - MultiLang("NyaHentai.club", "https://nyahentai.club", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "NyaHentaiClubFactory", pkgName = "nyahentaiclub"), - MultiLang("NyaHentai2.com", "https://nyahentai2.com", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "NyaHentaiTwoComFactory", pkgName = "nyahentaitwocom"), - MultiLang("NyaHentai.co", "https://nyahentai.co", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "NyaHentaiCoFactory", pkgName = "nyahentaico"), - MultiLang("NyaHentai3.com", "https://nyahentai3.com", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "NyaHentaiThreeComFactory", pkgName = "nyahentaithreecom"), - MultiLang("CatHentai", "https://cathentai.com", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "CatHentaiFactory"), - MultiLang("DogHentai", "https://zhb.doghentai.com", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "DogHentaiFactory"), - MultiLang("BugHentai (ja)", "https://ja.bughentai.com", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "BugHentaiJaFactory", pkgName = "bughentaija"), - MultiLang("BugHentai (en)", "https://en.bughentai.com", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "BugHentaiEnFactory", pkgName = "bughentaien"), - MultiLang("QQHentai", "https://zhb.qqhentai.com", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "QQHentaiFactory"), - MultiLang("FoxHentai", "https://ja.foxhentai.com", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "FoxHentaiFactory"), - MultiLang("DDHentai", "https://zh.ddhentai.com", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "DDHentaiFactory"), - MultiLang("DDHentai A", "https://zha.ddhentai.com", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "DDHentaiAFactory"), - ) - - companion object { - @JvmStatic - fun main(args: Array) { - NyaHentaiGenerator().createAll() - } - } -} diff --git a/src/all/nyahentai/AndroidManifest.xml b/src/all/nyahentai/AndroidManifest.xml new file mode 100644 index 000000000..ff199dcda --- /dev/null +++ b/src/all/nyahentai/AndroidManifest.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/all/nyahentai/build.gradle b/src/all/nyahentai/build.gradle new file mode 100644 index 000000000..5e02e1d4d --- /dev/null +++ b/src/all/nyahentai/build.gradle @@ -0,0 +1,12 @@ +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' + +ext { + extName = 'NyaHentai' + pkgNameSuffix = 'all.nyahentai' + extClass = '.NyaHentaiFactory' + extVersionCode = 6 + isNsfw = true +} + +apply from: "$rootDir/common.gradle" diff --git a/src/all/nyahentai/res/mipmap-hdpi/ic_launcher.png b/src/all/nyahentai/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..f718e7c6d Binary files /dev/null and b/src/all/nyahentai/res/mipmap-hdpi/ic_launcher.png differ diff --git a/src/all/nyahentai/res/mipmap-mdpi/ic_launcher.png b/src/all/nyahentai/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..b02a96ea4 Binary files /dev/null and b/src/all/nyahentai/res/mipmap-mdpi/ic_launcher.png differ diff --git a/src/all/nyahentai/res/mipmap-xhdpi/ic_launcher.png b/src/all/nyahentai/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..058612bd4 Binary files /dev/null and b/src/all/nyahentai/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/src/all/nyahentai/res/mipmap-xxhdpi/ic_launcher.png b/src/all/nyahentai/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..7e42fb8d1 Binary files /dev/null and b/src/all/nyahentai/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/src/all/nyahentai/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/nyahentai/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..1dc3ce68d Binary files /dev/null and b/src/all/nyahentai/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/src/all/nyahentai/res/web_hi_res_512.png b/src/all/nyahentai/res/web_hi_res_512.png new file mode 100644 index 000000000..78c254df5 Binary files /dev/null and b/src/all/nyahentai/res/web_hi_res_512.png differ diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nyahentai/NyaHentai.kt b/src/all/nyahentai/src/eu/kanade/tachiyomi/extension/all/nyahentai/NyaHentai.kt similarity index 78% rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nyahentai/NyaHentai.kt rename to src/all/nyahentai/src/eu/kanade/tachiyomi/extension/all/nyahentai/NyaHentai.kt index 79e57499f..28004abd8 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nyahentai/NyaHentai.kt +++ b/src/all/nyahentai/src/eu/kanade/tachiyomi/extension/all/nyahentai/NyaHentai.kt @@ -1,7 +1,12 @@ -package eu.kanade.tachiyomi.multisrc.nyahentai +package eu.kanade.tachiyomi.extension.all.nyahentai +import android.app.Application +import android.content.SharedPreferences +import androidx.preference.ListPreference +import androidx.preference.PreferenceScreen import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.asObservableSuccess +import eu.kanade.tachiyomi.source.ConfigurableSource import eu.kanade.tachiyomi.source.model.Filter import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.MangasPage @@ -16,13 +21,48 @@ import okhttp3.Response import org.jsoup.nodes.Document import org.jsoup.nodes.Element import rx.Observable +import uy.kohesive.injekt.Injekt +import uy.kohesive.injekt.api.get abstract class NyaHentai( - override val name: String, - override val baseUrl: String, override val lang: String -) : ParsedHttpSource() { +) : ConfigurableSource, ParsedHttpSource() { + + private val preferences: SharedPreferences by lazy { + Injekt.get().getSharedPreferences("source_$id", 0x0000) + } + + override val name = "NyaHentai" + override val baseUrl: String = getMirrorPref()!! + + override fun setupPreferenceScreen(screen: PreferenceScreen) { + val mirrorPref = ListPreference(screen.context).apply { + key = "${MIRROR_PREF_KEY}_$lang" + title = MIRROR_PREF_TITLE + entries = MIRROR_PREF_ENTRIES + entryValues = MIRROR_PREF_ENTRY_VALUES + setDefaultValue(MIRROR_PREF_DEFAULT_VALUE) + summary = "%s" + + setOnPreferenceChangeListener { _, newValue -> + val selected = newValue as String + val index = findIndexOfValue(selected) + val entry = entryValues[index] as String + preferences.edit().putString("${MIRROR_PREF_KEY}_$lang", entry).commit() + } + } + screen.addPreference(mirrorPref) + } + + private fun getMirrorPref(): String? = preferences.getString("${MIRROR_PREF_KEY}_$lang", MIRROR_PREF_DEFAULT_VALUE) + companion object { + private const val MIRROR_PREF_KEY = "MIRROR" + private const val MIRROR_PREF_TITLE = "Mirror" + private val MIRROR_PREF_ENTRIES = arrayOf("nyahentai.com", "nyahentai.site", "ja.nyahentai.me", "nyahentai.fun", "nyahentai.club", "nyahentai2.com", "nyahentai.co", "nyahentai3.com", "cathentai.com", "zhb.doghentai.com", "ja.bughentai.com", "en.bughentai.com", "zhb.qqhentai.com", "ja.foxhentai.com", "zh.ddhentai.com", "zha.ddhentai.com") + private val MIRROR_PREF_ENTRY_VALUES = arrayOf("https://nyahentai.com", "https://nyahentai.site", "https://ja.nyahentai.me", "https://nyahentai.fun", "https://nyahentai.club", "https://nyahentai2.com", "https://nyahentai.co", "https://nyahentai3.com", "https://cathentai.com", "https://zhb.doghentai.com", "https://ja.bughentai.com", "https://en.bughentai.com", "https://zhb.qqhentai.com", "https://ja.foxhentai.com", "https://zh.ddhentai.com", "https://zha.ddhentai.com") + private val MIRROR_PREF_DEFAULT_VALUE = MIRROR_PREF_ENTRY_VALUES[0] + private const val NOT_FOUND_MESSAGE = "If you used a filter, check if the keyword actually exists." private const val Filter_SEARCH_MESSAGE = "NOTE: Ignored if using text search!" const val PREFIX_ID_SEARCH = "id:" diff --git a/multisrc/overrides/nyahentai/nyahentai/src/NyaHentaiFactory.kt b/src/all/nyahentai/src/eu/kanade/tachiyomi/extension/all/nyahentai/NyaHentaiFactory.kt similarity index 52% rename from multisrc/overrides/nyahentai/nyahentai/src/NyaHentaiFactory.kt rename to src/all/nyahentai/src/eu/kanade/tachiyomi/extension/all/nyahentai/NyaHentaiFactory.kt index fa42a79cd..051dcc267 100644 --- a/multisrc/overrides/nyahentai/nyahentai/src/NyaHentaiFactory.kt +++ b/src/all/nyahentai/src/eu/kanade/tachiyomi/extension/all/nyahentai/NyaHentaiFactory.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.all.nyahentai -import eu.kanade.tachiyomi.multisrc.nyahentai.NyaHentai import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory @@ -12,9 +11,16 @@ class NyaHentaiFactory : SourceFactory { NyaHentaiALL(), ) } -class NyaHentaiEN : NyaHentai("NyaHentai", "https://nyahentai.com", "en") { + +class NyaHentaiEN : NyaHentai("en") { override val id = 9170089554867447899 } -class NyaHentaiJA : NyaHentai("NyaHentai", "https://nyahentai.com", "ja") -class NyaHentaiZH : NyaHentai("NyaHentai", "https://nyahentai.com", "zh") -class NyaHentaiALL : NyaHentai("NyaHentai", "https://nyahentai.com", "all") +class NyaHentaiJA : NyaHentai("ja") { + override val id = 770924441007081408 +} +class NyaHentaiZH : NyaHentai("zh") { + override val id = 6864783742637475493 +} +class NyaHentaiALL : NyaHentai("all") { + override val id = 7651943104270359588 +} diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nyahentai/NyaHentaiUrlActivity.kt b/src/all/nyahentai/src/eu/kanade/tachiyomi/extension/all/nyahentai/NyaHentaiUrlActivity.kt similarity index 96% rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nyahentai/NyaHentaiUrlActivity.kt rename to src/all/nyahentai/src/eu/kanade/tachiyomi/extension/all/nyahentai/NyaHentaiUrlActivity.kt index 379a4b16e..66030e4cc 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nyahentai/NyaHentaiUrlActivity.kt +++ b/src/all/nyahentai/src/eu/kanade/tachiyomi/extension/all/nyahentai/NyaHentaiUrlActivity.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.multisrc.nyahentai +package eu.kanade.tachiyomi.extension.all.nyahentai import android.app.Activity import android.content.ActivityNotFoundException