diff --git a/module/build.gradle.kts b/module/build.gradle.kts index 7f2efe3..b88ec3e 100644 --- a/module/build.gradle.kts +++ b/module/build.gradle.kts @@ -166,7 +166,6 @@ androidComponents.onVariants { variant -> set.add(Pair(root.file("webroot/js/main.js").asFile, null)) set.add(Pair(root.file("webroot/js/kernelsu.js").asFile, null)) - set.add(Pair(root.file("webroot/js/theme.js").asFile, null)) set.add(Pair(root.file("webroot/js/language.js").asFile, null)) set.add(Pair(root.file("webroot/js/restoreError.js").asFile, null)) set.add(Pair(root.file("webroot/js/navbar.js").asFile, null)) @@ -174,6 +173,7 @@ androidComponents.onVariants { variant -> set.add(Pair(root.file("webroot/js/errorCatcher.js").asFile, null)) set.add(Pair(root.file("webroot/js/browserRedirect.js").asFile, null)) set.add(Pair(root.file("webroot/js/errorScreen.js").asFile, null)) + set.add(Pair(root.file("webroot/js/smallPageDesabler.js").asFile, null)) set.add(Pair(root.file("webroot/js/translate/action.js").asFile, null)) set.add(Pair(root.file("webroot/js/translate/home.js").asFile, null)) @@ -186,8 +186,6 @@ androidComponents.onVariants { variant -> 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)) - set.add(Pair(root.file("webroot/js/switcher/fontChanger.js").asFile, null)) set.add(Pair(root.file("webroot/lang/en_US.json").asFile, null)) @@ -199,7 +197,9 @@ androidComponents.onVariants { variant -> set.add(Pair(root.file("webroot/lang/zh_CN.json").asFile, null)) set.add(Pair(root.file("webroot/lang/zh_TW.json").asFile, null)) - set.add(Pair(root.file("webroot/js/modal/language.js").asFile, null)) + set.add(Pair(root.file("webroot/js/smallPage/language.js").asFile, null)) + set.add(Pair(root.file("webroot/js/smallPage/theme.js").asFile, null)) + set.add(Pair(root.file("webroot/js/modal/errorHistory.js").asFile, null)) set.add(Pair(root.file("webroot/css/index.css").asFile, null)) @@ -223,6 +223,7 @@ androidComponents.onVariants { variant -> set.add(Pair(root.file("webroot/assets/home.svg").asFile, null)) set.add(Pair(root.file("webroot/assets/delete.svg").asFile, null)) set.add(Pair(root.file("webroot/assets/ec-icon.svg").asFile, null)) + set.add(Pair(root.file("webroot/assets/back.svg").asFile, null)) set.add(Pair(root.file("webroot/assets_light/action.svg").asFile, null)) set.add(Pair(root.file("webroot/assets_light/home.svg").asFile, null)) diff --git a/module/src/customize.sh b/module/src/customize.sh index 3ef3a06..9457499 100644 --- a/module/src/customize.sh +++ b/module/src/customize.sh @@ -117,7 +117,6 @@ extract "$ZIPFILE" 'webroot/index.html' "$MODPATH/webroot" true extract "$ZIPFILE" 'webroot/js/main.js' "$MODPATH/webroot/js" true extract "$ZIPFILE" 'webroot/js/kernelsu.js' "$MODPATH/webroot/js" true -extract "$ZIPFILE" 'webroot/js/theme.js' "$MODPATH/webroot/js" true extract "$ZIPFILE" 'webroot/js/language.js' "$MODPATH/webroot/js" true extract "$ZIPFILE" 'webroot/js/navbar.js' "$MODPATH/webroot/js" true extract "$ZIPFILE" 'webroot/js/restoreError.js' "$MODPATH/webroot/js" true @@ -125,6 +124,7 @@ extract "$ZIPFILE" 'webroot/js/daemonActions.js' "$MODPATH/webroot/js" true extract "$ZIPFILE" 'webroot/js/errorCatcher.js' "$MODPATH/webroot/js" true extract "$ZIPFILE" 'webroot/js/browserRedirect.js' "$MODPATH/webroot/js" true extract "$ZIPFILE" 'webroot/js/errorScreen.js' "$MODPATH/webroot/js" true +extract "$ZIPFILE" 'webroot/js/smallPageDesabler.js' "$MODPATH/webroot/js" true extract "$ZIPFILE" 'webroot/js/translate/home.js' "$MODPATH/webroot/js/translate" true extract "$ZIPFILE" 'webroot/js/translate/action.js' "$MODPATH/webroot/js/translate" true @@ -137,15 +137,11 @@ extract "$ZIPFILE" 'webroot/js/themes/light.js' "$MODPATH/webroot/js/themes" tru extract "$ZIPFILE" 'webroot/js/themes/lightNavbar.js' "$MODPATH/webroot/js/themes" true extract "$ZIPFILE" 'webroot/js/themes/lightIcon.js' "$MODPATH/webroot/js/themes" true -extract "$ZIPFILE" 'webroot/js/list/language.js' "$MODPATH/webroot/js/list" true - -for lang in en_US ja_JP pt_BR ro_RO ru_RU vi_VN zh_CN zh_TW; do - extract "$ZIPFILE" "webroot/lang/${lang}.json" "$MODPATH/webroot/lang" true -done - -extract "$ZIPFILE" 'webroot/js/modal/language.js' "$MODPATH/webroot/js/modal" true extract "$ZIPFILE" 'webroot/js/modal/errorHistory.js' "$MODPATH/webroot/js/modal" true +extract "$ZIPFILE" 'webroot/js/smallPage/language.js' "$MODPATH/webroot/js/smallPage" true +extract "$ZIPFILE" 'webroot/js/smallPage/theme.js' "$MODPATH/webroot/js/smallPage" true + extract "$ZIPFILE" 'webroot/js/switcher/fontChanger.js' "$MODPATH/webroot/js/switcher" true extract "$ZIPFILE" 'webroot/css/index.css' "$MODPATH/webroot/css" true @@ -156,7 +152,11 @@ extract "$ZIPFILE" 'webroot/css/error.css' "$MODPATH/webroot/css" true extract "$ZIPFILE" 'webroot/fonts/ProductSans-Italic.ttf' "$MODPATH/webroot/fonts" true extract "$ZIPFILE" 'webroot/fonts/ProductSans-Regular.ttf' "$MODPATH/webroot/fonts" true -for svg in mark tick warn module expand settings close content error action home delete ec-icon; do +for lang in en_US ja_JP pt_BR ro_RO ru_RU vi_VN zh_CN zh_TW; do + extract "$ZIPFILE" "webroot/lang/${lang}.json" "$MODPATH/webroot/lang" true +done + +for svg in mark tick warn module expand settings close content error action home delete ec-icon back; do extract "$ZIPFILE" "webroot/assets/${svg}.svg" "$MODPATH/webroot/assets" true done diff --git a/webroot/assets/back.svg b/webroot/assets/back.svg new file mode 100644 index 0000000..120c7d9 --- /dev/null +++ b/webroot/assets/back.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/webroot/index.html b/webroot/index.html index 5048a29..a8f2236 100644 --- a/webroot/index.html +++ b/webroot/index.html @@ -14,13 +14,14 @@ - + - + - + + @@ -50,22 +51,6 @@
- - -
-
-
-
- -
-
-
-

Choose your new language

-
-
- -
-
@@ -129,6 +114,7 @@
+
Modules
@@ -144,7 +130,7 @@
-
Daemon (32 bit)
+
Monitor (32 bit)
Unknown
@@ -152,14 +138,14 @@
Stop
Start
-
Exit
+
Pause
-
Daemon (64 bit)
+
Monitor (64 bit)
Unknown
@@ -167,7 +153,7 @@
Stop
Start
-
Exit
+
Pause
@@ -195,24 +181,19 @@ -
-
+
+
- Enable light theme + System theme
- This option will enable light theme for WebUI + Choose your system theme for current WebUI
- -
-
+
Change language @@ -280,6 +261,42 @@
+ +
+
+
+ +
+
Theme
+
+
+
+
+
Dark
+
+
+
Light
+
+
+
System Based
+
+
+
+ + +
+
+
+ +
+
Choose your new language
+
+
+
+ +
+
+