Remove MeanShareAndBalanceScreen, see: #46

phetsims · Aug 23, 2022 · edc7220 · edc7220
1 parent f5a0d5f
commit edc7220
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 44 deletions.
diff --git a/js/common/MeanShareAndBalanceScreen.ts b/js/common/MeanShareAndBalanceScreen.ts
diff --git a/js/intro/IntroScreen.ts b/js/intro/IntroScreen.ts
@@ -7,25 +7,26 @@
  * @author Sam Reid (PhET Interactive Simulations)
  */
 
-import { ScreenOptions } from '../../../joist/js/Screen.js';
 import optionize, { EmptySelfOptions } from '../../../phet-core/js/optionize.js';
 import PickRequired from '../../../phet-core/js/types/PickRequired.js';
 import IntroModel from './model/IntroModel.js';
 import IntroScreenView from './view/IntroScreenView.js';
 import MeanShareAndBalanceColors from '../common/MeanShareAndBalanceColors.js';
 import meanShareAndBalance from '../meanShareAndBalance.js';
-import MeanShareAndBalanceScreen from '../common/MeanShareAndBalanceScreen.js';
 import meanShareAndBalanceStrings from '../meanShareAndBalanceStrings.js';
+import Screen, { ScreenOptions } from '../../../joist/js/Screen.js';
+import SliderControlsAndBasicActionsKeyboardHelpContent from '../../../scenery-phet/js/keyboard/help/SliderControlsAndBasicActionsKeyboardHelpContent.js';
 
 type SelfOptions = EmptySelfOptions;
 
 type IntroScreenOptions = SelfOptions & PickRequired<ScreenOptions, 'tandem'>;
 
-export default class IntroScreen extends MeanShareAndBalanceScreen<IntroModel, IntroScreenView> {
+export default class IntroScreen extends Screen<IntroModel, IntroScreenView> {
   public constructor( providedOptions: IntroScreenOptions ) {
     const options = optionize<IntroScreenOptions, SelfOptions, ScreenOptions>()( {
       name: meanShareAndBalanceStrings.screen.intro,
-      backgroundColorProperty: MeanShareAndBalanceColors.screenBackgroundColorProperty
+      backgroundColorProperty: MeanShareAndBalanceColors.screenBackgroundColorProperty,
+      keyboardHelpNode: new SliderControlsAndBasicActionsKeyboardHelpContent()
     }, providedOptions );
     super(
       () => new IntroModel( { tandem: options.tandem.createTandem( 'model' ) } ),

diff --git a/js/leveling-out/LevelingOutScreen.ts b/js/leveling-out/LevelingOutScreen.ts
@@ -7,25 +7,26 @@
  * @author Sam Reid (PhET Interactive Simulations)
  */
 
-import MeanShareAndBalanceScreen from '../common/MeanShareAndBalanceScreen.js';
 import MeanShareAndBalanceColors from '../common/MeanShareAndBalanceColors.js';
 import meanShareAndBalance from '../meanShareAndBalance.js';
 import optionize, { EmptySelfOptions } from '../../../phet-core/js/optionize.js';
 import PickRequired from '../../../phet-core/js/types/PickRequired.js';
-import { ScreenOptions } from '../../../joist/js/Screen.js';
+import Screen, { ScreenOptions } from '../../../joist/js/Screen.js';
 import LevelingOutModel from './model/LevelingOutModel.js';
 import LevelingOutScreenView from './view/LevelingOutScreenView.js';
 import meanShareAndBalanceStrings from '../meanShareAndBalanceStrings.js';
+import SliderControlsAndBasicActionsKeyboardHelpContent from '../../../scenery-phet/js/keyboard/help/SliderControlsAndBasicActionsKeyboardHelpContent.js';
 
 type SelfOptions = EmptySelfOptions;
 
 type LevelingOutScreenOptions = SelfOptions & PickRequired<ScreenOptions, 'tandem'>;
 
-export default class LevelingOutScreen extends MeanShareAndBalanceScreen<LevelingOutModel, LevelingOutScreenView> {
+export default class LevelingOutScreen extends Screen<LevelingOutModel, LevelingOutScreenView> {
   public constructor( providedOptions: LevelingOutScreenOptions ) {
     const options = optionize<LevelingOutScreenOptions, SelfOptions, ScreenOptions>()( {
       name: meanShareAndBalanceStrings.screen.levelingOut,
-      backgroundColorProperty: MeanShareAndBalanceColors.screenBackgroundColorProperty
+      backgroundColorProperty: MeanShareAndBalanceColors.screenBackgroundColorProperty,
+      keyboardHelpNode: new SliderControlsAndBasicActionsKeyboardHelpContent()
     }, providedOptions );
     super(
       () => new LevelingOutModel( { tandem: options.tandem.createTandem( 'model' ) } ),