From 37fc9a44b1c35dc5f1dfe2f1787f7465ab90d85f Mon Sep 17 00:00:00 2001
From: RainyXeon / <minh15052008@gmail.com>
Date: Tue, 25 Jun 2024 21:26:38 +0700
Subject: [PATCH] fix: svg sometimes not showing on webui

---
 module/build.gradle.kts                |  6 +++++-
 module/src/customize.sh                | 16 ++++++++++++++--
 webroot/index.html                     |  2 +-
 webroot/js/{init_theme.js => theme.js} |  0
 4 files changed, 20 insertions(+), 4 deletions(-)
 rename webroot/js/{init_theme.js => theme.js} (100%)

diff --git a/module/build.gradle.kts b/module/build.gradle.kts
index acc1ad9..1eb5f54 100644
--- a/module/build.gradle.kts
+++ b/module/build.gradle.kts
@@ -163,13 +163,17 @@ androidComponents.onVariants { variant ->
                         )
                     )
                     set.add(Pair(root.file("webroot/index.html").asFile, null))
+
                     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/init_theme.js").asFile, null))
+                    set.add(Pair(root.file("webroot/js/theme.js").asFile, null))
+
                     set.add(Pair(root.file("webroot/fonts/ProductSans-Regular.ttf").asFile, null))
                     set.add(Pair(root.file("webroot/fonts/ProductSans-Italic.ttf").asFile, null))
+
                     set.add(Pair(root.file("webroot/css/index.css").asFile, null))
                     set.add(Pair(root.file("webroot/css/fonts.css").asFile, null))
+                    
                     set.add(Pair(root.file("webroot/assets/mark.svg").asFile, null))
                     set.add(Pair(root.file("webroot/assets/tick.svg").asFile, null))
                     set.add(Pair(root.file("webroot/assets/warn.svg").asFile, null))
diff --git a/module/src/customize.sh b/module/src/customize.sh
index 65954ac..ae26226 100644
--- a/module/src/customize.sh
+++ b/module/src/customize.sh
@@ -114,10 +114,22 @@ mkdir "$MODPATH/webroot"
 
 ui_print "- Extracting webroot"
 extract "$ZIPFILE" 'webroot/index.html' "$MODPATH/webroot" true
-extract "$ZIPFILE" 'webroot/assets/tick.svg' "$MODPATH/webroot/assets" true
-extract "$ZIPFILE" 'webroot/css/index.css' "$MODPATH/webroot/css" 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/fonts/ProductSans-Regular.ttf' "$MODPATH/webroot/fonts" true
+extract "$ZIPFILE" 'webroot/fonts/ProductSans-Italic.ttf' "$MODPATH/webroot/fonts" true
+
+extract "$ZIPFILE" 'webroot/css/index.css' "$MODPATH/webroot/css" true
+extract "$ZIPFILE" 'webroot/css/fonts.css' "$MODPATH/webroot/css" true
+
+extract "$ZIPFILE" 'webroot/assets/mark.svg' "$MODPATH/webroot/assets" true
+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
 
 if [ "$ARCH" = "x86" ] || [ "$ARCH" = "x64" ]; then
   ui_print "- Extracting x86 libraries"
diff --git a/webroot/index.html b/webroot/index.html
index eb87125..a5adcbc 100644
--- a/webroot/index.html
+++ b/webroot/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="initial-scale=1, width=device-width" />
     <meta name="viewport" content="viewport-fit=cover" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <script src="js/init_theme.js" type="module"></script>
+    <script src="js/theme.js" type="module"></script>
     <link rel="stylesheet" href="css/fonts.css">
     <link rel="stylesheet" href="css/index.css">
     <script src="js/main.js" type="module"></script>
diff --git a/webroot/js/init_theme.js b/webroot/js/theme.js
similarity index 100%
rename from webroot/js/init_theme.js
rename to webroot/js/theme.js