From cb99f8ea6494372f73d917a5b6cc8a0a1d8eea2c Mon Sep 17 00:00:00 2001 From: stevenyomi <95685115+stevenyomi@users.noreply.github.com> Date: Sun, 20 Jul 2025 18:23:27 +0000 Subject: [PATCH] Move ColaManga to single source (#9737) The other override, MangaDig, for which this multisrc was created, was removed in #5319. The extension stays broken and the version code is not bumped. --- lib-multisrc/colamanga/build.gradle.kts | 9 --------- .../colamanga => src/zh/onemanhua}/AndroidManifest.xml | 6 +++--- src/zh/onemanhua/build.gradle | 8 +++++--- .../tachiyomi/extension/zh/onemanhua}/ColaManga.kt | 2 +- .../extension/zh/onemanhua}/ColaMangaFilters.kt | 2 +- .../extension/zh/onemanhua}/ColaMangaImageInterceptor.kt | 2 +- .../tachiyomi/extension/zh/onemanhua}/ColaMangaIntl.kt | 2 +- .../extension/zh/onemanhua}/ColaMangaUrlActivity.kt | 4 ++-- .../kanade/tachiyomi/extension/zh/onemanhua/Onemanhua.kt | 2 -- 9 files changed, 14 insertions(+), 23 deletions(-) delete mode 100644 lib-multisrc/colamanga/build.gradle.kts rename {lib-multisrc/colamanga => src/zh/onemanhua}/AndroidManifest.xml (78%) rename {lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga => src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua}/ColaManga.kt (99%) rename {lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga => src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua}/ColaMangaFilters.kt (93%) rename {lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga => src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua}/ColaMangaImageInterceptor.kt (95%) rename {lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga => src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua}/ColaMangaIntl.kt (97%) rename {lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga => src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua}/ColaMangaUrlActivity.kt (89%) diff --git a/lib-multisrc/colamanga/build.gradle.kts b/lib-multisrc/colamanga/build.gradle.kts deleted file mode 100644 index b6fcc301f..000000000 --- a/lib-multisrc/colamanga/build.gradle.kts +++ /dev/null @@ -1,9 +0,0 @@ -plugins { - id("lib-multisrc") -} - -baseVersionCode = 9 - -dependencies { - api(project(":lib:synchrony")) -} diff --git a/lib-multisrc/colamanga/AndroidManifest.xml b/src/zh/onemanhua/AndroidManifest.xml similarity index 78% rename from lib-multisrc/colamanga/AndroidManifest.xml rename to src/zh/onemanhua/AndroidManifest.xml index 52dcdacdb..2ac375f95 100644 --- a/lib-multisrc/colamanga/AndroidManifest.xml +++ b/src/zh/onemanhua/AndroidManifest.xml @@ -2,7 +2,7 @@ @@ -12,8 +12,8 @@ diff --git a/src/zh/onemanhua/build.gradle b/src/zh/onemanhua/build.gradle index 5940c8a68..84162b13f 100644 --- a/src/zh/onemanhua/build.gradle +++ b/src/zh/onemanhua/build.gradle @@ -1,10 +1,12 @@ ext { extName = 'COLAMANGA' extClass = '.Onemanhua' - themePkg = 'colamanga' - baseUrl = 'https://www.colamanga.com' - overrideVersionCode = 15 + extVersionCode = 24 isNsfw = true } apply from: "$rootDir/common.gradle" + +dependencies { + implementation(project(":lib:synchrony")) +} diff --git a/lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaManga.kt b/src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/ColaManga.kt similarity index 99% rename from lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaManga.kt rename to src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/ColaManga.kt index 5eed418dc..c3d07db38 100644 --- a/lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaManga.kt +++ b/src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/ColaManga.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.multisrc.colamanga +package eu.kanade.tachiyomi.extension.zh.onemanhua import android.annotation.SuppressLint import android.app.Application diff --git a/lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaFilters.kt b/src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/ColaMangaFilters.kt similarity index 93% rename from lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaFilters.kt rename to src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/ColaMangaFilters.kt index 8f21403da..800c11d12 100644 --- a/lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaFilters.kt +++ b/src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/ColaMangaFilters.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.multisrc.colamanga +package eu.kanade.tachiyomi.extension.zh.onemanhua import eu.kanade.tachiyomi.source.model.Filter import okhttp3.HttpUrl diff --git a/lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaImageInterceptor.kt b/src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/ColaMangaImageInterceptor.kt similarity index 95% rename from lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaImageInterceptor.kt rename to src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/ColaMangaImageInterceptor.kt index 0a7d45126..173452890 100644 --- a/lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaImageInterceptor.kt +++ b/src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/ColaMangaImageInterceptor.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.multisrc.colamanga +package eu.kanade.tachiyomi.extension.zh.onemanhua import okhttp3.Interceptor import okhttp3.MediaType.Companion.toMediaType diff --git a/lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaIntl.kt b/src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/ColaMangaIntl.kt similarity index 97% rename from lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaIntl.kt rename to src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/ColaMangaIntl.kt index 0bebd6aee..da38369d2 100644 --- a/lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaIntl.kt +++ b/src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/ColaMangaIntl.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.multisrc.colamanga +package eu.kanade.tachiyomi.extension.zh.onemanhua class ColaMangaIntl(private val lang: String) { diff --git a/lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaUrlActivity.kt b/src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/ColaMangaUrlActivity.kt similarity index 89% rename from lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaUrlActivity.kt rename to src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/ColaMangaUrlActivity.kt index 309b1e765..7a5d148ae 100644 --- a/lib-multisrc/colamanga/src/eu/kanade/tachiyomi/multisrc/colamanga/ColaMangaUrlActivity.kt +++ b/src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/ColaMangaUrlActivity.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.multisrc.colamanga +package eu.kanade.tachiyomi.extension.zh.onemanhua import android.app.Activity import android.content.ActivityNotFoundException @@ -13,7 +13,7 @@ class ColaMangaUrlActivity : Activity() { val pathSegments = intent?.data?.pathSegments - if (pathSegments != null && pathSegments.size > 0) { + if (pathSegments != null && pathSegments.isNotEmpty()) { val intent = Intent().apply { action = "eu.kanade.tachiyomi.SEARCH" putExtra("query", "${ColaManga.PREFIX_SLUG_SEARCH}${pathSegments[0]}") diff --git a/src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/Onemanhua.kt b/src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/Onemanhua.kt index 00bd99cc7..c6a417dfa 100644 --- a/src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/Onemanhua.kt +++ b/src/zh/onemanhua/src/eu/kanade/tachiyomi/extension/zh/onemanhua/Onemanhua.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.extension.zh.onemanhua -import eu.kanade.tachiyomi.multisrc.colamanga.ColaManga -import eu.kanade.tachiyomi.multisrc.colamanga.UriPartFilter import eu.kanade.tachiyomi.source.model.FilterList class Onemanhua : ColaManga("COLAMANGA", "https://www.colamanga.com", "zh") {