Merge pull request #1672 from ethmcc/master

#1671 Implement Quiet Builder mode
cboard-org · May 17, 2024 · 8ca13d6 · 8ca13d6
2 parents 0ed465c + 333779e
commit 8ca13d6
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 3 deletions.
diff --git a/src/components/App/App.reducer.js b/src/components/App/App.reducer.js
@@ -50,6 +50,7 @@ const initialState = {
     quickUnlockActive: false,
     removeOutputActive: false,
     vocalizeFolders: false,
+    quietBuilderMode: false,
     liveMode: false,
     improvePhraseActive: false
   },

diff --git a/src/components/App/__tests__/App.reducer.test.js b/src/components/App/__tests__/App.reducer.test.js
@@ -47,6 +47,7 @@ describe('reducer', () => {
         quickUnlockActive: false,
         removeOutputActive: false,
         vocalizeFolders: false,
+        quietBuilderMode: false,
         improvePhraseActive: false
       },
       symbolsSettings: {
@@ -77,6 +78,7 @@ describe('reducer', () => {
         quickUnlockActive: false,
         removeOutputActive: false,
         vocalizeFolders: false,
+        quietBuilderMode: false,
         improvePhraseActive: false
       },
       userData: uData

diff --git a/src/components/Board/Board.container.js b/src/components/Board/Board.container.js
@@ -894,7 +894,9 @@ export class BoardContainer extends Component {
       }
     } else {
       clickSymbol(tile.label);
-      say();
+      if (!navigationSettings.quietBuilderMode) {
+        say();
+      }
       if (isLiveMode) {
         const liveTile = {
           backgroundColor: 'rgb(255, 241, 118)',

diff --git a/src/components/Settings/Navigation/Navigation.component.js b/src/components/Settings/Navigation/Navigation.component.js
@@ -75,6 +75,12 @@ class Navigation extends React.Component {
     });
   };
 
+  toggleQuietBuilderMode = () => {
+    this.setState({
+      quietBuilderMode: !this.state.quietBuilderMode
+    });
+  };
+
   toggleLiveMode = () => {
     this.setState({
       liveMode: !this.state.liveMode
@@ -277,6 +283,24 @@ class Navigation extends React.Component {
                 </ListItemSecondaryAction>
               </ListItem>
               <Divider />
+              <ListItem>
+                <ListItemText
+                  className="Navigation__ListItemText"
+                  primary={<FormattedMessage {...messages.quietBuilderMode} />}
+                  secondary={
+                    <FormattedMessage {...messages.quietBuilderModeSecondary} />
+                  }
+                />
+                <ListItemSecondaryAction>
+                  <Switch
+                    checked={this.state.enableQuietBuilderMode}
+                    onChange={this.toggleQuietBuilderMode}
+                    value="active"
+                    color="secondary"
+                  />
+                </ListItemSecondaryAction>
+              </ListItem>
+              <Divider />
               <ResetToursItem />
               <Divider />
               <ListItem>

diff --git a/src/components/Settings/Navigation/Navigation.messages.js b/src/components/Settings/Navigation/Navigation.messages.js
@@ -47,6 +47,15 @@ export default defineMessages({
     id: 'cboard.components.Settings.Navigation.vocalizeFoldersSecondary',
     defaultMessage: "Reads a folder's name out loud when clicked"
   },
+  quietBuilderMode: {
+    id: 'cboard.components.Settings.Navigation.quietBuilderMode',
+    defaultMessage: 'Enable Quiet Builder mode'
+  },
+  quietBuilderModeSecondary: {
+    id: 'cboard.components.Settings.Navigation.quietBuilderModeSecondary',
+    defaultMessage:
+      'Disables vocalization of tiles when they are clicked as you build a sentence. Click output bar to hear the constructed sentence.'
+  },
   showLiveMode: {
     id: 'cboard.components.Settings.Navigation.showLiveMode',
     defaultMessage: 'Use the Live Mode'

diff --git a/src/components/Settings/Navigation/Navigation.test.js b/src/components/Settings/Navigation/Navigation.test.js
@@ -30,7 +30,8 @@ const INITIAL_NAVIGATION_SETTINGS = {
   navigationButtonsStyle: NAVIGATION_BUTTONS_STYLE_SIDES,
   quickUnlockActive: false,
   removeOutputActive: false,
-  vocalizeFolders: false
+  vocalizeFolders: false,
+  quietBuilderMode: false
 };
 
 let navigationSettings = INITIAL_NAVIGATION_SETTINGS;

diff --git a/src/translations/src/cboard.json b/src/translations/src/cboard.json
@@ -430,6 +430,8 @@
   "cboard.components.Settings.Navigation.outputRemoveSecondary": "Shows a \"x\" buttton on each symbol in order to remove it",
   "cboard.components.Settings.Navigation.vocalizeFolders": "Enable folder vocalization",
   "cboard.components.Settings.Navigation.vocalizeFoldersSecondary": "Reads folders name out loud when clicked",
+  "cboard.components.Settings.Navigation.quietBuilderMode": "Enable Quiet Builder mode",
+  "cboard.components.Settings.Navigation.quietBuilderModeSecondary": "Disables vocalization of tiles when they are clicked as you build a sentence. Click output bar to hear the constructed sentence.",
   "cboard.components.Settings.Navigation.showLiveMode": "Use the Live Mode",
   "cboard.components.Settings.Navigation.showLiveModeSecondary": "Live mode allows you to write text directly into the output bar and quickly play the sound. It is intended for users that can write.",
   "cboard.components.Settings.Navigation.activeImprovePhrase": "Use the Improve Phrase",
@@ -3879,4 +3881,4 @@
   "symbol.descriptiveQuantity.different": "different",
   "symbol.buildingContents.bathroom": "bathroom",
   "symbol.descriptiveQuantity.categories": "categories"
-}
+}