🔧Fixed #23 & improved checking for setting theme

Hermit-Tools · Nov 1, 2020 · c14c3de · c14c3de
1 parent 942236f
commit c14c3de
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 11 deletions.
diff --git a/Source/cubfan135/index.html b/Source/cubfan135/index.html
@@ -33,23 +33,39 @@ <h1>DRAG A FILE HERE</h1>
   </div>
 
   <script>
+    if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
+      darken('dark', false);
+    }
+
     // Set Theme If Exists
-    if (localStorage.getItem("theme")) {
-      if (localStorage.getItem("theme") == "dark") {
+    if (localStorage.getItem("HTCC-theme")) {
+      if (localStorage.getItem("HTCC-theme") === "dark") {
         darken();
+      } else {
+        darken('light');
       }
     } else {
-      // Set Theme To Default
-      localStorage.setItem("theme", "light");
+      // Set Theme To Current theme
+      document.classList.contains('dark') ? darken() : darken('light')
     }
 
-    function darken() {
-      document.body.classList.toggle('dark')
-      // Check Theme and Save in Local Storage
-      if (document.body.classList.contains("dark")) {
-        localStorage.setItem("theme", "dark")
+    function darken(state = "dark", setLocalStorage = true) {
+      if (state === 'dark') {
+        if (!document.body.classList.contains('dark')) {
+          document.body.classList.toggle('dark')
+        }
       } else {
-        localStorage.setItem("theme", "light")
+        if (document.body.classList.contains('dark')) {
+          document.body.classList.toggle('dark')
+        }
+      }
+      // Check Theme and Save in Local Storage
+      if (setLocalStorage) {
+        if (document.body.classList.contains("dark")) {
+          localStorage.setItem("HTCC-theme", "dark")
+        } else {
+          localStorage.setItem("HTCC-theme", "light")
+        }
       }
     }
   </script>

diff --git a/Source/cubfan135/script.js b/Source/cubfan135/script.js
@@ -120,6 +120,6 @@ document.onkeydown = (e) => {
     oldTime = newTime;
 
     keyCheat.push(e.key.toLowerCase())
-    keyCheat.join('') === "invert" ? (darken(), keyCheat = []) : null
+    keyCheat.join('') === "invert" ? (darken(document.body.classList.contains("dark") ? "light" : "dark"), keyCheat = []) : null
   }
 }