version 0.4.6

flyingcircle · Sep 16, 2016 · e4e9545 · e4e9545
1 parent c901b08
commit e4e9545
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 14 deletions.
diff --git a/Readme.MD b/Readme.MD
@@ -60,10 +60,11 @@ import {
 ## Roadmap
 - [ ] Add radio buttons
 - [ ] Add icons to TextInputs
-- [ ] Profile Component
+- [ ] Profile Component `in progress`
+- [ ] Add grid component `in progress`
 - [ ] Custom Picker
 - [ ] Side Menu Improvements
-- [ ] Cross Platform Tab Bar
+- [ ] Cross Platform Tab Bar `in progress`
 - [ ] Something you's like to see? Submit an [issue](https://github.com/dabit3/React-Native-Elements/issues) or a [pull request](https://github.com/dabit3/React-Native-Elements/pulls)
 
 ## Examples

diff --git a/src/config/colors.js b/src/config/colors.js
@@ -1,5 +1,5 @@
 export default {
-  primary: '#397af8',
+  primary: '#9E9E9E',
   primary1: '#4d86f7',
   primary2: '#6296f9',
   secondary: '#8F0CE8',

diff --git a/src/icons/Icon.js b/src/icons/Icon.js
@@ -37,12 +37,15 @@ const Icon = ({
         reverse ? color : underlayColor || color
       }
       style={[
-        styles.button,
-        raised && styles.raised, {
+        (reverse || raised) && styles.button,
+        (reverse || raised) && {
           borderRadius: size + 4,
-          backgroundColor: reverse ? color : raised ? 'white' : 'transparent',
           height: size * 2 + 4,
-          width: size * 2 + 4,
+          width: size * 2 + 4
+        },
+        raised && styles.raised,
+        {
+          backgroundColor: reverse ? color : raised ? 'white' : 'transparent',
           alignItems: 'center',
           justifyContent: 'center'},
         containerStyle && containerStyle

diff --git a/src/social/SocialIcon.js b/src/social/SocialIcon.js
@@ -50,17 +50,15 @@ const SocialIcon = ({
       underlayColor={light ? 'white' : colors[type]}
       onPress={onPress}
       style={[
-        {justifyContent: 'center',
-        alignItems: 'center'},
         raised && styles.raised,
         styles.container,
-        button ? styles.button : styles.icon,
-        !button && iconSize && {width: iconSize * 2 + 4},
-        !button && iconSize && {height: iconSize * 2 + 4},
-        !button && iconSize && {borderRadius: iconSize * 2},
+        button && styles.button,
+        !button && raised && styles.icon,
+        !button && !light && !raised  && {width: iconSize * 2 + 4},
+        !button && !light && !raised  && {height: iconSize * 2 + 4},
+        !button && !light && !raised  && {borderRadius: iconSize * 2},
         {backgroundColor: colors[type]},
         light && {backgroundColor: 'white'},
-        light && !raised && {marginLeft: 2, marginRight: 2},
         style && style
       ]}>
       <View style={styles.wrapper}>
@@ -116,6 +114,10 @@ styles = StyleSheet.create({
     justifyContent: 'center',
     alignItems: 'center'
   },
+  button: {
+    paddingTop: 14,
+    paddingBottom: 14
+  },
   raised: {
     ...Platform.select({
       ios: {
@@ -130,6 +132,9 @@ styles = StyleSheet.create({
     })
   },
   wrapper: {
+    flexDirection: 'row',
+    justifyContent: 'center',
+    alignItems: 'center'
   },
   title: {
     color: 'white',