From c12b6ff1ebe228030ca8075dccb2a97dd8b70d71 Mon Sep 17 00:00:00 2001 From: samreid Date: Wed, 28 Jul 2021 13:37:02 -0600 Subject: [PATCH] Rename from simColorProfileProperty to SimColors.js, see https://github.com/phetsims/scenery-phet/issues/686 --- js/bounce/BounceScreen.js | 4 ++-- js/bounce/view/BounceScreenView.js | 6 +++--- js/lab/LabScreen.js | 4 ++-- js/lab/view/LabScreenView.js | 4 ++-- js/stretch/StretchScreen.js | 4 ++-- js/stretch/view/StretchScreenView.js | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/js/bounce/BounceScreen.js b/js/bounce/BounceScreen.js index b2cc8bd..dce4138 100644 --- a/js/bounce/BounceScreen.js +++ b/js/bounce/BounceScreen.js @@ -8,7 +8,7 @@ import Screen from '../../../joist/js/Screen.js'; import MassesAndSpringsModel from '../../../masses-and-springs/js/common/model/MassesAndSpringsModel.js'; -import massesAndSpringsColorProfile from '../../../masses-and-springs/js/common/view/massesAndSpringsColorProfile.js'; +import MassesAndSpringsColors from '../../../masses-and-springs/js/common/view/MassesAndSpringsColors.js'; import merge from '../../../phet-core/js/merge.js'; import Image from '../../../scenery/js/nodes/Image.js'; import bounceHomeScreenImage from '../../images/bounce_screen_icon_png.js'; @@ -29,7 +29,7 @@ class BounceScreen extends Screen { options = merge( { name: screenBounceString, - backgroundColorProperty: massesAndSpringsColorProfile.backgroundProperty, + backgroundColorProperty: MassesAndSpringsColors.backgroundProperty, homeScreenIcon: new ScreenIcon( new Image( bounceHomeScreenImage ), { maxIconWidthProportion: 1, maxIconHeightProportion: 1 diff --git a/js/bounce/view/BounceScreenView.js b/js/bounce/view/BounceScreenView.js index a362c87..8176670 100644 --- a/js/bounce/view/BounceScreenView.js +++ b/js/bounce/view/BounceScreenView.js @@ -9,7 +9,7 @@ import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; import Vector2 from '../../../../dot/js/Vector2.js'; import MassesAndSpringsConstants from '../../../../masses-and-springs/js/common/MassesAndSpringsConstants.js'; -import massesAndSpringsColorProfile from '../../../../masses-and-springs/js/common/view/massesAndSpringsColorProfile.js'; +import MassesAndSpringsColors from '../../../../masses-and-springs/js/common/view/MassesAndSpringsColors.js'; import ReferenceLineNode from '../../../../masses-and-springs/js/common/view/ReferenceLineNode.js'; import ShelfNode from '../../../../masses-and-springs/js/common/view/ShelfNode.js'; import TwoSpringScreenView from '../../../../masses-and-springs/js/common/view/TwoSpringScreenView.js'; @@ -42,7 +42,7 @@ class BounceScreenView extends TwoSpringScreenView { model.firstSpring, model.firstSpring.equilibriumYPositionProperty, firstMassEquilibriumVisibilityProperty, { - stroke: massesAndSpringsColorProfile.restingPositionProperty + stroke: MassesAndSpringsColors.restingPositionProperty } ); @@ -52,7 +52,7 @@ class BounceScreenView extends TwoSpringScreenView { model.secondSpring, model.secondSpring.equilibriumYPositionProperty, secondMassEquilibriumVisibilityProperty, { - stroke: massesAndSpringsColorProfile.restingPositionProperty + stroke: MassesAndSpringsColors.restingPositionProperty } ); diff --git a/js/lab/LabScreen.js b/js/lab/LabScreen.js index a8e68c8..ec4381e 100644 --- a/js/lab/LabScreen.js +++ b/js/lab/LabScreen.js @@ -7,7 +7,7 @@ */ import Screen from '../../../joist/js/Screen.js'; -import massesAndSpringsColorProfile from '../../../masses-and-springs/js/common/view/massesAndSpringsColorProfile.js'; +import MassesAndSpringsColors from '../../../masses-and-springs/js/common/view/MassesAndSpringsColors.js'; import LabModel from '../../../masses-and-springs/js/lab/model/LabModel.js'; import merge from '../../../phet-core/js/merge.js'; import Image from '../../../scenery/js/nodes/Image.js'; @@ -33,7 +33,7 @@ class LabScreen extends Screen { options = merge( { basicsVersion: true, name: screenLabString, - backgroundColorProperty: massesAndSpringsColorProfile.backgroundProperty, + backgroundColorProperty: MassesAndSpringsColors.backgroundProperty, homeScreenIcon: new ScreenIcon( new Image( labHomeScreenImage ), { maxIconWidthProportion: 1, maxIconHeightProportion: 1 diff --git a/js/lab/view/LabScreenView.js b/js/lab/view/LabScreenView.js index 53639a6..097b6b6 100644 --- a/js/lab/view/LabScreenView.js +++ b/js/lab/view/LabScreenView.js @@ -9,7 +9,7 @@ import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; import Vector2 from '../../../../dot/js/Vector2.js'; import MassesAndSpringsConstants from '../../../../masses-and-springs/js/common/MassesAndSpringsConstants.js'; -import massesAndSpringsColorProfile from '../../../../masses-and-springs/js/common/view/massesAndSpringsColorProfile.js'; +import MassesAndSpringsColors from '../../../../masses-and-springs/js/common/view/MassesAndSpringsColors.js'; import MassValueControlPanel from '../../../../masses-and-springs/js/common/view/MassValueControlPanel.js'; import OneSpringScreenView from '../../../../masses-and-springs/js/common/view/OneSpringScreenView.js'; import ReferenceLineNode from '../../../../masses-and-springs/js/common/view/ReferenceLineNode.js'; @@ -85,7 +85,7 @@ class LabScreenView extends OneSpringScreenView { model.firstSpring, model.firstSpring.equilibriumYPositionProperty, this.equilibriumVisibilityProperty, { - stroke: massesAndSpringsColorProfile.restingPositionProperty + stroke: MassesAndSpringsColors.restingPositionProperty } ); this.addChild( equilibriumLineNode ); diff --git a/js/stretch/StretchScreen.js b/js/stretch/StretchScreen.js index 819f8a5..b971375 100644 --- a/js/stretch/StretchScreen.js +++ b/js/stretch/StretchScreen.js @@ -8,7 +8,7 @@ import Screen from '../../../joist/js/Screen.js'; import MassesAndSpringsModel from '../../../masses-and-springs/js/common/model/MassesAndSpringsModel.js'; -import massesAndSpringsColorProfile from '../../../masses-and-springs/js/common/view/massesAndSpringsColorProfile.js'; +import MassesAndSpringsColors from '../../../masses-and-springs/js/common/view/MassesAndSpringsColors.js'; import merge from '../../../phet-core/js/merge.js'; import Image from '../../../scenery/js/nodes/Image.js'; import stretchHomeScreenImage from '../../images/stretch_screen_icon_png.js'; @@ -30,7 +30,7 @@ class StretchScreen extends Screen { options = merge( { name: screenStretchString, - backgroundColorProperty: massesAndSpringsColorProfile.backgroundProperty, + backgroundColorProperty: MassesAndSpringsColors.backgroundProperty, homeScreenIcon: new ScreenIcon( new Image( stretchHomeScreenImage ), { maxIconWidthProportion: 1, maxIconHeightProportion: 1 diff --git a/js/stretch/view/StretchScreenView.js b/js/stretch/view/StretchScreenView.js index d30f143..a62257b 100644 --- a/js/stretch/view/StretchScreenView.js +++ b/js/stretch/view/StretchScreenView.js @@ -11,7 +11,7 @@ import Property from '../../../../axon/js/Property.js'; import Vector2 from '../../../../dot/js/Vector2.js'; import MassesAndSpringsConstants from '../../../../masses-and-springs/js/common/MassesAndSpringsConstants.js'; import DraggableRulerNode from '../../../../masses-and-springs/js/common/view/DraggableRulerNode.js'; -import massesAndSpringsColorProfile from '../../../../masses-and-springs/js/common/view/massesAndSpringsColorProfile.js'; +import MassesAndSpringsColors from '../../../../masses-and-springs/js/common/view/MassesAndSpringsColors.js'; import ReferenceLineNode from '../../../../masses-and-springs/js/common/view/ReferenceLineNode.js'; import ShelfNode from '../../../../masses-and-springs/js/common/view/ShelfNode.js'; import TwoSpringScreenView from '../../../../masses-and-springs/js/common/view/TwoSpringScreenView.js'; @@ -45,7 +45,7 @@ class StretchScreenView extends TwoSpringScreenView { model.firstSpring, model.firstSpring.equilibriumYPositionProperty, firstMassEquilibriumVisibilityProperty, { - stroke: massesAndSpringsColorProfile.restingPositionProperty + stroke: MassesAndSpringsColors.restingPositionProperty } ); @@ -55,7 +55,7 @@ class StretchScreenView extends TwoSpringScreenView { model.secondSpring, model.secondSpring.equilibriumYPositionProperty, secondMassEquilibriumVisibilityProperty, { - stroke: massesAndSpringsColorProfile.restingPositionProperty + stroke: MassesAndSpringsColors.restingPositionProperty } );