From f817f7b049d9af95700e5e792412bc6a87d51f79 Mon Sep 17 00:00:00 2001
From: Smol Ame <155411819+Smol-Ame@users.noreply.github.com>
Date: Tue, 11 Nov 2025 21:36:43 -0800
Subject: [PATCH] Comico: Remove KO, EN, ZH, move to JA only (#11429)

* Comico: Move from ALL to JA

* Comico: Bump versionCode & update extClass

* Comico: Fresh versionCode
---
 .../extension/all/comico/ComicoFactory.kt     |  19 ----------------
 src/{all => ja}/comico/build.gradle           |   4 ++--
 .../comico/res/mipmap-hdpi/ic_launcher.png    | Bin
 .../comico/res/mipmap-mdpi/ic_launcher.png    | Bin
 .../comico/res/mipmap-xhdpi/ic_launcher.png   | Bin
 .../comico/res/mipmap-xxhdpi/ic_launcher.png  | Bin
 .../comico/res/mipmap-xxxhdpi/ic_launcher.png | Bin
 .../tachiyomi/extension/ja}/comico/Comico.kt  |  21 +++++++++---------
 .../extension/ja}/comico/ComicoModels.kt      |   2 +-
 9 files changed, 13 insertions(+), 33 deletions(-)
 delete mode 100644 src/all/comico/src/eu/kanade/tachiyomi/extension/all/comico/ComicoFactory.kt
 rename src/{all => ja}/comico/build.gradle (73%)
 rename src/{all => ja}/comico/res/mipmap-hdpi/ic_launcher.png (100%)
 rename src/{all => ja}/comico/res/mipmap-mdpi/ic_launcher.png (100%)
 rename src/{all => ja}/comico/res/mipmap-xhdpi/ic_launcher.png (100%)
 rename src/{all => ja}/comico/res/mipmap-xxhdpi/ic_launcher.png (100%)
 rename src/{all => ja}/comico/res/mipmap-xxxhdpi/ic_launcher.png (100%)
 rename src/{all/comico/src/eu/kanade/tachiyomi/extension/all => ja/comico/src/eu/kanade/tachiyomi/extension/ja}/comico/Comico.kt (96%)
 rename src/{all/comico/src/eu/kanade/tachiyomi/extension/all => ja/comico/src/eu/kanade/tachiyomi/extension/ja}/comico/ComicoModels.kt (97%)

diff --git a/src/all/comico/src/eu/kanade/tachiyomi/extension/all/comico/ComicoFactory.kt b/src/all/comico/src/eu/kanade/tachiyomi/extension/all/comico/ComicoFactory.kt
deleted file mode 100644
index 69fb5d729..000000000
--- a/src/all/comico/src/eu/kanade/tachiyomi/extension/all/comico/ComicoFactory.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package eu.kanade.tachiyomi.extension.all.comico
-
-import eu.kanade.tachiyomi.source.SourceFactory
-
-class ComicoFactory : SourceFactory {
-    open class PocketComics(langCode: String) :
-        Comico("https://www.pocketcomics.com", "POCKET COMICS", langCode)
-
-    class ComicoJP : Comico("https://www.comico.jp", "コミコ", "ja-JP")
-
-    class ComicoKR : Comico("https://www.comico.kr", "코미코", "ko-KR")
-
-    override fun createSources() = listOf(
-        PocketComics("en-US"),
-        PocketComics("zh-TW"),
-        ComicoJP(),
-        ComicoKR(),
-    )
-}
diff --git a/src/all/comico/build.gradle b/src/ja/comico/build.gradle
similarity index 73%
rename from src/all/comico/build.gradle
rename to src/ja/comico/build.gradle
index 849c8acae..572f86bff 100644
--- a/src/all/comico/build.gradle
+++ b/src/ja/comico/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Comico'
-    extClass = '.ComicoFactory'
-    extVersionCode = 7
+    extClass = '.Comico'
+    extVersionCode = 1
     isNsfw = true
 }
 
diff --git a/src/all/comico/res/mipmap-hdpi/ic_launcher.png b/src/ja/comico/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from src/all/comico/res/mipmap-hdpi/ic_launcher.png
rename to src/ja/comico/res/mipmap-hdpi/ic_launcher.png
diff --git a/src/all/comico/res/mipmap-mdpi/ic_launcher.png b/src/ja/comico/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from src/all/comico/res/mipmap-mdpi/ic_launcher.png
rename to src/ja/comico/res/mipmap-mdpi/ic_launcher.png
diff --git a/src/all/comico/res/mipmap-xhdpi/ic_launcher.png b/src/ja/comico/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from src/all/comico/res/mipmap-xhdpi/ic_launcher.png
rename to src/ja/comico/res/mipmap-xhdpi/ic_launcher.png
diff --git a/src/all/comico/res/mipmap-xxhdpi/ic_launcher.png b/src/ja/comico/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from src/all/comico/res/mipmap-xxhdpi/ic_launcher.png
rename to src/ja/comico/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/src/all/comico/res/mipmap-xxxhdpi/ic_launcher.png b/src/ja/comico/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from src/all/comico/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/ja/comico/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/all/comico/src/eu/kanade/tachiyomi/extension/all/comico/Comico.kt b/src/ja/comico/src/eu/kanade/tachiyomi/extension/ja/comico/Comico.kt
similarity index 96%
rename from src/all/comico/src/eu/kanade/tachiyomi/extension/all/comico/Comico.kt
rename to src/ja/comico/src/eu/kanade/tachiyomi/extension/ja/comico/Comico.kt
index 2f52cc915..f758bfc70 100644
--- a/src/all/comico/src/eu/kanade/tachiyomi/extension/all/comico/Comico.kt
+++ b/src/ja/comico/src/eu/kanade/tachiyomi/extension/ja/comico/Comico.kt
@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.extension.all.comico
+package eu.kanade.tachiyomi.extension.ja.comico
 
 import android.webkit.CookieManager
 import eu.kanade.tachiyomi.lib.cryptoaes.CryptoAES
@@ -30,17 +30,16 @@ import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Locale
 
-open class Comico(
-    final override val baseUrl: String,
-    final override val name: String,
-    private val langCode: String,
-) : HttpSource() {
+class Comico : HttpSource() {
+    override val name = "コミコ"
+    override val baseUrl = "https://www.comico.jp"
+    override val lang = "ja"
+    private val apiUrl = "https://api.comico.jp"
+
+    override val id = 4991718230921189832
+
     final override val supportsLatest = true
 
-    override val lang = langCode.substring(0, 2)
-
-    protected open val apiUrl = baseUrl.replace("www", "api")
-
     private val json by injectLazy<Json>()
 
     private val cookieManager by lazy { CookieManager.getInstance() }
@@ -77,7 +76,7 @@ open class Comico(
         ).build()
 
     override fun headersBuilder() = Headers.Builder()
-        .set("Accept-Language", langCode)
+        .set("Accept-Language", lang)
         .set("User-Agent", userAgent)
         .set("Referer", "$baseUrl/")
 
diff --git a/src/all/comico/src/eu/kanade/tachiyomi/extension/all/comico/ComicoModels.kt b/src/ja/comico/src/eu/kanade/tachiyomi/extension/ja/comico/ComicoModels.kt
similarity index 97%
rename from src/all/comico/src/eu/kanade/tachiyomi/extension/all/comico/ComicoModels.kt
rename to src/ja/comico/src/eu/kanade/tachiyomi/extension/ja/comico/ComicoModels.kt
index 2ce66936c..ece12cb9e 100644
--- a/src/all/comico/src/eu/kanade/tachiyomi/extension/all/comico/ComicoModels.kt
+++ b/src/ja/comico/src/eu/kanade/tachiyomi/extension/ja/comico/ComicoModels.kt
@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.extension.all.comico
+package eu.kanade.tachiyomi.extension.ja.comico
 
 import kotlinx.serialization.Serializable