Skip to content

Commit

Permalink
Add screen icons, see #2
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisklus committed Nov 5, 2019
1 parent 1b7e795 commit 2bd8842
Show file tree
Hide file tree
Showing 9 changed files with 52 additions and 0 deletions.
Binary file added images/compare_screen_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/lab_screen_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 32 additions & 0 deletions images/license.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@
"license": "contact phethelp@colorado.edu",
"notes": "created by Amanda McGarry"
},
"compare_screen_icon.png": {
"text": [
"Copyright 2019 University of Colorado Boulder"
],
"projectURL": "http://phet.colorado.edu",
"license": "contact phethelp@colorado.edu",
"notes": "created by Amanda McGarry"
},
"compare_screen_placeholder.png": {
"text": [
"Copyright 2019 University of Colorado Boulder"
Expand All @@ -31,6 +39,14 @@
"license": "contact phethelp@colorado.edu",
"notes": "created by Cheryl McCutchan"
},
"lab_screen_icon.png": {
"text": [
"Copyright 2019 University of Colorado Boulder"
],
"projectURL": "http://phet.colorado.edu",
"license": "contact phethelp@colorado.edu",
"notes": "created by Amanda McGarry"
},
"lab_screen_placeholder.png": {
"text": [
"Copyright 2019 University of Colorado Boulder"
Expand All @@ -39,6 +55,22 @@
"license": "contact phethelp@colorado.edu",
"notes": "created by Amanda McGarry"
},
"ten_screen_icon.png": {
"text": [
"Copyright 2019 University of Colorado Boulder"
],
"projectURL": "http://phet.colorado.edu",
"license": "contact phethelp@colorado.edu",
"notes": "created by Amanda McGarry"
},
"twenty_screen_icon.png": {
"text": [
"Copyright 2019 University of Colorado Boulder"
],
"projectURL": "http://phet.colorado.edu",
"license": "contact phethelp@colorado.edu",
"notes": "created by Amanda McGarry"
},
"turtle.png": {
"text": [
"Copyright 2017-2019 University of Colorado Boulder"
Expand Down
Binary file added images/ten_screen_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/twenty_screen_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions js/compare/CompareScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,17 @@ define( require => {
// modules
const CompareModel = require( 'NUMBER_PLAY/compare/model/CompareModel' );
const CompareScreenView = require( 'NUMBER_PLAY/compare/view/CompareScreenView' );
const Image = require( 'SCENERY/nodes/Image' );
const numberPlay = require( 'NUMBER_PLAY/numberPlay' );
const Property = require( 'AXON/Property' );
const Screen = require( 'JOIST/Screen' );

// strings
const screenCompareString = require( 'string!NUMBER_PLAY/screen.compare' );

// images
const compareScreenIconImage = require( 'image!NUMBER_PLAY/compare_screen_icon.png' );

class CompareScreen extends Screen {

/**
Expand All @@ -28,6 +32,7 @@ define( require => {
const options = {
name: screenCompareString,
backgroundColorProperty: new Property( 'white' ),
homeScreenIcon: new Image( compareScreenIconImage ),
tandem: tandem
};

Expand Down
5 changes: 5 additions & 0 deletions js/lab/LabScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ define( require => {
'use strict';

// modules
const Image = require( 'SCENERY/nodes/Image' );
const LabModel = require( 'NUMBER_PLAY/lab/model/LabModel' );
const LabScreenView = require( 'NUMBER_PLAY/lab/view/LabScreenView' );
const numberPlay = require( 'NUMBER_PLAY/numberPlay' );
Expand All @@ -18,6 +19,9 @@ define( require => {
// strings
const screenLabString = require( 'string!NUMBER_PLAY/screen.lab' );

// images
const labScreenIconImage = require( 'image!NUMBER_PLAY/lab_screen_icon.png' );

class LabScreen extends Screen {

/**
Expand All @@ -28,6 +32,7 @@ define( require => {
const options = {
name: screenLabString,
backgroundColorProperty: new Property( 'white' ),
homeScreenIcon: new Image( labScreenIconImage ),
tandem: tandem
};

Expand Down
5 changes: 5 additions & 0 deletions js/ten/TenScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ define( require => {

// modules
const Dimension2 = require( 'DOT/Dimension2' );
const Image = require( 'SCENERY/nodes/Image' );
const numberPlay = require( 'NUMBER_PLAY/numberPlay' );
const NumberPlayConstants = require( 'NUMBER_PLAY/common/NumberPlayConstants' );
const NumberPlayModel = require( 'NUMBER_PLAY/common/model/NumberPlayModel' );
Expand All @@ -22,6 +23,9 @@ define( require => {
// strings
const screenTenString = require( 'string!NUMBER_PLAY/screen.ten' );

// images
const tenScreenIconImage = require( 'image!NUMBER_PLAY/ten_screen_icon.png' );

class TenScreen extends Screen {

/**
Expand All @@ -32,6 +36,7 @@ define( require => {
const screenOptions = {
name: screenTenString,
backgroundColorProperty: new Property( NumberPlayConstants.TEN_SCREEN_BACKGROUND ),
homeScreenIcon: new Image( tenScreenIconImage ),
tandem: tandem
};

Expand Down
5 changes: 5 additions & 0 deletions js/twenty/TwentyScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ define( require => {

// modules
const Dimension2 = require( 'DOT/Dimension2' );
const Image = require( 'SCENERY/nodes/Image' );
const numberPlay = require( 'NUMBER_PLAY/numberPlay' );
const NumberPlayConstants = require( 'NUMBER_PLAY/common/NumberPlayConstants' );
const NumberPlayModel = require( 'NUMBER_PLAY/common/model/NumberPlayModel' );
Expand All @@ -22,6 +23,9 @@ define( require => {
// strings
const screenTwentyString = require( 'string!NUMBER_PLAY/screen.twenty' );

// images
const twentyScreenIconImage = require( 'image!NUMBER_PLAY/twenty_screen_icon.png' );

class TwentyScreen extends Screen {

/**
Expand All @@ -32,6 +36,7 @@ define( require => {
const screenOptions = {
name: screenTwentyString,
backgroundColorProperty: new Property( NumberPlayConstants.TWENTY_SCREEN_BACKGROUND ),
homeScreenIcon: new Image( twentyScreenIconImage ),
tandem: tandem
};

Expand Down

0 comments on commit 2bd8842

Please sign in to comment.