refactor: remove white accent in favour of none (#62)

catppuccin/color.ini

@@ -44,8 +44,7 @@ blue               = 8caaee
 sky                = 99dadb
 mauve              = ca9ee6
 lavender           = babbf1
-white              = d9e0ee
-mauve              = ca9ee6
+
 
 [latte]
 # Spicetify
@@ -93,7 +92,7 @@ blue               = 1e66f5
 sky                = 04a5e5
 mauve              = 8839ef
 lavender           = 7287fd
-white              = d9e0ee
+
 
 
 [macchiato]
@@ -142,7 +141,7 @@ blue               = 8aadf4
 sky                = 91d7e3
 mauve              = c6a0f6
 lavender           = b7bdf8
-white              = d9e0ee
+
 
 [mocha]
 # Spicetify
@@ -190,4 +189,3 @@ blue               = 89b4fa
 sky                = 89dceb
 mauve              = cba6f7
 lavender           = b4befe
-white              = d9e0ee

catppuccin/theme.js

@@ -11,23 +11,34 @@
     return;
   }
 
-  // accent colors
-  const accents = ['rosewater','flamingo','pink','maroon','red','peach','yellow','green','teal','sapphire','blue','sky','mauve','lavender','white'];
+  // Accent colors
+  const accents = ['none', 'rosewater', 'flamingo', 'pink', 'maroon', 'red', 'peach', 'yellow', 'green', 'teal', 'sapphire', 'blue', 'sky', 'mauve', 'lavender'];
 
   // Create our own section matching spotifys style and structure
   const Section = Spicetify.React.memo(() => {
-    const initialValue = localStorage.getItem('catppuccin-accentColor') ?? 'rosewater';
+    const colorScheme = Spicetify.Config.color_scheme || "frappe";
+    const initialValue = localStorage.getItem('catppuccin-accentColor') ?? 'none';
     const [selectedValue, setSelectedValue] = Spicetify.React.useState(initialValue);
 
     Spicetify.React.useEffect(() => {
+      const accent = selectedValue === "none" ? "text" : selectedValue;
+      const properties = {
+        "--spice-text": `var(--spice-${selectedValue})`,
+        "--spice-button-active": `var(--spice-${selectedValue})`,
+        "--spice-equalizer": document.querySelector("body > script.marketplaceScript") ? `url('https://github.com/catppuccin/spicetify/blob/main/catppuccin/assets/${colorScheme}/equalizer-animated-${accent}.gif?raw=true')` : `url('${colorScheme}/equalizer-animated-${accent}.gif')`
+      };
+
+      Object.entries(properties).forEach(([property, value]) => {
+        if (value.includes("none")) {
+          document.documentElement.style.removeProperty(property);
+        } else {
+          document.documentElement.style.setProperty(property, value);
+        }
+      });
+
       if (initialValue !== selectedValue) {
         localStorage.setItem("catppuccin-accentColor", selectedValue);
       }
-
-      const url = document.querySelector("body > script.marketplaceScript") ? `url('https://github.com/catppuccin/spicetify/blob/main/catppuccin/assets/${Spicetify.Config.color_scheme}/equalizer-animated-${selectedValue}.gif?raw=true')` : `url('${Spicetify.Config.color_scheme}/equalizer-animated-${selectedValue}.gif')`
-      document.documentElement.style.setProperty("--spice-text", `var(--spice-${selectedValue})`);
-      document.documentElement.style.setProperty("--spice-button-active", `var(--spice-${selectedValue})`),
-      document.documentElement.style.setProperty("--spice-equalizer", url);
     }, [selectedValue]);
 
     return Spicetify.React.createElement(
@@ -82,7 +93,7 @@
                       {
                         key: option,
                         value: option,
-                        selected: selectedValue,
+                        selected: option === selectedValue,
                       },
                       option
                     );