From c909e21ebc52a4f4f421a9653efb5bb600193b46 Mon Sep 17 00:00:00 2001 From: RainyXeon / Date: Wed, 26 Jun 2024 21:54:49 +0700 Subject: [PATCH] add: new module list interface --- module/build.gradle.kts | 1 + module/src/customize.sh | 1 + webroot/assets/module.svg | 1 + webroot/js/main.js | 21 ++++++++++++--------- webroot/js/theme.js | 8 ++++++++ 5 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 webroot/assets/module.svg diff --git a/module/build.gradle.kts b/module/build.gradle.kts index 1eb5f54..3505317 100644 --- a/module/build.gradle.kts +++ b/module/build.gradle.kts @@ -179,6 +179,7 @@ androidComponents.onVariants { variant -> set.add(Pair(root.file("webroot/assets/warn.svg").asFile, null)) set.add(Pair(root.file("webroot/assets/light.svg").asFile, null)) set.add(Pair(root.file("webroot/assets/dark.svg").asFile, null)) + set.add(Pair(root.file("webroot/assets/module.svg").asFile, null)) sig.initSign(privKey) set.forEach { it.first.sha(it.second) } val signFile = root.file(name).asFile diff --git a/module/src/customize.sh b/module/src/customize.sh index ae26226..c07f7ad 100644 --- a/module/src/customize.sh +++ b/module/src/customize.sh @@ -130,6 +130,7 @@ extract "$ZIPFILE" 'webroot/assets/tick.svg' "$MODPATH/webroot/assets" true extract "$ZIPFILE" 'webroot/assets/warn.svg' "$MODPATH/webroot/assets" true extract "$ZIPFILE" 'webroot/assets/light.svg' "$MODPATH/webroot/assets" true extract "$ZIPFILE" 'webroot/assets/dark.svg' "$MODPATH/webroot/assets" true +extract "$ZIPFILE" 'webroot/assets/module.svg' "$MODPATH/webroot/assets" true if [ "$ARCH" = "x86" ] || [ "$ARCH" = "x64" ]; then ui_print "- Extracting x86 libraries" diff --git a/webroot/assets/module.svg b/webroot/assets/module.svg new file mode 100644 index 0000000..db99786 --- /dev/null +++ b/webroot/assets/module.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/webroot/js/main.js b/webroot/js/main.js index 23c9cd0..0e2e076 100644 --- a/webroot/js/main.js +++ b/webroot/js/main.js @@ -66,16 +66,19 @@ import { fullScreen, exec, toast } from './kernelsu.js'; modules_list.removeAttribute('style') modules_list.innerHTML += - `
- Modules (${modules.length}) + `
+
+ +
+
Modules (${modules.length})
-
` + ` - for (const module of modules) { + for ( i = 0; i < modules.length; i++) { + const module = modules[i] const lsZygiskCmd = await exec(`ls ${module}/zygisk`) if (lsZygiskCmd.errno !== 0) { toast(`ls ${module}/zygisk error (${lsZygiskCmd.errno}): ${lsZygiskCmd.stderr}`) - continue } @@ -92,10 +95,10 @@ import { fullScreen, exec, toast } from './kernelsu.js'; const name = lines.find(line => line.includes('name=')).split('=')[1] modules_list.innerHTML += - `
-
${name}
-
${bitsUsed.join(' / ')}
-
` + `
+
${name}
+
Arch: ${bitsUsed.join(' / ')}
+
` } else { toast(`cat ${module} error (${catCmd.errno}): ${catCmd.stderr}`) } diff --git a/webroot/js/theme.js b/webroot/js/theme.js index c5a99ef..2d6eb36 100644 --- a/webroot/js/theme.js +++ b/webroot/js/theme.js @@ -3,8 +3,14 @@ const light_icon = ` ` +const light_module_icon = ` + + + +` const rootCss = document.querySelector(':root') const button = document.getElementById('theme-switcher') +const module_list_icon = document.getElementById('modules_list_icon') let sys_theme = localStorage.getItem('system-theme') if (!sys_theme) sys_theme = setData('dark') @@ -25,6 +31,7 @@ function setDark() { rootCss.style.setProperty('--dim', '#1d2327') sys_theme = setData('dark') button.innerHTML = '' + module_list_icon.innerHTML = '' return } @@ -36,6 +43,7 @@ function setLight() { rootCss.style.setProperty('--dim', '#e0e0e0') sys_theme = setData('light') button.innerHTML = light_icon + module_list_icon.innerHTML = light_module_icon return }