From 8f4a72d5622210ac9af3d1591cf4ebde17797340 Mon Sep 17 00:00:00 2001 From: ethmcc <64378116+ethmcc@users.noreply.github.com> Date: Sat, 23 Mar 2024 12:05:30 -0400 Subject: [PATCH 1/2] Add Quiet Builder mode --- src/components/App/App.reducer.js | 1 + .../App/__tests__/App.reducer.test.js | 2 ++ src/components/Board/Board.container.js | 4 +++- .../Navigation/Navigation.component.js | 24 +++++++++++++++++++ .../Navigation/Navigation.messages.js | 9 +++++++ .../Settings/Navigation/Navigation.test.js | 3 ++- src/translations/en-GB.json | 4 +++- src/translations/en-US.json | 4 +++- src/translations/src/cboard.json | 4 +++- 9 files changed, 50 insertions(+), 5 deletions(-) diff --git a/src/components/App/App.reducer.js b/src/components/App/App.reducer.js index 51558b676..694f4babc 100644 --- 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 index 4106048bf..5cbe29850 100644 --- 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 index 14afd000e..6807f9043 100644 --- 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 index 33e64ec4c..3e7fd9948 100644 --- 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 { + + } + secondary={ + + } + /> + + + + + diff --git a/src/components/Settings/Navigation/Navigation.messages.js b/src/components/Settings/Navigation/Navigation.messages.js index d8def2f62..a4e95329c 100644 --- 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 index 57e3a5aad..9b2d65a2c 100644 --- 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/en-GB.json b/src/translations/en-GB.json index 1699a9730..5b629fd3c 100644 --- a/src/translations/en-GB.json +++ b/src/translations/en-GB.json @@ -425,6 +425,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 vocalisation 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 Improve Phrase", @@ -3873,4 +3875,4 @@ "symbol.descriptiveQuantity.different": "different", "symbol.buildingContents.bathroom": "bathroom", "symbol.descriptiveQuantity.categories": "categories" -} +} \ No newline at end of file diff --git a/src/translations/en-US.json b/src/translations/en-US.json index 57a2cc5ad..cabde1138 100644 --- a/src/translations/en-US.json +++ b/src/translations/en-US.json @@ -425,6 +425,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 Improve Phrase", @@ -3873,4 +3875,4 @@ "symbol.descriptiveQuantity.different": "different", "symbol.buildingContents.bathroom": "bathroom", "symbol.descriptiveQuantity.categories": "categories" -} +} \ No newline at end of file diff --git a/src/translations/src/cboard.json b/src/translations/src/cboard.json index 87b70c700..7ce961541 100644 --- a/src/translations/src/cboard.json +++ b/src/translations/src/cboard.json @@ -425,6 +425,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 Improve Phrase", @@ -3874,4 +3876,4 @@ "symbol.descriptiveQuantity.different": "different", "symbol.buildingContents.bathroom": "bathroom", "symbol.descriptiveQuantity.categories": "categories" -} +} \ No newline at end of file From 333779ed62ee9e939d1c2b2a5058888eb02b8766 Mon Sep 17 00:00:00 2001 From: Rodri Sanchez Date: Mon, 6 May 2024 16:41:18 -0300 Subject: [PATCH 2/2] Revert manual translations --- src/translations/en-GB.json | 4 +--- src/translations/en-US.json | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/translations/en-GB.json b/src/translations/en-GB.json index 5b629fd3c..1699a9730 100644 --- a/src/translations/en-GB.json +++ b/src/translations/en-GB.json @@ -425,8 +425,6 @@ "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 vocalisation 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 Improve Phrase", @@ -3875,4 +3873,4 @@ "symbol.descriptiveQuantity.different": "different", "symbol.buildingContents.bathroom": "bathroom", "symbol.descriptiveQuantity.categories": "categories" -} \ No newline at end of file +} diff --git a/src/translations/en-US.json b/src/translations/en-US.json index cabde1138..57a2cc5ad 100644 --- a/src/translations/en-US.json +++ b/src/translations/en-US.json @@ -425,8 +425,6 @@ "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 Improve Phrase", @@ -3875,4 +3873,4 @@ "symbol.descriptiveQuantity.different": "different", "symbol.buildingContents.bathroom": "bathroom", "symbol.descriptiveQuantity.categories": "categories" -} \ No newline at end of file +}