Skip to content

Commit

Permalink
feat(Core): update MDColorTheme to use MDColor
Browse files Browse the repository at this point in the history
  • Loading branch information
@batteredgherkin
batteredgherkin committed May 18, 2020
1 parent e001ede commit 240f349
Show file tree
Hide file tree
Showing 51 changed files with 107 additions and 200 deletions.
2 changes: 1 addition & 1 deletion packages/Material-Core.package/MDButton.class/class/defaultBackgroundColorToggled.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
properties
defaultBackgroundColorToggled

^ MDColorTheme currentTheme secondaryColorDarkest
^ MDColorTheme currentTheme secondaryColorDark
2 changes: 1 addition & 1 deletion packages/Material-Core.package/MDButton.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"class" : {
"alwaysUppercase" : "JW 6/8/2018 16:04",
"defaultBackgroundColor" : "lp 6/4/2019 17:55",
"defaultBackgroundColorToggled" : "lp 6/4/2019 18:50",
"defaultBackgroundColorToggled" : "RW 5/18/2020 19:47",
"defaultBorderRadius" : "LS 5/14/2018 10:01",
"defaultElevatedSizeDifference" : "mats 5/22/2018 11:09",
"defaultHeight" : "JW 5/17/2018 13:01",
Expand Down
20 changes: 10 additions & 10 deletions ...de50.shade100.shade200.shade300.shade400.shade500.shade600.shade700.shade800.shade900..st
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
instance creation
fromShade50: shade50 shade100: shade100 shade200: shade200 shade300: shade300 shade400: shade400 shade500: shade500 shade600: shade600 shade700: shade700 shade800: shade800 shade900: shade900

^ self new
shade50: shade50;
shade100: shade100;
shade200: shade200;
shade300: shade300;
shade400: shade400;
shade500: shade500;
shade600: shade600;
shade700: shade700;
shade800: shade800;
^ self basicNew
initializeFromShade50: shade50
shade100: shade100
shade200: shade200
shade300: shade300
shade400: shade400
shade500: shade500
shade600: shade600
shade700: shade700
shade800: shade800
shade900: shade900;
yourself
4 changes: 4 additions & 0 deletions packages/Material-Core.package/MDColor.class/instance/darker.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
darker

^ self shade700
15 changes: 15 additions & 0 deletions ...de50.shade100.shade200.shade300.shade400.shade500.shade600.shade700.shade800.shade900..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
initialization
initializeFromShade50: s50 shade100: s100 shade200: s200 shade300: s300 shade400: s400 shade500: s500 shade600: s600 shade700: s700 shade800: s800 shade900: s900

self initialize.
shade50 := s50.
shade100 := s100.
shade200 := s200.
shade300 := s300.
shade400 := s400.
shade500 := s500.
shade600 := s600.
shade700 := s700.
shade800 := s800.
shade900 := s900.
self setRed: s500 red green: s500 green blue: s500 blue
4 changes: 4 additions & 0 deletions packages/Material-Core.package/MDColor.class/instance/lighter.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
lighter

^ self shade200
4 changes: 0 additions & 4 deletions packages/Material-Core.package/MDColor.class/instance/shade100..st
View file

This file was deleted.

4 changes: 0 additions & 4 deletions packages/Material-Core.package/MDColor.class/instance/shade200..st
View file

This file was deleted.

4 changes: 0 additions & 4 deletions packages/Material-Core.package/MDColor.class/instance/shade300..st
View file

This file was deleted.

4 changes: 0 additions & 4 deletions packages/Material-Core.package/MDColor.class/instance/shade400..st
View file

This file was deleted.

4 changes: 0 additions & 4 deletions packages/Material-Core.package/MDColor.class/instance/shade50..st
View file

This file was deleted.

5 changes: 0 additions & 5 deletions packages/Material-Core.package/MDColor.class/instance/shade500..st
View file

This file was deleted.

4 changes: 0 additions & 4 deletions packages/Material-Core.package/MDColor.class/instance/shade600..st
View file

This file was deleted.

4 changes: 0 additions & 4 deletions packages/Material-Core.package/MDColor.class/instance/shade700..st
View file

This file was deleted.

4 changes: 0 additions & 4 deletions packages/Material-Core.package/MDColor.class/instance/shade800..st
View file

This file was deleted.

4 changes: 0 additions & 4 deletions packages/Material-Core.package/MDColor.class/instance/shade900..st
View file

This file was deleted.

17 changes: 5 additions & 12 deletions packages/Material-Core.package/MDColor.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"cyan" : "RW 5/18/2020 19:10",
"deepOrange" : "RW 5/18/2020 19:11",
"deepPurple" : "RW 5/18/2020 19:09",
"fromShade50:shade100:shade200:shade300:shade400:shade500:shade600:shade700:shade800:shade900:" : "RW 5/18/2020 18:39",
"fromShade50:shade100:shade200:shade300:shade400:shade500:shade600:shade700:shade800:shade900:" : "RW 5/18/2020 20:24",
"gray" : "RW 5/18/2020 19:11",
"green" : "RW 5/18/2020 19:10",
"grey" : "RW 5/18/2020 19:11",
Expand All @@ -23,23 +23,16 @@
"teal" : "RW 5/18/2020 19:10",
"yellow" : "RW 5/18/2020 19:10" },
"instance" : {
"darker" : "RW 5/18/2020 20:07",
"initializeFromShade50:shade100:shade200:shade300:shade400:shade500:shade600:shade700:shade800:shade900:" : "RW 5/18/2020 20:26",
"lighter" : "RW 5/18/2020 20:07",
"shade100" : "RW 5/18/2020 18:26",
"shade100:" : "RW 5/18/2020 18:25",
"shade200" : "RW 5/18/2020 18:26",
"shade200:" : "RW 5/18/2020 18:25",
"shade300" : "RW 5/18/2020 18:27",
"shade300:" : "RW 5/18/2020 18:25",
"shade400" : "RW 5/18/2020 18:27",
"shade400:" : "RW 5/18/2020 18:26",
"shade50" : "RW 5/18/2020 18:24",
"shade500" : "RW 5/18/2020 18:27",
"shade500:" : "RW 5/18/2020 18:35",
"shade50:" : "RW 5/18/2020 18:25",
"shade600" : "RW 5/18/2020 18:27",
"shade600:" : "RW 5/18/2020 18:26",
"shade700" : "RW 5/18/2020 18:27",
"shade700:" : "RW 5/18/2020 18:26",
"shade800" : "RW 5/18/2020 18:27",
"shade800:" : "RW 5/18/2020 18:26",
"shade900" : "RW 5/18/2020 18:27",
"shade900:" : "RW 5/18/2020 18:26" } }
"shade900" : "RW 5/18/2020 18:27" } }
2 changes: 1 addition & 1 deletion packages/Material-Core.package/MDColorTheme.class/class/defaultPrimaryColor.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
properties
defaultPrimaryColor

^ Color fromString: '6200ee'
^ MDColor indigo
2 changes: 1 addition & 1 deletion packages/Material-Core.package/MDColorTheme.class/class/defaultSecondaryColor.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
properties
defaultSecondaryColor

^ Color fromString: '03dac5'
^ MDColor pink
4 changes: 0 additions & 4 deletions packages/Material-Core.package/MDColorTheme.class/class/numberOfShades.st
View file

This file was deleted.

11 changes: 0 additions & 11 deletions packages/Material-Core.package/MDColorTheme.class/instance/calculateDarkVariants..st
View file

This file was deleted.

11 changes: 0 additions & 11 deletions packages/Material-Core.package/MDColorTheme.class/instance/calculateLightVariants..st
View file

This file was deleted.

5 changes: 0 additions & 5 deletions packages/Material-Core.package/MDColorTheme.class/instance/calculatePrimaryVariants.st
View file

This file was deleted.

5 changes: 0 additions & 5 deletions packages/Material-Core.package/MDColorTheme.class/instance/calculateSecondaryVariants.st
View file

This file was deleted.

2 changes: 1 addition & 1 deletion packages/Material-Core.package/MDColorTheme.class/instance/primaryColor..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ accessing
primaryColor: aColor

primaryColor := aColor.
self calculatePrimaryVariants
self updatePrimaryVariants
4 changes: 4 additions & 0 deletions packages/Material-Core.package/MDColorTheme.class/instance/primaryColorDark..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
primaryColorDark: aColor

primaryColorDark := aColor
2 changes: 1 addition & 1 deletion packages/Material-Core.package/MDColorTheme.class/instance/primaryColorDark.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
primaryColorDark

^ self primaryColorDarkVariants last
^ primaryColorDark
4 changes: 0 additions & 4 deletions packages/Material-Core.package/MDColorTheme.class/instance/primaryColorDarkVariants..st
View file

This file was deleted.

4 changes: 0 additions & 4 deletions packages/Material-Core.package/MDColorTheme.class/instance/primaryColorDarkVariants.st
View file

This file was deleted.

4 changes: 0 additions & 4 deletions packages/Material-Core.package/MDColorTheme.class/instance/primaryColorDarkest.st
View file

This file was deleted.

4 changes: 4 additions & 0 deletions packages/Material-Core.package/MDColorTheme.class/instance/primaryColorLight..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
primaryColorLight: aColor

primaryColorLight := aColor
2 changes: 1 addition & 1 deletion packages/Material-Core.package/MDColorTheme.class/instance/primaryColorLight.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
primaryColorLight

^ self primaryColorLightVariants last
^ primaryColorLight
4 changes: 0 additions & 4 deletions packages/Material-Core.package/MDColorTheme.class/instance/primaryColorLightVariants..st
View file

This file was deleted.

4 changes: 0 additions & 4 deletions packages/Material-Core.package/MDColorTheme.class/instance/primaryColorLightVariants.st
View file

This file was deleted.

4 changes: 0 additions & 4 deletions packages/Material-Core.package/MDColorTheme.class/instance/primaryColorLightest.st
View file

This file was deleted.

2 changes: 1 addition & 1 deletion packages/Material-Core.package/MDColorTheme.class/instance/secondaryColor..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ accessing
secondaryColor: aColor

secondaryColor := aColor.
self calculateSecondaryVariants
self updateSecondaryVariants
4 changes: 4 additions & 0 deletions packages/Material-Core.package/MDColorTheme.class/instance/secondaryColorDark..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
secondaryColorDark: aColor

secondaryColorDark := aColor
2 changes: 1 addition & 1 deletion packages/Material-Core.package/MDColorTheme.class/instance/secondaryColorDark.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
secondaryColorDark

^ self secondaryColorDarkVariants last
^ secondaryColorDark
4 changes: 0 additions & 4 deletions packages/Material-Core.package/MDColorTheme.class/instance/secondaryColorDarkVariants..st
View file

This file was deleted.

4 changes: 0 additions & 4 deletions packages/Material-Core.package/MDColorTheme.class/instance/secondaryColorDarkVariants.st
View file

This file was deleted.

4 changes: 0 additions & 4 deletions packages/Material-Core.package/MDColorTheme.class/instance/secondaryColorDarkest.st
View file

This file was deleted.

4 changes: 4 additions & 0 deletions packages/Material-Core.package/MDColorTheme.class/instance/secondaryColorLight..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
secondaryColorLight: aColor

secondaryColorLight := aColor
2 changes: 1 addition & 1 deletion packages/Material-Core.package/MDColorTheme.class/instance/secondaryColorLight.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
secondaryColorLight

^ self secondaryColorLightVariants last
^ secondaryColorLight
4 changes: 0 additions & 4 deletions packages/Material-Core.package/MDColorTheme.class/instance/secondaryColorLightVariants..st
View file

This file was deleted.

4 changes: 0 additions & 4 deletions packages/Material-Core.package/MDColorTheme.class/instance/secondaryColorLightVariants.st
View file

This file was deleted.

4 changes: 0 additions & 4 deletions packages/Material-Core.package/MDColorTheme.class/instance/secondaryColorLightest.st
View file

This file was deleted.

Loading

0 comments on commit 240f349

Please sign in to comment.