From 12a0dfbfb321b4a27964e350e28d3d6aa5270a0c Mon Sep 17 00:00:00 2001
From: stevenyomi <95685115+stevenyomi@users.noreply.github.com>
Date: Fri, 30 Jun 2023 00:31:58 +0800
Subject: [PATCH] Move ManhuaDB multisrc to individual source (#16923)
---
.run/MDBGenerator.run.xml | 11 ----------
.../tachiyomi/multisrc/mdb/MDBGenerator.kt | 20 ------------------
src/zh/manhuadb/AndroidManifest.xml | 2 ++
src/zh/manhuadb/build.gradle | 12 +++++++++++
.../manhuadb/res/mipmap-hdpi/ic_launcher.png | Bin
.../manhuadb/res/mipmap-mdpi/ic_launcher.png | Bin
.../manhuadb/res/mipmap-xhdpi/ic_launcher.png | Bin
.../res/mipmap-xxhdpi/ic_launcher.png | Bin
.../res/mipmap-xxxhdpi/ic_launcher.png | Bin
.../zh}/manhuadb/res/web_hi_res_512.png | Bin
.../tachiyomi/extension/zh/manhuadb}/MDB.kt | 2 +-
.../extension/zh/manhuadb}/ManhuaDB.kt | 1 -
12 files changed, 15 insertions(+), 33 deletions(-)
delete mode 100644 .run/MDBGenerator.run.xml
delete mode 100644 multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mdb/MDBGenerator.kt
create mode 100644 src/zh/manhuadb/AndroidManifest.xml
create mode 100644 src/zh/manhuadb/build.gradle
rename {multisrc/overrides/mdb => src/zh}/manhuadb/res/mipmap-hdpi/ic_launcher.png (100%)
rename {multisrc/overrides/mdb => src/zh}/manhuadb/res/mipmap-mdpi/ic_launcher.png (100%)
rename {multisrc/overrides/mdb => src/zh}/manhuadb/res/mipmap-xhdpi/ic_launcher.png (100%)
rename {multisrc/overrides/mdb => src/zh}/manhuadb/res/mipmap-xxhdpi/ic_launcher.png (100%)
rename {multisrc/overrides/mdb => src/zh}/manhuadb/res/mipmap-xxxhdpi/ic_launcher.png (100%)
rename {multisrc/overrides/mdb => src/zh}/manhuadb/res/web_hi_res_512.png (100%)
rename {multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mdb => src/zh/manhuadb/src/eu/kanade/tachiyomi/extension/zh/manhuadb}/MDB.kt (99%)
rename {multisrc/overrides/mdb/manhuadb/src => src/zh/manhuadb/src/eu/kanade/tachiyomi/extension/zh/manhuadb}/ManhuaDB.kt (98%)
diff --git a/.run/MDBGenerator.run.xml b/.run/MDBGenerator.run.xml
deleted file mode 100644
index b3fffaabe..000000000
--- a/.run/MDBGenerator.run.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="MDBGenerator" type="JetRunConfigurationType" nameIsGenerated="true">
- <module name="tachiyomi-extensions.multisrc.main" />
- <option name="MAIN_CLASS_NAME" value="eu.kanade.tachiyomi.multisrc.mdb.MDBGenerator" />
- <method v="2">
- <option name="Make" enabled="true" />
- <option name="Gradle.BeforeRunTask" enabled="true" tasks="ktFormat" externalProjectPath="$PROJECT_DIR$/multisrc" vmOptions="" scriptParameters="-Ptheme=mdb" />
- <option name="Gradle.BeforeRunTask" enabled="true" tasks="ktLint" externalProjectPath="$PROJECT_DIR$/multisrc" vmOptions="" scriptParameters="-Ptheme=mdb" />
- </method>
- </configuration>
-</component>
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mdb/MDBGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mdb/MDBGenerator.kt
deleted file mode 100644
index ac7440b75..000000000
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mdb/MDBGenerator.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package eu.kanade.tachiyomi.multisrc.mdb
-
-import generator.ThemeSourceData.SingleLang
-import generator.ThemeSourceGenerator
-
-class MDBGenerator : ThemeSourceGenerator {
- override val themeClass = "MDB"
- override val themePkg = "mdb"
- override val baseVersionCode = 2
- override val sources = listOf(
- SingleLang("ManhuaDB", "https://www.manhuadb.com", "zh", sourceName = "漫画DB", overrideVersionCode = 4),
- )
-
- companion object {
- @JvmStatic
- fun main(args: Array<String>) {
- MDBGenerator().createAll()
- }
- }
-}
diff --git a/src/zh/manhuadb/AndroidManifest.xml b/src/zh/manhuadb/AndroidManifest.xml
new file mode 100644
index 000000000..30deb7f79
--- /dev/null
+++ b/src/zh/manhuadb/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="eu.kanade.tachiyomi.extension" />
diff --git a/src/zh/manhuadb/build.gradle b/src/zh/manhuadb/build.gradle
new file mode 100644
index 000000000..206c27a40
--- /dev/null
+++ b/src/zh/manhuadb/build.gradle
@@ -0,0 +1,12 @@
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlinx-serialization'
+
+ext {
+ extName = 'ManhuaDB'
+ pkgNameSuffix = 'zh.manhuadb'
+ extClass = '.ManhuaDB'
+ extVersionCode = 6
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/multisrc/overrides/mdb/manhuadb/res/mipmap-hdpi/ic_launcher.png b/src/zh/manhuadb/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mdb/manhuadb/res/mipmap-hdpi/ic_launcher.png
rename to src/zh/manhuadb/res/mipmap-hdpi/ic_launcher.png
diff --git a/multisrc/overrides/mdb/manhuadb/res/mipmap-mdpi/ic_launcher.png b/src/zh/manhuadb/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mdb/manhuadb/res/mipmap-mdpi/ic_launcher.png
rename to src/zh/manhuadb/res/mipmap-mdpi/ic_launcher.png
diff --git a/multisrc/overrides/mdb/manhuadb/res/mipmap-xhdpi/ic_launcher.png b/src/zh/manhuadb/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mdb/manhuadb/res/mipmap-xhdpi/ic_launcher.png
rename to src/zh/manhuadb/res/mipmap-xhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mdb/manhuadb/res/mipmap-xxhdpi/ic_launcher.png b/src/zh/manhuadb/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mdb/manhuadb/res/mipmap-xxhdpi/ic_launcher.png
rename to src/zh/manhuadb/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mdb/manhuadb/res/mipmap-xxxhdpi/ic_launcher.png b/src/zh/manhuadb/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from multisrc/overrides/mdb/manhuadb/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/zh/manhuadb/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/multisrc/overrides/mdb/manhuadb/res/web_hi_res_512.png b/src/zh/manhuadb/res/web_hi_res_512.png
similarity index 100%
rename from multisrc/overrides/mdb/manhuadb/res/web_hi_res_512.png
rename to src/zh/manhuadb/res/web_hi_res_512.png
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mdb/MDB.kt b/src/zh/manhuadb/src/eu/kanade/tachiyomi/extension/zh/manhuadb/MDB.kt
similarity index 99%
rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mdb/MDB.kt
rename to src/zh/manhuadb/src/eu/kanade/tachiyomi/extension/zh/manhuadb/MDB.kt
index b3592301d..b1d18ec1f 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mdb/MDB.kt
+++ b/src/zh/manhuadb/src/eu/kanade/tachiyomi/extension/zh/manhuadb/MDB.kt
@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.multisrc.mdb
+package eu.kanade.tachiyomi.extension.zh.manhuadb
import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.network.asObservableSuccess
diff --git a/multisrc/overrides/mdb/manhuadb/src/ManhuaDB.kt b/src/zh/manhuadb/src/eu/kanade/tachiyomi/extension/zh/manhuadb/ManhuaDB.kt
similarity index 98%
rename from multisrc/overrides/mdb/manhuadb/src/ManhuaDB.kt
rename to src/zh/manhuadb/src/eu/kanade/tachiyomi/extension/zh/manhuadb/ManhuaDB.kt
index cbfd58452..679acdbbb 100644
--- a/multisrc/overrides/mdb/manhuadb/src/ManhuaDB.kt
+++ b/src/zh/manhuadb/src/eu/kanade/tachiyomi/extension/zh/manhuadb/ManhuaDB.kt
@@ -5,7 +5,6 @@ import android.content.SharedPreferences
import android.util.Base64
import androidx.preference.PreferenceScreen
import androidx.preference.SwitchPreferenceCompat
-import eu.kanade.tachiyomi.multisrc.mdb.MDB
import eu.kanade.tachiyomi.source.ConfigurableSource
import kotlinx.serialization.Serializable
import kotlinx.serialization.decodeFromString