Use the game screen icon image property. See phetsims/area-model-mult…

…iplication#16.
phetsims · Mar 26, 2024 · 5c00d46 · 5c00d46
1 parent a9ababf
commit 5c00d46
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/js/screens/GenericGameScreen.js b/js/screens/GenericGameScreen.js
@@ -15,23 +15,25 @@ import AreaModelCommonStrings from '../AreaModelCommonStrings.js';
 import AreaModelCommonColors from '../common/view/AreaModelCommonColors.js';
 import GenericGameAreaModel from '../game/model/GenericGameAreaModel.js';
 import GameAreaScreenView from '../game/view/GameAreaScreenView.js';
-import GameScreenIcon from '../game/view/GameScreenIcon.js';
 
 class GenericGameScreen extends Screen {
 
   /**
    * @param { PreferencesModel } preferencesModel
-   * @param { Array<JugglerPortrayal> } jugglerPortrayals
+   * @param { TReadOnlyProperty<ImageableImage>} gameHomeScreenIconImageProperty
    * @param { ( GameAreaModel ) => JugglerCharacters } createJugglerController
    * @param {number[]} gameLevels
    * @public
    */
-  constructor( preferencesModel, jugglerPortrayals, createJugglerController, gameLevels ) {
+  constructor( preferencesModel, gameHomeScreenIconImageProperty, createJugglerController, gameLevels ) {
 
     const options = {
       name: AreaModelCommonStrings.screen.gameStringProperty,
       backgroundColorProperty: AreaModelCommonColors.backgroundProperty,
-      homeScreenIcon: new GameScreenIcon( jugglerPortrayals, preferencesModel.localizationModel.regionAndCulturePortrayalProperty ),
+      homeScreenIcon: new ScreenIcon( new Image( gameHomeScreenIconImageProperty ), {
+        maxIconWidthProportion: 1,
+        maxIconHeightProportion: 1
+      } ),
       navigationBarIcon: new ScreenIcon( new Image( genericGameScreenNavbar_png ), {
         maxIconWidthProportion: 1,
         maxIconHeightProportion: 1

diff --git a/js/screens/VariablesGameScreen.js b/js/screens/VariablesGameScreen.js
@@ -15,23 +15,25 @@ import AreaModelCommonStrings from '../AreaModelCommonStrings.js';
 import AreaModelCommonColors from '../common/view/AreaModelCommonColors.js';
 import VariablesGameAreaModel from '../game/model/VariablesGameAreaModel.js';
 import GameAreaScreenView from '../game/view/GameAreaScreenView.js';
-import GameScreenIcon from '../game/view/GameScreenIcon.js';
 
 class VariablesGameScreen extends Screen {
 
   /**
    * @param { PreferencesModel } preferencesModel
-   * @param { Array<JugglerPortrayal> } jugglerPortrayals
+   * @param { TReadOnlyProperty<ImageableImage> } gameHomeScreenIconImageProperty
    * @param { ( GameAreaModel ) => JugglerCharacters } createJugglerController
    * @param {number[]} gameLevels
    * @public
    */
-  constructor( preferencesModel, jugglerPortrayals, createJugglerController, gameLevels ) {
+  constructor( preferencesModel, gameHomeScreenIconImageProperty, createJugglerController, gameLevels ) {
 
     const options = {
       name: AreaModelCommonStrings.screen.gameStringProperty,
       backgroundColorProperty: AreaModelCommonColors.backgroundProperty,
-      homeScreenIcon: new GameScreenIcon( jugglerPortrayals, preferencesModel.localizationModel.regionAndCulturePortrayalProperty ),
+      homeScreenIcon: new ScreenIcon( new Image( gameHomeScreenIconImageProperty ), {
+        maxIconWidthProportion: 1,
+        maxIconHeightProportion: 1
+      } ),
       navigationBarIcon: new ScreenIcon( new Image( variablesGameScreenNavbar_png ), {
         maxIconWidthProportion: 1,
         maxIconHeightProportion: 1