Use number suite common speech synthesis button, see: #22

phetsims · Dec 11, 2024 · 2ed963c · 2ed963c
1 parent 7d80919
commit 2ed963c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 46 deletions.
diff --git a/js/common/view/NumberPairsScreenView.ts b/js/common/view/NumberPairsScreenView.ts
@@ -33,8 +33,10 @@ import NumberLineNode from './NumberLineNode.js';
 import NumberLineOptionsCheckboxGroup from './NumberLineOptionsCheckboxGroup.js';
 import OrganizeBeadsButton from './OrganizeBeadsButton.js';
 import RepresentationRadioButtonGroup from './RepresentationRadioButtonGroup.js';
-import SpeechSynthesisButton from './SpeechSynthesisButton.js';
 import TenFrameButton from './TenFrameButton.js';
+import SpeechSynthesisButton from '../../../../number-suite-common/js/common/view/SpeechSynthesisButton.js';
+import numberPairsSpeechSynthesisAnnouncer from './numberPairsSpeechSynthesisAnnouncer.js';
+import numberPairsUtteranceQueue from './numberPairsUtteranceQueue.js';
 
 
 type SelfOptions = {
@@ -114,8 +116,7 @@ export default class NumberPairsScreenView extends ScreenView {
     /**
      * Create the buttons along the left edge of each screen
      */
-    const speechSynthesisButton = new SpeechSynthesisButton( {
-      tandem: options.tandem.createTandem( 'speechSynthesisButton' ),
+    const speechSynthesisButton = new SpeechSynthesisButton( numberPairsSpeechSynthesisAnnouncer, numberPairsUtteranceQueue, {
       x: this.layoutBounds.minX + NumberPairsConstants.SCREEN_VIEW_X_MARGIN,
       y: this.layoutBounds.minY + NumberPairsConstants.SCREEN_VIEW_Y_MARGIN
     } );

diff --git a/js/common/view/SpeechSynthesisButton.ts b/js/common/view/SpeechSynthesisButton.ts
diff --git a/js/common/view/numberPairsUtteranceQueue.ts b/js/common/view/numberPairsUtteranceQueue.ts
@@ -11,13 +11,9 @@ import StringProperty from '../../../../axon/js/StringProperty.js';
 import TProperty from '../../../../axon/js/TProperty.js';
 import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 import NumberSuiteCommonUtteranceQueue from '../../../../number-suite-common/js/common/view/NumberSuiteCommonUtteranceQueue.js';
-import TenScreen from '../../ten/TenScreen.js';
-import TwentyScreen from '../../twenty/TwentyScreen.js';
 import numberPairs from '../../numberPairs.js';
 import NumberPairsPreferences from '../model/NumberPairsPreferences.js';
 import numberPairsSpeechSynthesisAnnouncer from './numberPairsSpeechSynthesisAnnouncer.js';
-import IntroScreen from '../../intro/IntroScreen.js';
-import SumScreen from '../../sum/SumScreen.js';
 
 class NumberPairsUtteranceQueue extends NumberSuiteCommonUtteranceQueue {
 
@@ -56,10 +52,10 @@ class NumberPairsUtteranceQueue extends NumberSuiteCommonUtteranceQueue {
 
         // We want the speech data to reflect the selected screen. Returns null for screens that do not support speech
         // synthesis.
-        return selectedScreen instanceof IntroScreen ? introScreenSpeechData :
-               selectedScreen instanceof TenScreen ? tenScreenSpeechData :
-               selectedScreen instanceof TwentyScreen ? twentyScreenSpeechData :
-               selectedScreen instanceof SumScreen ? sumScreenSpeechData :
+        return selectedScreen instanceof phet.numberPairs.IntroScreen ? introScreenSpeechData :
+               selectedScreen instanceof phet.numberPairs.TenScreen ? tenScreenSpeechData :
+               selectedScreen instanceof phet.numberPairs.TwentyScreen ? twentyScreenSpeechData :
+               selectedScreen instanceof phet.numberPairs.SumScreen ? sumScreenSpeechData :
                null;
       } );