fix: disable/enable voice assistance in settings tab #108

zidoro · Jul 30, 2020 · 86aea7c · 86aea7c
1 parent 9ffc844
commit 86aea7c
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 16 deletions.
diff --git a/app/src/contexts/CounterContext.tsx b/app/src/contexts/CounterContext.tsx
@@ -235,26 +235,26 @@ const CounterProvider: React.FC = ({ children }) => {
           notification(
             "60 Seconds Left for Short Break",
             { body: "Please prepare yourself getting  back to work." },
-            sixtySecondsLeftShortBreak
+            settings.enableVoiceAssistance && sixtySecondsLeftShortBreak
           );
         } else if (timer.timerType === LONG_BREAK) {
           notification(
             "60 Seconds Left for Long Break",
             { body: "Please prepare yourself getting  back to work." },
-            sixtySecondsLeftLongBreak
+            settings.enableVoiceAssistance && sixtySecondsLeftLongBreak
           );
         } else if (timer.timerType === SPECIAL_BREAK) {
           notification(
             "60 Seconds Left for Special Break",
             { body: "Please prepare yourself getting  back to work." },
-            sixtySecondsLeftSpecialBreak
+            settings.enableVoiceAssistance && sixtySecondsLeftSpecialBreak
           );
         }
       } else if (count === 31 && timer.timerType === STAY_FOCUS) {
         notification(
           "30 Seconds Left to Work",
           { body: "Please pause all media playing if there's one." },
-          thirtySecondsLeftToWork
+          settings.enableVoiceAssistance && thirtySecondsLeftToWork
         );
       }
     }
@@ -267,7 +267,7 @@ const CounterProvider: React.FC = ({ children }) => {
               notification(
                 "Work Time Finished",
                 { body: "It is time to take a short break." },
-                shortBreakStart
+                settings.enableVoiceAssistance && shortBreakStart
               );
 
               dispatch(setTimerType("SHORT_BREAK"));
@@ -277,7 +277,7 @@ const CounterProvider: React.FC = ({ children }) => {
               notification(
                 "Session Rounds Completed",
                 { body: "It is time to take a long break." },
-                longBreakStart
+                settings.enableVoiceAssistance && longBreakStart
               );
 
               dispatch(setTimerType("LONG_BREAK"));
@@ -290,7 +290,7 @@ const CounterProvider: React.FC = ({ children }) => {
             notification(
               "Short Break Finished",
               { body: "It is time to focus and work again." },
-              shortBreakFinished
+              settings.enableVoiceAssistance && shortBreakFinished
             );
 
             dispatch(setTimerType("STAY_FOCUS"));
@@ -307,7 +307,7 @@ const CounterProvider: React.FC = ({ children }) => {
             notification(
               "Long Break Finished",
               { body: "It is time to focus and work again." },
-              longBreakFinished
+              settings.enableVoiceAssistance && longBreakFinished
             );
 
             dispatch(setTimerType("STAY_FOCUS"));
@@ -324,7 +324,7 @@ const CounterProvider: React.FC = ({ children }) => {
             notification(
               "Special Break Finished",
               { body: "It is time to focus and work again." },
-              specialBreakFinished
+              settings.enableVoiceAssistance && specialBreakFinished
             );
 
             dispatch(setTimerType("STAY_FOCUS"));
@@ -346,6 +346,7 @@ const CounterProvider: React.FC = ({ children }) => {
     config.sessionRounds,
     settings.notificationProperty,
     settings.autoStartWorkTime,
+    settings.enableVoiceAssistance,
   ]);
 
   useEffect(() => {

diff --git a/app/src/hooks/useNotification.ts b/app/src/hooks/useNotification.ts
@@ -17,12 +17,14 @@ export const useNotification = (
   // Making sure that notification sound the same
   // in all Operating System
 
-  new Audio(bell).play();
+  if (!constantOptions?.mute) {
+    new Audio(bell).play();
 
-  if (audioSrc && !constantOptions?.mute) {
-    setTimeout(() => {
-      new Audio(audioSrc).play();
-    }, 1500);
+    if (audioSrc) {
+      setTimeout(() => {
+        new Audio(audioSrc).play();
+      }, 1500);
+    }
   }
 
   if (!notify) return;

diff --git a/app/src/routes/Settings/FeatureSection.tsx b/app/src/routes/Settings/FeatureSection.tsx
@@ -12,12 +12,13 @@ import {
   setAutoStartWorkTime,
   setMinimizeToTray,
   setCloseToTray,
+  setEnableVoiceAssistance,
 } from "store";
-
 import { Toggler, TogglerProps, Collapse, Radio } from "components";
-import SettingSection from "./SettingSection";
 import { ThemeContext } from "contexts";
 
+import SettingSection from "./SettingSection";
+
 const FeatureSection: React.FC = () => {
   const settings: SettingTypes = useSelector(
     (state: AppStateTypes) => state.settings
@@ -102,6 +103,14 @@ const FeatureSection: React.FC = () => {
         dispatch(setCloseToTray(!settings.closeToTray));
       }, [dispatch, settings.closeToTray]),
     },
+    {
+      id: "voice-assistance",
+      label: "Voice Assistance",
+      checked: settings.enableVoiceAssistance,
+      onChange: useCallback(() => {
+        dispatch(setEnableVoiceAssistance(!settings.enableVoiceAssistance));
+      }, [dispatch, settings.enableVoiceAssistance]),
+    },
   ];
 
   const onChangeNotificationProps = useCallback(

diff --git a/app/src/store/settings/actions.ts b/app/src/store/settings/actions.ts
@@ -13,6 +13,7 @@ import {
   CLOSE_TO_TRAY,
   MINIMIZE_TO_TRAY,
   AUTO_START_WORK_TIME,
+  ENABLE_VOICE_ASSISTANCE,
 } from "./types";
 
 export const setAlwaysOnTop = (
@@ -66,6 +67,15 @@ export const setEnableProgressAnimation = (
   };
 };
 
+export const setEnableVoiceAssistance = (
+  enableVoiceAssistance: SettingTypes["enableVoiceAssistance"]
+): SettingActionTypes => {
+  return {
+    type: ENABLE_VOICE_ASSISTANCE,
+    payload: enableVoiceAssistance,
+  };
+};
+
 export const setUseNativeTitlebar = (
   useNativeTitlebar: SettingTypes["useNativeTitlebar"]
 ): SettingActionTypes => {

diff --git a/app/src/store/settings/reducer.ts b/app/src/store/settings/reducer.ts
@@ -14,6 +14,7 @@ import {
   CLOSE_TO_TRAY,
   MINIMIZE_TO_TRAY,
   AUTO_START_WORK_TIME,
+  ENABLE_VOICE_ASSISTANCE,
 } from "./types";
 
 const defaultSettings: SettingTypes = {
@@ -22,6 +23,7 @@ const defaultSettings: SettingTypes = {
   enableStrictMode: false,
   enableDarkTheme: isPreferredDark(),
   enableProgressAnimation: true,
+  enableVoiceAssistance: true,
   notificationSoundOn: true,
   notificationProperty: "extra",
   closeToTray: true,
@@ -71,6 +73,11 @@ export const settingReducer = (
         ...state,
         enableProgressAnimation: action.payload,
       };
+    case ENABLE_VOICE_ASSISTANCE:
+      return {
+        ...state,
+        enableVoiceAssistance: action.payload,
+      };
     case USE_NATIVE_TITLE_BAR:
       return {
         ...state,

diff --git a/app/src/store/settings/types.ts b/app/src/store/settings/types.ts
@@ -6,6 +6,7 @@ export type SettingTypes = {
   enableDarkTheme: boolean;
   enableStrictMode: boolean;
   enableProgressAnimation: boolean;
+  enableVoiceAssistance: boolean;
   useNativeTitlebar: boolean;
   notificationSoundOn: boolean;
   closeToTray: boolean;
@@ -21,6 +22,7 @@ export const ENABLE_FULLSCREEN_BREAK = `${settings} ENABLE_FULLSCREEN_BREAK`;
 export const ENABLE_STRICT_MODE = `${settings} ENABLE_STRICT_MODE`;
 
 export const ENABLE_PROGRESS_ANIMATION = `${settings} ENABLE_PROGRESS_ANIMATION`;
+export const ENABLE_VOICE_ASSISTANCE = `${settings} ENABLE_VOICE_ASSISTANCE`;
 
 export const USE_NATIVE_TITLE_BAR = `${settings} USE_NATIVE_TITLE_BAR`;
 export const ENABLE_AUTO_UPDATES = `${settings} ENABLE_AUTO_UPDATES`;