From c5150c26eb755c2438f0585bb97b83ed90d9d1a1 Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Sun, 14 Feb 2021 07:29:49 -0800 Subject: [PATCH] [SKIP CI] add additional gradle support (#5845) --- .../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 .../res}/web_hi_res_512.png | Bin .../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 .../res}/web_hi_res_512.png | Bin .../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 .../res}/web_hi_res_512.png | Bin .../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 .../res}/web_hi_res_512.png | Bin .../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 .../res}/web_hi_res_512.png | Bin .../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 .../res}/web_hi_res_512.png | Bin .../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 .../res}/web_hi_res_512.png | Bin .../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 .../res}/web_hi_res_512.png | Bin .../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 .../res}/web_hi_res_512.png | Bin .../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 .../res}/web_hi_res_512.png | Bin .../multisrc/ThemeSourceGenerator.kt | 64 ++++++++++-------- 61 files changed, 36 insertions(+), 28 deletions(-) rename multisrc/overrides/comicake/{default_res => default/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/comicake/{default_res => default/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/comicake/{default_res => default/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/comicake/{default_res => default/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/comicake/{default_res => default/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/comicake/{default_res => default/res}/web_hi_res_512.png (100%) rename multisrc/overrides/eromuse/{default_res => default/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/eromuse/{default_res => default/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/eromuse/{default_res => default/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/eromuse/{default_res => default/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/eromuse/{default_res => default/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/eromuse/{default_res => default/res}/web_hi_res_512.png (100%) rename multisrc/overrides/fmreader/{default_res => default/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/fmreader/{default_res => default/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/fmreader/{default_res => default/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/fmreader/{default_res => default/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/fmreader/{default_res => default/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/fmreader/{default_res => default/res}/web_hi_res_512.png (100%) rename multisrc/overrides/genkan/{default_res => default/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/genkan/{default_res => default/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/genkan/{default_res => default/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/genkan/{default_res => default/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/genkan/{default_res => default/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/genkan/{default_res => default/res}/web_hi_res_512.png (100%) rename multisrc/overrides/madara/{default_res => default/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/madara/{default_res => default/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/madara/{default_res => default/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/madara/{default_res => default/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/madara/{default_res => default/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/madara/{default_res => default/res}/web_hi_res_512.png (100%) rename multisrc/overrides/mangabox/{default_res => default/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/mangabox/{default_res => default/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/mangabox/{default_res => default/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/mangabox/{default_res => default/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/mangabox/{default_res => default/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/mangabox/{default_res => default/res}/web_hi_res_512.png (100%) rename multisrc/overrides/mangadventure/{default_res => default/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/mangadventure/{default_res => default/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/mangadventure/{default_res => default/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/mangadventure/{default_res => default/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/mangadventure/{default_res => default/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/mangadventure/{default_res => default/res}/web_hi_res_512.png (100%) rename multisrc/overrides/paprika/{default_res => default/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/paprika/{default_res => default/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/paprika/{default_res => default/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/paprika/{default_res => default/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/paprika/{default_res => default/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/paprika/{default_res => default/res}/web_hi_res_512.png (100%) rename multisrc/overrides/wpcomics/{default_res => default/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/wpcomics/{default_res => default/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/wpcomics/{default_res => default/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/wpcomics/{default_res => default/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/wpcomics/{default_res => default/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/wpcomics/{default_res => default/res}/web_hi_res_512.png (100%) rename multisrc/overrides/wpmangareader/{default_res => default/res}/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/wpmangareader/{default_res => default/res}/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/wpmangareader/{default_res => default/res}/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/wpmangareader/{default_res => default/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/wpmangareader/{default_res => default/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/wpmangareader/{default_res => default/res}/web_hi_res_512.png (100%) diff --git a/multisrc/overrides/comicake/default_res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/comicake/default/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/comicake/default_res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/comicake/default/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/comicake/default_res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/comicake/default/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/comicake/default_res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/comicake/default/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/comicake/default_res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/comicake/default/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/comicake/default_res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/comicake/default/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/comicake/default_res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/comicake/default/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/comicake/default_res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/comicake/default/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/comicake/default_res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/comicake/default/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/comicake/default_res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/comicake/default/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/comicake/default_res/web_hi_res_512.png b/multisrc/overrides/comicake/default/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/comicake/default_res/web_hi_res_512.png rename to multisrc/overrides/comicake/default/res/web_hi_res_512.png diff --git a/multisrc/overrides/eromuse/default_res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/eromuse/default/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/eromuse/default_res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/eromuse/default/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/eromuse/default_res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/eromuse/default/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/eromuse/default_res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/eromuse/default/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/eromuse/default_res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/eromuse/default/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/eromuse/default_res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/eromuse/default/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/eromuse/default_res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/eromuse/default/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/eromuse/default_res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/eromuse/default/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/eromuse/default_res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/eromuse/default/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/eromuse/default_res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/eromuse/default/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/eromuse/default_res/web_hi_res_512.png b/multisrc/overrides/eromuse/default/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/eromuse/default_res/web_hi_res_512.png rename to multisrc/overrides/eromuse/default/res/web_hi_res_512.png diff --git a/multisrc/overrides/fmreader/default_res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/fmreader/default/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/fmreader/default_res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/fmreader/default/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/fmreader/default_res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/fmreader/default/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/fmreader/default_res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/fmreader/default/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/fmreader/default_res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/fmreader/default/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/fmreader/default_res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/fmreader/default/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/fmreader/default_res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/fmreader/default/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/fmreader/default_res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/fmreader/default/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/fmreader/default_res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/fmreader/default/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/fmreader/default_res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/fmreader/default/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/fmreader/default_res/web_hi_res_512.png b/multisrc/overrides/fmreader/default/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/fmreader/default_res/web_hi_res_512.png rename to multisrc/overrides/fmreader/default/res/web_hi_res_512.png diff --git a/multisrc/overrides/genkan/default_res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/genkan/default/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/genkan/default_res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/genkan/default/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/genkan/default_res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/genkan/default/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/genkan/default_res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/genkan/default/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/genkan/default_res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/genkan/default/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/genkan/default_res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/genkan/default/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/genkan/default_res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/genkan/default/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/genkan/default_res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/default/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/genkan/default_res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/genkan/default/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/genkan/default_res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/genkan/default/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/genkan/default_res/web_hi_res_512.png b/multisrc/overrides/genkan/default/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/genkan/default_res/web_hi_res_512.png rename to multisrc/overrides/genkan/default/res/web_hi_res_512.png diff --git a/multisrc/overrides/madara/default_res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/default/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/default_res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/madara/default/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/default_res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/default/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/default_res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/madara/default/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/default_res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/default/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/default_res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/madara/default/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/default_res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/default/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/default_res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/madara/default/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/default_res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/default/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/default_res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/madara/default/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/default_res/web_hi_res_512.png b/multisrc/overrides/madara/default/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/madara/default_res/web_hi_res_512.png rename to multisrc/overrides/madara/default/res/web_hi_res_512.png diff --git a/multisrc/overrides/mangabox/default_res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/mangabox/default/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangabox/default_res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/mangabox/default/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/mangabox/default_res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/mangabox/default/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangabox/default_res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/mangabox/default/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/mangabox/default_res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/mangabox/default/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangabox/default_res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/default/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/mangabox/default_res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/mangabox/default/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangabox/default_res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/default/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/mangabox/default_res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/mangabox/default/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangabox/default_res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/mangabox/default/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/mangabox/default_res/web_hi_res_512.png b/multisrc/overrides/mangabox/default/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/mangabox/default_res/web_hi_res_512.png rename to multisrc/overrides/mangabox/default/res/web_hi_res_512.png diff --git a/multisrc/overrides/mangadventure/default_res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/mangadventure/default/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangadventure/default_res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/mangadventure/default/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/mangadventure/default_res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/mangadventure/default/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangadventure/default_res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/mangadventure/default/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/mangadventure/default_res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/mangadventure/default/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangadventure/default_res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/mangadventure/default/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/mangadventure/default_res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/mangadventure/default/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangadventure/default_res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/mangadventure/default/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/mangadventure/default_res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/mangadventure/default/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/mangadventure/default_res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/mangadventure/default/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/mangadventure/default_res/web_hi_res_512.png b/multisrc/overrides/mangadventure/default/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/mangadventure/default_res/web_hi_res_512.png rename to multisrc/overrides/mangadventure/default/res/web_hi_res_512.png diff --git a/multisrc/overrides/paprika/default_res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/paprika/default/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/paprika/default_res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/paprika/default/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/paprika/default_res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/paprika/default/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/paprika/default_res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/paprika/default/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/paprika/default_res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/paprika/default/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/paprika/default_res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/paprika/default/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/paprika/default_res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/paprika/default/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/paprika/default_res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/paprika/default/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/paprika/default_res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/paprika/default/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/paprika/default_res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/paprika/default/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/paprika/default_res/web_hi_res_512.png b/multisrc/overrides/paprika/default/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/paprika/default_res/web_hi_res_512.png rename to multisrc/overrides/paprika/default/res/web_hi_res_512.png diff --git a/multisrc/overrides/wpcomics/default_res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/wpcomics/default/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/wpcomics/default_res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/wpcomics/default/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/wpcomics/default_res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/wpcomics/default/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/wpcomics/default_res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/wpcomics/default/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/wpcomics/default_res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/wpcomics/default/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/wpcomics/default_res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/wpcomics/default/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/wpcomics/default_res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/wpcomics/default/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/wpcomics/default_res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/wpcomics/default/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/wpcomics/default_res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/wpcomics/default/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/wpcomics/default_res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/wpcomics/default/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/wpcomics/default_res/web_hi_res_512.png b/multisrc/overrides/wpcomics/default/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/wpcomics/default_res/web_hi_res_512.png rename to multisrc/overrides/wpcomics/default/res/web_hi_res_512.png diff --git a/multisrc/overrides/wpmangareader/default_res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/default/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/wpmangareader/default_res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/wpmangareader/default/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/wpmangareader/default_res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/default/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/wpmangareader/default_res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/wpmangareader/default/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/wpmangareader/default_res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/default/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/wpmangareader/default_res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/wpmangareader/default/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/wpmangareader/default_res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/default/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/wpmangareader/default_res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/wpmangareader/default/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/wpmangareader/default_res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/default/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/wpmangareader/default_res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/wpmangareader/default/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/wpmangareader/default_res/web_hi_res_512.png b/multisrc/overrides/wpmangareader/default/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/wpmangareader/default_res/web_hi_res_512.png rename to multisrc/overrides/wpmangareader/default/res/web_hi_res_512.png diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/ThemeSourceGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/ThemeSourceGenerator.kt index 1e08d20ab..dcda37b4b 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/ThemeSourceGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/ThemeSourceGenerator.kt @@ -49,7 +49,12 @@ interface ThemeSourceGenerator { return listOf("eu", "kanade", "tachiyomi", "multisrc", themePkg).joinToString(separator) } - private fun writeGradle(gradle: File, source: ThemeSourceData, themePkg: String, baseVersionCode: Int) { + private fun writeGradle(gradle: File, source: ThemeSourceData, themePkg: String, baseVersionCode: Int, defaultAdditionalGradlePath: String, additionalGradleOverridePath: String) { + fun File.readTextOrEmptyString(): String = if (exists()) readText(Charsets.UTF_8) else "" + + val defaultAdditionalGradleText = File(defaultAdditionalGradlePath).readTextOrEmptyString() + val additionalGradleOverrideText = File(additionalGradleOverridePath).readTextOrEmptyString() + gradle.writeText(""" // THIS FILE IS AUTO-GENERATED; DO NOT EDIT apply plugin: 'com.android.application' @@ -64,7 +69,8 @@ interface ThemeSourceGenerator { libVersion = '1.2' ${if (source.isNsfw) "containsNsfw = true\n" else ""} } - + $defaultAdditionalGradleText + $additionalGradleOverrideText apply from: "${'$'}rootDir/common.gradle" """.trimIndent()) } @@ -85,10 +91,12 @@ interface ThemeSourceGenerator { val projectRootPath = "$userDir/generated-src/${pkgNameSuffix(source, "/")}" val projectSrcPath = "$projectRootPath/src/eu/kanade/tachiyomi/extension/${pkgNameSuffix(source, "/")}" val overridesPath = "$userDir/multisrc/overrides/$themePkg/${source.pkgName}" // userDir = tachiyomi-extensions project root path - val defaultResPath = "$userDir/multisrc/overrides/$themePkg/default_res" - val resOverridesPath = "$overridesPath/res" - val srcOverridesPath = "$overridesPath/src" - val manifestOverridesPath = "$overridesPath/AndroidManifest.xml" + val defaultResPath = "$userDir/multisrc/overrides/$themePkg/default/res" + val defaultAdditionalGradlePath = "$userDir/multisrc/overrides/$themePkg/default/additional.gradle.kts" + val resOverridePath = "$overridesPath/res" + val srcOverridePath = "$overridesPath/src" + val manifestOverridePath = "$overridesPath/AndroidManifest.xml" + val additionalGradleOverridePath = "$overridesPath/additional.gradle.kts" val projectGradleFile = File("$projectRootPath/build.gradle") val projectAndroidManifestFile = File("$projectRootPath/AndroidManifest.xml") @@ -99,13 +107,13 @@ interface ThemeSourceGenerator { // remove everything from past runs cleanDirectory(projectRootFile) - writeGradle(projectGradleFile, source, themePkg, baseVersionCode) - writeAndroidManifest(projectAndroidManifestFile, manifestOverridesPath) + writeGradle(projectGradleFile, source, themePkg, baseVersionCode, defaultAdditionalGradlePath, additionalGradleOverridePath) + writeAndroidManifest(projectAndroidManifestFile, manifestOverridePath) - writeSourceClasses(projectSrcPath, srcOverridesPath, source, themePkg, themeClass) + writeSourceClasses(projectSrcPath, srcOverridePath, source, themePkg, themeClass) copyThemeClasses(userDir, themePkg, projectRootPath) - copyResFiles(overridesPath, defaultResPath, source, projectRootPath) + copyResFiles(resOverridePath, defaultResPath, source, projectRootPath) } } @@ -118,13 +126,13 @@ interface ThemeSourceGenerator { themeDestFile.mkdirs() themeSrcFile.list()!! - .filter { it.endsWith(".kt") && !it.endsWith("Generator.kt") } - .forEach { Files.copy(File("$themeSrcPath/$it").toPath(), File("$themeDestPath/$it").toPath(), StandardCopyOption.REPLACE_EXISTING) } + .filter { it.endsWith(".kt") && !it.endsWith("Generator.kt") } + .forEach { Files.copy(File("$themeSrcPath/$it").toPath(), File("$themeDestPath/$it").toPath(), StandardCopyOption.REPLACE_EXISTING) } } - private fun copyResFiles(overridesPath: String, defaultResPath: String, source: ThemeSourceData, projectRootPath: String): Any { + private fun copyResFiles(resOverridePath: String, defaultResPath: String, source: ThemeSourceData, projectRootPath: String): Any { // check if res override exists if not copy default res - val resOverride = File("$overridesPath/res") + val resOverride = File(resOverridePath) return if (resOverride.exists()) resOverride.copyRecursively(File("$projectRootPath/res")) else @@ -205,23 +213,23 @@ sealed class ThemeSourceData { abstract val overrideVersionCode: Int data class SingleLang( - override val name: String, - override val baseUrl: String, - val lang: String, - override val isNsfw: Boolean = false, - override val className: String = name.replace(" ", ""), - override val pkgName: String = className.toLowerCase(Locale.ENGLISH), - override val overrideVersionCode: Int = 0, + override val name: String, + override val baseUrl: String, + val lang: String, + override val isNsfw: Boolean = false, + override val className: String = name.replace(" ", ""), + override val pkgName: String = className.toLowerCase(Locale.ENGLISH), + override val overrideVersionCode: Int = 0, ) : ThemeSourceData() data class MultiLang( - override val name: String, - override val baseUrl: String, - val langs: List, - override val isNsfw: Boolean = false, - override val className: String = name.replace(" ", "") + "Factory", - override val pkgName: String = className.substringBefore("Factory").toLowerCase(Locale.ENGLISH), - override val overrideVersionCode: Int = 0, + override val name: String, + override val baseUrl: String, + val langs: List, + override val isNsfw: Boolean = false, + override val className: String = name.replace(" ", "") + "Factory", + override val pkgName: String = className.substringBefore("Factory").toLowerCase(Locale.ENGLISH), + override val overrideVersionCode: Int = 0, ) : ThemeSourceData() }