diff --git a/src/all/ninenineninehentai/AndroidManifest.xml b/src/all/ninenineninehentai/AndroidManifest.xml index d9e582cf3..cfd078c12 100644 --- a/src/all/ninenineninehentai/AndroidManifest.xml +++ b/src/all/ninenineninehentai/AndroidManifest.xml @@ -2,7 +2,7 @@ @@ -12,7 +12,7 @@ - + diff --git a/src/all/ninenineninehentai/build.gradle b/src/all/ninenineninehentai/build.gradle index 68d4e50ff..601328b4e 100644 --- a/src/all/ninenineninehentai/build.gradle +++ b/src/all/ninenineninehentai/build.gradle @@ -1,7 +1,7 @@ ext { - extName = '999Hentai' - extClass = '.NineNineNineHentaiFactory' - extVersionCode = 6 + extName = 'AnimeH' + extClass = '.AnimeHFactory' + extVersionCode = 7 isNsfw = true } diff --git a/src/all/ninenineninehentai/res/mipmap-hdpi/ic_launcher.png b/src/all/ninenineninehentai/res/mipmap-hdpi/ic_launcher.png index f5d448ee4..262ecd929 100644 Binary files a/src/all/ninenineninehentai/res/mipmap-hdpi/ic_launcher.png and b/src/all/ninenineninehentai/res/mipmap-hdpi/ic_launcher.png differ diff --git a/src/all/ninenineninehentai/res/mipmap-mdpi/ic_launcher.png b/src/all/ninenineninehentai/res/mipmap-mdpi/ic_launcher.png index 929615309..505ff6a4a 100644 Binary files a/src/all/ninenineninehentai/res/mipmap-mdpi/ic_launcher.png and b/src/all/ninenineninehentai/res/mipmap-mdpi/ic_launcher.png differ diff --git a/src/all/ninenineninehentai/res/mipmap-xhdpi/ic_launcher.png b/src/all/ninenineninehentai/res/mipmap-xhdpi/ic_launcher.png index 2a76504d5..2c5e77183 100644 Binary files a/src/all/ninenineninehentai/res/mipmap-xhdpi/ic_launcher.png and b/src/all/ninenineninehentai/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/src/all/ninenineninehentai/res/mipmap-xxhdpi/ic_launcher.png b/src/all/ninenineninehentai/res/mipmap-xxhdpi/ic_launcher.png index 8df4c773f..4411c7a85 100644 Binary files a/src/all/ninenineninehentai/res/mipmap-xxhdpi/ic_launcher.png and b/src/all/ninenineninehentai/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/src/all/ninenineninehentai/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/ninenineninehentai/res/mipmap-xxxhdpi/ic_launcher.png index 0f3523c57..ac6f49e7b 100644 Binary files a/src/all/ninenineninehentai/res/mipmap-xxxhdpi/ic_launcher.png and b/src/all/ninenineninehentai/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/NineNineNineHentai.kt b/src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/AnimeH.kt similarity index 98% rename from src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/NineNineNineHentai.kt rename to src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/AnimeH.kt index 86056f5d3..f3bc3eb4e 100644 --- a/src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/NineNineNineHentai.kt +++ b/src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/AnimeH.kt @@ -35,16 +35,16 @@ import uy.kohesive.injekt.injectLazy import java.text.SimpleDateFormat import java.util.Locale -open class NineNineNineHentai( +open class AnimeH( final override val lang: String, private val siteLang: String = lang, ) : HttpSource(), ConfigurableSource { - override val name = "999Hentai" + override val name = "AnimeH" - override val baseUrl = "https://999hentai.net" + override val baseUrl = "https://animeh.to" - private val apiUrl = "https://hapi.999hentai.net/api" + private val apiUrl = "https://api.animeh.to/api" override val supportsLatest = true diff --git a/src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/NineNineNineHentaiDto.kt b/src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/AnimeHDto.kt similarity index 100% rename from src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/NineNineNineHentaiDto.kt rename to src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/AnimeHDto.kt diff --git a/src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/AnimeHFactory.kt b/src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/AnimeHFactory.kt new file mode 100644 index 000000000..b3348969a --- /dev/null +++ b/src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/AnimeHFactory.kt @@ -0,0 +1,19 @@ +package eu.kanade.tachiyomi.extension.all.ninenineninehentai + +import eu.kanade.tachiyomi.source.SourceFactory + +class AnimeHFactory : SourceFactory { + override fun createSources() = listOf( + AnimeHAll(), + AnimeHEn(), + AnimeHJa(), + AnimeHZh(), + AnimeHEs(), + ) +} + +class AnimeHAll : AnimeH("all") { override val id = 5098173700376022513 } +class AnimeHEn : AnimeH("en") { override val id = 4370122548313941497 } +class AnimeHJa : AnimeH("ja", "jp") { override val id = 8948948503520127713 } +class AnimeHZh : AnimeH("zh", "cn") { override val id = 3874510362699054213 } +class AnimeHEs : AnimeH("es") { override val id = 2790053117909987291 } diff --git a/src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/NineNineNineHentaiFilters.kt b/src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/AnimeHFilters.kt similarity index 100% rename from src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/NineNineNineHentaiFilters.kt rename to src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/AnimeHFilters.kt diff --git a/src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/NineNineNineHentaiPayloadDto.kt b/src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/AnimeHPayloadDto.kt similarity index 100% rename from src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/NineNineNineHentaiPayloadDto.kt rename to src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/AnimeHPayloadDto.kt diff --git a/src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/NineNineNineHentaiQueries.kt b/src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/AnimeHQueries.kt similarity index 100% rename from src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/NineNineNineHentaiQueries.kt rename to src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/AnimeHQueries.kt diff --git a/src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/NineNineNineHentaiUrlActivity.kt b/src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/AnimeHUrlActivity.kt similarity index 76% rename from src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/NineNineNineHentaiUrlActivity.kt rename to src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/AnimeHUrlActivity.kt index d598b5fba..7d08b3904 100644 --- a/src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/NineNineNineHentaiUrlActivity.kt +++ b/src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/AnimeHUrlActivity.kt @@ -7,7 +7,7 @@ import android.os.Bundle import android.util.Log import kotlin.system.exitProcess -class NineNineNineHentaiUrlActivity : Activity() { +class AnimeHUrlActivity : Activity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) val pathSegments = intent?.data?.pathSegments @@ -15,17 +15,17 @@ class NineNineNineHentaiUrlActivity : Activity() { val id = pathSegments[1] val mainIntent = Intent().apply { action = "eu.kanade.tachiyomi.SEARCH" - putExtra("query", "${NineNineNineHentai.SEARCH_PREFIX}$id") + putExtra("query", "${AnimeH.SEARCH_PREFIX}$id") putExtra("filter", packageName) } try { startActivity(mainIntent) } catch (e: ActivityNotFoundException) { - Log.e("999HentaiUrlActivity", e.toString()) + Log.e("AnimeHUrlActivity", e.toString()) } } else { - Log.e("999HentaiUrlActivity", "could not parse uri from intent $intent") + Log.e("AnimeHUrlActivity", "could not parse uri from intent $intent") } finish() diff --git a/src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/NineNineNineHentaiFactory.kt b/src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/NineNineNineHentaiFactory.kt deleted file mode 100644 index eb3d6ba7b..000000000 --- a/src/all/ninenineninehentai/src/eu/kanade/tachiyomi/extension/all/ninenineninehentai/NineNineNineHentaiFactory.kt +++ /dev/null @@ -1,13 +0,0 @@ -package eu.kanade.tachiyomi.extension.all.ninenineninehentai - -import eu.kanade.tachiyomi.source.SourceFactory - -class NineNineNineHentaiFactory : SourceFactory { - override fun createSources() = listOf( - NineNineNineHentai("all"), - NineNineNineHentai("en"), - NineNineNineHentai("ja", "jp"), - NineNineNineHentai("zh", "cn"), - NineNineNineHentai("es"), - ) -}