From acc30a6e6a6cc2f94c449b1d3eb6ab83e6b57c67 Mon Sep 17 00:00:00 2001
From: Front <27463495+Frontesque@users.noreply.github.com>
Date: Tue, 15 Mar 2022 20:13:26 -0400
Subject: [PATCH] dark mode optimizations (beta 2)

---
 NUXT/components/bottomNavigation.vue |  2 +-
 NUXT/pages/mods/theme.vue            | 12 +++++++-----
 NUXT/plugins/libs.js                 | 14 +++++++-------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/NUXT/components/bottomNavigation.vue b/NUXT/components/bottomNavigation.vue
index 12215cb..62433dd 100644
--- a/NUXT/components/bottomNavigation.vue
+++ b/NUXT/components/bottomNavigation.vue
@@ -1,7 +1,7 @@
 <template>
 
   <v-bottom-navigation v-model="tabSelection" shift class="bottomNav py-4 accent2">
-    <v-btn v-for="(item, i) in tabs" :key="i" rounded class="navButton" :to="item.link" plain v-ripple="false">
+    <v-btn v-for="(item, i) in tabs" :key="i" class="navButton" :to="item.link" plain v-ripple="false">
 
       <span v-text="item.name" />
       <v-icon v-text="item.icon" :color="tabSelection == i ? 'primary' : 'grey'" :class="tabSelection == i ? 'tab primaryAlt' : ''" />
diff --git a/NUXT/pages/mods/theme.vue b/NUXT/pages/mods/theme.vue
index e92ee0e..010ed47 100644
--- a/NUXT/pages/mods/theme.vue
+++ b/NUXT/pages/mods/theme.vue
@@ -44,12 +44,12 @@ export default {
 
   data() {
     return {
-      accentColor: '#ffffff',
+      accentColor: '#ffffff'
     }
   },
 
   mounted() {
-    //this.accentColor = this.$vuetify.theme.themes.dark.primary;
+    this.accentColor = this.$vuetify.theme.themes.dark.primary;
   },
 
   methods: {
@@ -78,13 +78,15 @@ export default {
   watch: {
     accentColor: function (val, oldVal) {
       this.$vuetify.theme.currentTheme.primary = val;
-
-
       let primaryAlt = this.$libs.hexToRgb(val);
 
+      let rgbEdit = 130; //Light Mode
+      if (localStorage.getItem('darkTheme') === "true") rgbEdit = -80; //Dark Mode
+
       for (const i in primaryAlt) {
-        primaryAlt[i] = primaryAlt[i] + 100; //Amount To Lighten By
+        primaryAlt[i] = primaryAlt[i] + rgbEdit; //Amount To Lighten By
         if (primaryAlt[i] > 255) primaryAlt[i] = 255;
+        if (primaryAlt[i] < 0) primaryAlt[i] = 0;
       }
 
       primaryAlt = this.$libs.rgbToHex(primaryAlt.r, primaryAlt.g, primaryAlt.b);
diff --git a/NUXT/plugins/libs.js b/NUXT/plugins/libs.js
index db2a4bd..f9fb6cd 100644
--- a/NUXT/plugins/libs.js
+++ b/NUXT/plugins/libs.js
@@ -1,16 +1,16 @@
 const module = {
 
     hexToRgb: function (hex, callback) {
-        var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
-        return result ? {
-          r: parseInt(result[1], 16),
-          g: parseInt(result[2], 16),
-          b: parseInt(result[3], 16)
-        } : null;
+      var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+      return result ? {
+        r: parseInt(result[1], 16),
+        g: parseInt(result[2], 16),
+        b: parseInt(result[3], 16)
+      } : null;
     },
 
     rgbToHex: function(r, g, b) {
-        return "#" + ((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1);
+      return "#" + ((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1);
     }