Skip to content

Commit

Permalink
Update color package
Browse files Browse the repository at this point in the history
  • Loading branch information
xotahal committed Jan 11, 2017
1 parent 72bcf3f commit 8d30d21
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
},
"homepage": "https://github.com/xotahal/react-native-material-ui",
"dependencies": {
"color": "^0.11.3",
"color": "^1.0.3",
"lodash.merge": "^4.0.0",
"react-native-material-design-styles": "^0.2.6",
"react-native-vector-icons": "^3.0.0"
"react-native-vector-icons": "3.0.0"
},
"devDependencies": {
"babel-core": "^6.14.0",
Expand Down
2 changes: 1 addition & 1 deletion src/IconToggle/IconToggle.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ class IconToggle extends PureComponent {
borderRadius: (rippleSize) / 2,
transform: [{ scale: scaleValue }],
opacity: opacityValue,
backgroundColor: color.hexString(),
backgroundColor: color.toString(),
// we need set zindex for iOS, because the components with elevation have the
// zindex set as well, thus, there could be displayed backgroundColor of
// component with bigger zindex - and that's not good
Expand Down
4 changes: 2 additions & 2 deletions src/styles/getTheme.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default function getTheme(theme, ...more) {
},
overlayContainer: {
...StyleSheet.absoluteFillObject,
backgroundColor: Color('#fff').alpha(0.8).rgbaString(),
backgroundColor: Color('#fff').alpha(0.8).toString(),
// we need overlay to be above the toolbar - so maybe we could use some variable
// to get elevation for toolbar and this overlay
...getPlatformElevation(4),
Expand Down Expand Up @@ -100,7 +100,7 @@ export default function getTheme(theme, ...more) {
width: spacing.avatarSize,
height: spacing.avatarSize,
borderRadius: spacing.avatarSize / 2,
backgroundColor: darkenOrLighten(palette.canvasColor, 0.26).hexString(),
backgroundColor: darkenOrLighten(palette.canvasColor, 0.26).toString(),
alignItems: 'center',
justifyContent: 'center',
},
Expand Down
14 changes: 7 additions & 7 deletions src/styles/themes/light.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ export default {
primaryColor: blue500,
accentColor: red500,
// text color palette
primaryTextColor: Color(black).alpha(.87).rgbaString(),
secondaryTextColor: Color(black).alpha(.54).rgbaString(),
primaryTextColor: Color(black).alpha(.87).toString(),
secondaryTextColor: Color(black).alpha(.54).toString(),
alternateTextColor: white,
// backgournds and borders
canvasColor: white,
borderColor: Color(black).alpha(.12).rgbaString(),
borderColor: Color(black).alpha(.12).toString(),
// https://material.google.com/style/color.html#color-text-background-colors
disabledColor: Color(black).alpha(.38).rgbaString(),
disabledTextColor: Color(black).alpha(.26).rgbaString(),
activeIcon: Color(black).alpha(.54).rgbaString(),
inactiveIcon: Color(black).alpha(.38).rgbaString(),
disabledColor: Color(black).alpha(.38).toString(),
disabledTextColor: Color(black).alpha(.26).toString(),
activeIcon: Color(black).alpha(.54).toString(),
inactiveIcon: Color(black).alpha(.38).toString(),
// pickerHeaderColor: cyan500,
// clockCircleColor: faintBlack,
// shadowColor: fullBlack,
Expand Down

1 comment on commit 8d30d21

@kennethpdev
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@xotahal since you upgraded react-native-vector-icons. I think we should start using MaterialCommunityIcons it's more update icons for the material design. considering it's being updated by the community.

Please sign in to comment.