From a91461dcd093789e0b4cf0eebc6f93a718eda475 Mon Sep 17 00:00:00 2001 From: KirinRaikage Date: Mon, 13 Mar 2023 15:34:02 +0100 Subject: [PATCH] Rename frscan package to frdashscan to avoid duplicate package name (#15611) --- .../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 .../{frscan => frdashscan}/res/web_hi_res_512.png | Bin .../madara/{frscan => frdashscan}/src/FRScan.kt | 4 ++-- .../tachiyomi/multisrc/madara/MadaraGenerator.kt | 2 +- 8 files changed, 3 insertions(+), 3 deletions(-) rename multisrc/overrides/madara/{frscan => frdashscan}/res/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/madara/{frscan => frdashscan}/res/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/madara/{frscan => frdashscan}/res/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/madara/{frscan => frdashscan}/res/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/madara/{frscan => frdashscan}/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/madara/{frscan => frdashscan}/res/web_hi_res_512.png (100%) rename multisrc/overrides/madara/{frscan => frdashscan}/src/FRScan.kt (60%) diff --git a/multisrc/overrides/madara/frscan/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/frdashscan/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/frscan/res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/madara/frdashscan/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/frscan/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/frdashscan/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/frscan/res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/madara/frdashscan/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/frscan/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/frdashscan/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/frscan/res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/madara/frdashscan/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/frscan/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/frdashscan/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/frscan/res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/madara/frdashscan/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/frscan/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/frdashscan/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/frscan/res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/madara/frdashscan/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/frscan/res/web_hi_res_512.png b/multisrc/overrides/madara/frdashscan/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/madara/frscan/res/web_hi_res_512.png rename to multisrc/overrides/madara/frdashscan/res/web_hi_res_512.png diff --git a/multisrc/overrides/madara/frscan/src/FRScan.kt b/multisrc/overrides/madara/frdashscan/src/FRScan.kt similarity index 60% rename from multisrc/overrides/madara/frscan/src/FRScan.kt rename to multisrc/overrides/madara/frdashscan/src/FRScan.kt index e041fde6e..eb270757e 100644 --- a/multisrc/overrides/madara/frscan/src/FRScan.kt +++ b/multisrc/overrides/madara/frdashscan/src/FRScan.kt @@ -1,7 +1,7 @@ -package eu.kanade.tachiyomi.extension.fr.frscan +package eu.kanade.tachiyomi.extension.fr.frdashscan import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -class FRScan : Madara("FR-Scan", "https://fr-scan.com", "fr", dateFormat = SimpleDateFormat("MMM dd, yyyy", Locale.FRANCE)) +class FRScan : Madara("FR-Scan", "https://fr-scan.com", "fr", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.FRANCE)) 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 aaffde459..4582690cd 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 @@ -103,7 +103,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Fox White", "https://foxwhite.com.br", "pt-BR"), SingleLang("Free Manga", "https://freemanga.me", "en", isNsfw = true, overrideVersionCode = 3), SingleLang("FreeWebtoonCoins", "https://freewebtooncoins.com", "en", overrideVersionCode = 1), - SingleLang("FR-Scan", "https://fr-scan.com", "fr", className = "FRScan"), + SingleLang("FR-Scan", "https://fr-scan.com", "fr", pkgName = "frdashscan", className = "FRScan", overrideVersionCode = 1), SingleLang("Fug Manga", "https://fugmanga.net", "ar", overrideVersionCode = 1), SingleLang("Fukushuu no Yuusha", "https://fny-scantrad.com", "fr", overrideVersionCode = 2), SingleLang("Furio Scans", "https://furioscans.com", "pt-BR", overrideVersionCode = 4),