Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: flyingcircle/react-native-elements
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.4.5
Choose a base ref
...
head repository: flyingcircle/react-native-elements
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.4.6
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on Sep 15, 2016

  1. Merge pull request react-native-elements#24 from react-native-communi…

    …ty/v0.4.5
    
    fixed Icon requirement
    dabit3 authored Sep 15, 2016
    Copy the full SHA
    df25af3 View commit details
  2. Updated Readme

    dabit3 authored Sep 15, 2016
    Copy the full SHA
    576a699 View commit details

Commits on Sep 16, 2016

  1. version 0.4.6

    dabit3 committed Sep 16, 2016
    Copy the full SHA
    e4e9545 View commit details
  2. Merge branch 'master' of github.com:react-native-community/React-Nati…

    …ve-Elements into v0.4.6
    dabit3 committed Sep 16, 2016
    Copy the full SHA
    21dcf08 View commit details
Showing with 24 additions and 14 deletions.
  1. +4 −2 Readme.MD
  2. +1 −1 src/config/colors.js
  3. +7 −4 src/icons/Icon.js
  4. +12 −7 src/social/SocialIcon.js
6 changes: 4 additions & 2 deletions Readme.MD
Original file line number Diff line number Diff line change
@@ -59,13 +59,15 @@ import {

## Roadmap
- [ ] Add radio buttons
- [ ] Add grid component
- [ ] Searchable Drop Down similar to [Bootstrap-3-Typehead](https://github.com/bassjobsen/Bootstrap-3-Typeahead)
- [ ] [Swipeable List Item component](https://github.com/jemise111/react-native-swipe-list-view)
- [ ] 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
2 changes: 1 addition & 1 deletion src/config/colors.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export default {
primary: '#397af8',
primary: '#9E9E9E',
primary1: '#4d86f7',
primary2: '#6296f9',
secondary: '#8F0CE8',
11 changes: 7 additions & 4 deletions src/icons/Icon.js
Original file line number Diff line number Diff line change
@@ -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
19 changes: 12 additions & 7 deletions src/social/SocialIcon.js
Original file line number Diff line number Diff line change
@@ -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',