From 814fc3fe1e7bfd04a106ce5da547616d4f51f63a Mon Sep 17 00:00:00 2001 From: RainyXeon Date: Fri, 12 Jul 2024 17:56:04 +0700 Subject: [PATCH] fix: flash file corrupted --- module/build.gradle.kts | 11 +++++------ module/src/customize.sh | 10 +++++----- webroot/js/theme.js | 4 ++-- webroot/js/themes/{dark/index.js => dark.js} | 2 +- webroot/js/themes/{dark/navbar.js => darkNavbar.js} | 0 webroot/js/themes/{light/index.js => light.js} | 4 ++-- webroot/js/themes/{light/icon.js => lightIcon.js} | 0 webroot/js/themes/{light/navbar.js => lightNavbar.js} | 0 8 files changed, 15 insertions(+), 16 deletions(-) rename webroot/js/themes/{dark/index.js => dark.js} (96%) rename webroot/js/themes/{dark/navbar.js => darkNavbar.js} (100%) rename webroot/js/themes/{light/index.js => light.js} (94%) rename webroot/js/themes/{light/icon.js => lightIcon.js} (100%) rename webroot/js/themes/{light/navbar.js => lightNavbar.js} (100%) diff --git a/module/build.gradle.kts b/module/build.gradle.kts index 7b60273..d691002 100644 --- a/module/build.gradle.kts +++ b/module/build.gradle.kts @@ -176,12 +176,11 @@ androidComponents.onVariants { variant -> set.add(Pair(root.file("webroot/js/translate/modules.js").asFile, null)) set.add(Pair(root.file("webroot/js/translate/settings.js").asFile, null)) - set.add(Pair(root.file("webroot/js/themes/dark/index.js").asFile, null)) - set.add(Pair(root.file("webroot/js/themes/dark/navbar.js").asFile, null)) - - set.add(Pair(root.file("webroot/js/themes/light/index.js").asFile, null)) - set.add(Pair(root.file("webroot/js/themes/light/navbar.js").asFile, null)) - set.add(Pair(root.file("webroot/js/themes/light/icon.js").asFile, null)) + set.add(Pair(root.file("webroot/js/themes/dark.js").asFile, null)) + set.add(Pair(root.file("webroot/js/themes/darkNavbar.js").asFile, null)) + set.add(Pair(root.file("webroot/js/themes/light.js").asFile, null)) + set.add(Pair(root.file("webroot/js/themes/lightNavbar.js").asFile, null)) + set.add(Pair(root.file("webroot/js/themes/lightIcon.js").asFile, null)) set.add(Pair(root.file("webroot/js/list/language.js").asFile, null)) diff --git a/module/src/customize.sh b/module/src/customize.sh index 36a8351..9f012de 100644 --- a/module/src/customize.sh +++ b/module/src/customize.sh @@ -127,11 +127,11 @@ extract "$ZIPFILE" 'webroot/js/translate/action.js' "$MODPATH/webroot/js/transla extract "$ZIPFILE" 'webroot/js/translate/modules.js' "$MODPATH/webroot/js/translate" true extract "$ZIPFILE" 'webroot/js/translate/settings.js' "$MODPATH/webroot/js/translate" true -extract "$ZIPFILE" 'webroot/js/theme/dark/index.js' "$MODPATH/webroot/js/theme/dark" true -extract "$ZIPFILE" 'webroot/js/theme/dark/navbar.js' "$MODPATH/webroot/js/theme/dark" true -extract "$ZIPFILE" 'webroot/js/theme/light/index.js' "$MODPATH/webroot/js/theme/light" true -extract "$ZIPFILE" 'webroot/js/theme/light/navbar.js' "$MODPATH/webroot/js/theme/light" true -extract "$ZIPFILE" 'webroot/js/theme/light/icon.js' "$MODPATH/webroot/js/theme/light" true +extract "$ZIPFILE" 'webroot/js/theme/dark.js' "$MODPATH/webroot/js/theme" true +extract "$ZIPFILE" 'webroot/js/theme/darkNavbar.js' "$MODPATH/webroot/js/theme" true +extract "$ZIPFILE" 'webroot/js/theme/light.js' "$MODPATH/webroot/js/theme" true +extract "$ZIPFILE" 'webroot/js/theme/lightNavbar.js' "$MODPATH/webroot/js/theme" true +extract "$ZIPFILE" 'webroot/js/theme/lightIcon.js' "$MODPATH/webroot/js/theme" true extract "$ZIPFILE" 'webroot/js/list/language.js' "$MODPATH/webroot/js/list" true diff --git a/webroot/js/theme.js b/webroot/js/theme.js index 2bf4e78..88e4963 100644 --- a/webroot/js/theme.js +++ b/webroot/js/theme.js @@ -1,5 +1,5 @@ -import { setDark } from "./themes/dark/index.js" -import { setLight } from "./themes/light/index.js" +import { setDark } from "./themes/dark.js" +import { setLight } from "./themes/light.js" const button = document.getElementById('theme_switcher') diff --git a/webroot/js/themes/dark/index.js b/webroot/js/themes/dark.js similarity index 96% rename from webroot/js/themes/dark/index.js rename to webroot/js/themes/dark.js index 3646c2f..9ded822 100644 --- a/webroot/js/themes/dark/index.js +++ b/webroot/js/themes/dark.js @@ -1,4 +1,4 @@ -import { setDarkNav } from "./navbar.js" +import { setDarkNav } from "./darkNavbar.js" const rootCss = document.querySelector(':root') diff --git a/webroot/js/themes/dark/navbar.js b/webroot/js/themes/darkNavbar.js similarity index 100% rename from webroot/js/themes/dark/navbar.js rename to webroot/js/themes/darkNavbar.js diff --git a/webroot/js/themes/light/index.js b/webroot/js/themes/light.js similarity index 94% rename from webroot/js/themes/light/index.js rename to webroot/js/themes/light.js index cc4c5b8..a4d8b40 100644 --- a/webroot/js/themes/light/index.js +++ b/webroot/js/themes/light.js @@ -2,8 +2,8 @@ import { light_close_icon, light_expand_icon, light_copy_icon, -} from "./icon.js" -import { setLightNav } from "./navbar.js" +} from "./lightIcon.js" +import { setLightNav } from "./lightNavbar.js" const rootCss = document.querySelector(':root') /* INFO: Changes the icons to match the theme */ diff --git a/webroot/js/themes/light/icon.js b/webroot/js/themes/lightIcon.js similarity index 100% rename from webroot/js/themes/light/icon.js rename to webroot/js/themes/lightIcon.js diff --git a/webroot/js/themes/light/navbar.js b/webroot/js/themes/lightNavbar.js similarity index 100% rename from webroot/js/themes/light/navbar.js rename to webroot/js/themes/lightNavbar.js