fix audio not loading

MacielG1 · Sep 26, 2024 · 3e35f55 · 3e35f55
1 parent eaabf51
commit 3e35f55
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 31 deletions.
diff --git a/src/components/MainMenu.tsx b/src/components/MainMenu.tsx
@@ -90,6 +90,7 @@ export default function MainMenu() {
           setMainTimerBorder(restColor);
         }
       }
+
       if (enableSounds) {
         if (whichInterval === "work" && time == 0) {
           if (preferredSound === "audio1") {

diff --git a/src/components/settings/EnableSounds.tsx b/src/components/settings/EnableSounds.tsx
@@ -7,42 +7,25 @@ import sound1 from "../../assets/sounds/sound1.mp3";
 import sound2 from "../../assets/sounds/sound2.mp3";
 import start from "../../assets/sounds/start.mp3";
 import stop from "../../assets/sounds/stop.mp3";
-import { useEffect } from "react";
 
 type ToggleProps = {
   preferredLanguage: "en" | "pt" | "fr";
   handleToggleSetting: (key: string, setState: (value: boolean) => void, state: boolean) => void;
+  soundsSettings: { item: string; state: boolean; setState: (value: boolean) => void; text: { en: string; pt: string; fr: string } } | undefined;
 };
 
-export default function EnableSounds({ handleToggleSetting, preferredLanguage }: ToggleProps) {
-  const [enableSounds, setEnableSounds] = useStore((state) => [state.enableSounds, state.setEnableSounds]);
+export default function EnableSounds({ handleToggleSetting, preferredLanguage, soundsSettings }: ToggleProps) {
   const [preferredSound, setPreferredSound] = useStore((state) => [state.preferredSound, state.setPreferredSound]);
   const playSoundsType1 = useAudio(sound1, sound2);
   const playSoundsType2 = useAudio(start, stop);
 
-  const soundsSettings = {
-    item: "enableSounds",
-    state: enableSounds,
-    setState: setEnableSounds,
-    text: {
-      en: "Enable sounds",
-      pt: "Ativar sons",
-      fr: "Activer les sons",
-    },
-  };
-
-  useEffect(() => {
-    const settings = JSON.parse(localStorage.getItem(soundsSettings.item) || "null");
-    if (settings !== null) {
-      setEnableSounds(settings);
-    }
-  }, []);
-
   function onValueChange(sound: "audio1" | "audio2") {
     localStorage.setItem("audioType", sound);
     setPreferredSound(sound);
   }
 
+  if (!soundsSettings) return null;
+
   return (
     <div className="flex">
       <Toggle

diff --git a/src/components/settings/SettingsMenu.tsx b/src/components/settings/SettingsMenu.tsx
@@ -20,6 +20,8 @@ export default function SettingsMenu() {
   const [prepOnEveryRound, setPrepOnEveryRound] = useStore((state) => [state.prepareonEveryRound, state.setPrepareonEveryRound]);
   const [enableVibrate, setEnableVibrate] = useStore((state) => [state.enableVibrate, state.setEnableVibrate]);
 
+  const [enableSounds, setEnableSounds] = useStore((state) => [state.enableSounds, state.setEnableSounds]);
+
   const settings = [
     {
       item: "skipLastRest",
@@ -72,6 +74,16 @@ export default function SettingsMenu() {
         fr: "Activer la vibration",
       },
     },
+    {
+      item: "enableSounds",
+      state: enableSounds,
+      setState: setEnableSounds,
+      text: {
+        en: "Enable sounds",
+        pt: "Ativar sons",
+        fr: "Activer les sons",
+      },
+    },
   ];
 
   useEffect(() => {
@@ -89,7 +101,6 @@ export default function SettingsMenu() {
     setState(newValue);
   }
 
-  // language useEffect
   let supportedLanguages = ["en", "pt", "fr"];
 
   useEffect(() => {
@@ -115,16 +126,21 @@ export default function SettingsMenu() {
     <>
       {settings.map((item) => {
         if (item.item === "enableVibrate" && !isOnMobileDevice) return null;
-        return (
-          <Toggle
-            key={item.item}
-            text={item.text[preferredLanguage]}
-            isActive={item.state}
-            toggleActive={() => handleToggleSetting(item.item, item.setState, item.state)}
-          />
-        );
+        if (item.item === "enableSounds")
+          return (
+            <Toggle
+              key={item.item}
+              text={item.text[preferredLanguage]}
+              isActive={item.state}
+              toggleActive={() => handleToggleSetting(item.item, item.setState, item.state)}
+            />
+          );
       })}
-      <EnableSounds handleToggleSetting={handleToggleSetting} preferredLanguage={preferredLanguage} />
+      <EnableSounds
+        handleToggleSetting={handleToggleSetting}
+        preferredLanguage={preferredLanguage}
+        soundsSettings={settings.find((item) => item.item === "enableSounds")}
+      />
       <a href="https://www.buymeacoffee.com/macielg1" target="_blank" referrerPolicy="no-referrer" className="mx-auto my-1 inline-block">
         <img
           src={`https://img.buymeacoffee.com/button-api/?text=${supportText[preferredLanguage]}&emoji=☕&slug=macielg1&button_colour=0091ff&font_colour=000000&font_family=Inter&outline_colour=000000&coffee_colour=FFDD00`}