Skip to content

Commit

Permalink
Rename from simColorProfileProperty to SimColors.js, see phetsims/sce…
Browse files Browse the repository at this point in the history
  • Loading branch information
samreid committed Jul 28, 2021
1 parent 80879cb commit c12b6ff
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions js/bounce/BounceScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions js/bounce/view/BounceScreenView.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -42,7 +42,7 @@ class BounceScreenView extends TwoSpringScreenView {
model.firstSpring,
model.firstSpring.equilibriumYPositionProperty,
firstMassEquilibriumVisibilityProperty, {
stroke: massesAndSpringsColorProfile.restingPositionProperty
stroke: MassesAndSpringsColors.restingPositionProperty
}
);

Expand All @@ -52,7 +52,7 @@ class BounceScreenView extends TwoSpringScreenView {
model.secondSpring,
model.secondSpring.equilibriumYPositionProperty,
secondMassEquilibriumVisibilityProperty, {
stroke: massesAndSpringsColorProfile.restingPositionProperty
stroke: MassesAndSpringsColors.restingPositionProperty
}
);

Expand Down
4 changes: 2 additions & 2 deletions js/lab/LabScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions js/lab/view/LabScreenView.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -85,7 +85,7 @@ class LabScreenView extends OneSpringScreenView {
model.firstSpring,
model.firstSpring.equilibriumYPositionProperty,
this.equilibriumVisibilityProperty, {
stroke: massesAndSpringsColorProfile.restingPositionProperty
stroke: MassesAndSpringsColors.restingPositionProperty
}
);
this.addChild( equilibriumLineNode );
Expand Down
4 changes: 2 additions & 2 deletions js/stretch/StretchScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions js/stretch/view/StretchScreenView.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -45,7 +45,7 @@ class StretchScreenView extends TwoSpringScreenView {
model.firstSpring,
model.firstSpring.equilibriumYPositionProperty,
firstMassEquilibriumVisibilityProperty, {
stroke: massesAndSpringsColorProfile.restingPositionProperty
stroke: MassesAndSpringsColors.restingPositionProperty
}
);

Expand All @@ -55,7 +55,7 @@ class StretchScreenView extends TwoSpringScreenView {
model.secondSpring,
model.secondSpring.equilibriumYPositionProperty,
secondMassEquilibriumVisibilityProperty, {
stroke: massesAndSpringsColorProfile.restingPositionProperty
stroke: MassesAndSpringsColors.restingPositionProperty
}
);

Expand Down

0 comments on commit c12b6ff

Please sign in to comment.