From 13f5a99386bc36a4f0a6503aa7e751787422ba3d Mon Sep 17 00:00:00 2001 From: loocool2 <36128021+loocool2@users.noreply.github.com> Date: Sat, 10 Jul 2021 20:02:49 -0700 Subject: [PATCH] Revert 1st Kiss rename and put Purplecress back in the right place (#8048) * Revert Host Preference Madara * Fix Hyperdex Url * Revert 1st Kiss Manga rename * Moved purplecress back to the right place * Actually add purplecress files --- .../firstkissmanga/src/FirstKissManga.kt | 2 +- .../multisrc/madara/MadaraGenerator.kt | 2 +- .../en/purplecress}/AndroidManifest.xml | 4 +-- .../en/purplecress}/build.gradle | 24 +++++++++--------- .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../en/purplecress}/res/web_hi_res_512.png | Bin .../extension/en/purplecress/PurpleCress.kt | 0 11 files changed, 16 insertions(+), 16 deletions(-) rename {purplecress => src/en/purplecress}/AndroidManifest.xml (97%) rename {purplecress => src/en/purplecress}/build.gradle (95%) rename {purplecress => src/en/purplecress}/res/mipmap-hdpi/ic_launcher.png (100%) rename {purplecress => src/en/purplecress}/res/mipmap-mdpi/ic_launcher.png (100%) rename {purplecress => src/en/purplecress}/res/mipmap-xhdpi/ic_launcher.png (100%) rename {purplecress => src/en/purplecress}/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {purplecress => src/en/purplecress}/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {purplecress => src/en/purplecress}/res/web_hi_res_512.png (100%) rename {purplecress => src/en/purplecress}/src/eu/kanade/tachiyomi/extension/en/purplecress/PurpleCress.kt (100%) diff --git a/multisrc/overrides/madara/firstkissmanga/src/FirstKissManga.kt b/multisrc/overrides/madara/firstkissmanga/src/FirstKissManga.kt index 423ff9169..cedb21b06 100644 --- a/multisrc/overrides/madara/firstkissmanga/src/FirstKissManga.kt +++ b/multisrc/overrides/madara/firstkissmanga/src/FirstKissManga.kt @@ -5,6 +5,6 @@ import okhttp3.Headers import java.text.SimpleDateFormat import java.util.Locale -class FirstKissManga : Madara("1st Kiss Manga", "https://1stkissmanga.com", "en") { +class FirstKissManga : Madara("1st Kiss", "https://1stkissmanga.com", "en") { override fun headersBuilder(): Headers.Builder = super.headersBuilder().add("Referer", baseUrl) } diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt index 910a218d1..8ba64eba4 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt @@ -17,7 +17,7 @@ class MadaraGenerator : ThemeSourceGenerator { MultiLang("MangaForFree.net", "https://mangaforfree.net", listOf("en", "ko", "all") , isNsfw = true, className = "MangaForFreeFactory", pkgName = "mangaforfree", overrideVersionCode = 1), MultiLang("Manhwa18.cc", "https://manhwa18.cc", listOf("en", "ko", "all"), isNsfw = true, className = "Manhwa18CcFactory", pkgName = "manhwa18cc"), SingleLang("1st Kiss Manga.love", "https://1stkissmanga.love", "en", className = "FirstKissMangaLove"), - SingleLang("1st Kiss Manga", "https://1stkissmanga.com", "en", className = "FirstKissManga", pkgName = "firstkissmanga", overrideVersionCode = 4), + SingleLang("1st Kiss", "https://1stkissmanga.com", "en", className = "FirstKissManga", pkgName = "firstkissmanga", overrideVersionCode = 5), SingleLang("1st Kiss Manhua", "https://1stkissmanhua.com", "en", className = "FirstKissManhua", overrideVersionCode = 2), SingleLang("1stKissManga.Club", "https://1stkissmanga.club", "en", className = "FirstKissMangaClub"), SingleLang("247Manga", "https://247manga.com", "en", className = "Manga247"), diff --git a/purplecress/AndroidManifest.xml b/src/en/purplecress/AndroidManifest.xml similarity index 97% rename from purplecress/AndroidManifest.xml rename to src/en/purplecress/AndroidManifest.xml index 0d7e33d58..30deb7f79 100644 --- a/purplecress/AndroidManifest.xml +++ b/src/en/purplecress/AndroidManifest.xml @@ -1,2 +1,2 @@ - - + + diff --git a/purplecress/build.gradle b/src/en/purplecress/build.gradle similarity index 95% rename from purplecress/build.gradle rename to src/en/purplecress/build.gradle index 9054d302b..a9a8d39d8 100644 --- a/purplecress/build.gradle +++ b/src/en/purplecress/build.gradle @@ -1,12 +1,12 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' - -ext { - extName = 'Purple Cress' - pkgNameSuffix = 'en.purplecress' - extClass = '.PurpleCress' - extVersionCode = 1 - libVersion = '1.2' -} - -apply from: "$rootDir/common.gradle" +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' + +ext { + extName = 'Purple Cress' + pkgNameSuffix = 'en.purplecress' + extClass = '.PurpleCress' + extVersionCode = 1 + libVersion = '1.2' +} + +apply from: "$rootDir/common.gradle" diff --git a/purplecress/res/mipmap-hdpi/ic_launcher.png b/src/en/purplecress/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from purplecress/res/mipmap-hdpi/ic_launcher.png rename to src/en/purplecress/res/mipmap-hdpi/ic_launcher.png diff --git a/purplecress/res/mipmap-mdpi/ic_launcher.png b/src/en/purplecress/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from purplecress/res/mipmap-mdpi/ic_launcher.png rename to src/en/purplecress/res/mipmap-mdpi/ic_launcher.png diff --git a/purplecress/res/mipmap-xhdpi/ic_launcher.png b/src/en/purplecress/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from purplecress/res/mipmap-xhdpi/ic_launcher.png rename to src/en/purplecress/res/mipmap-xhdpi/ic_launcher.png diff --git a/purplecress/res/mipmap-xxhdpi/ic_launcher.png b/src/en/purplecress/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from purplecress/res/mipmap-xxhdpi/ic_launcher.png rename to src/en/purplecress/res/mipmap-xxhdpi/ic_launcher.png diff --git a/purplecress/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/purplecress/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from purplecress/res/mipmap-xxxhdpi/ic_launcher.png rename to src/en/purplecress/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/purplecress/res/web_hi_res_512.png b/src/en/purplecress/res/web_hi_res_512.png similarity index 100% rename from purplecress/res/web_hi_res_512.png rename to src/en/purplecress/res/web_hi_res_512.png diff --git a/purplecress/src/eu/kanade/tachiyomi/extension/en/purplecress/PurpleCress.kt b/src/en/purplecress/src/eu/kanade/tachiyomi/extension/en/purplecress/PurpleCress.kt similarity index 100% rename from purplecress/src/eu/kanade/tachiyomi/extension/en/purplecress/PurpleCress.kt rename to src/en/purplecress/src/eu/kanade/tachiyomi/extension/en/purplecress/PurpleCress.kt