Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BottomNavigation] Ability to handle custom Icons instead of icon names. #62

Merged
merged 2 commits into from
Dec 21, 2016
Merged

[BottomNavigation] Ability to handle custom Icons instead of icon names. #62

merged 2 commits into from
Dec 21, 2016

Conversation

NewOldMax
Copy link
Contributor

See #61

xotahal
xotahal requested changes Dec 21, 2016
View reviewed changes
src/BottomNavigation/BottomNavigationAction.react.js
*/
icon: PropTypes.string.isRequired,
icon: PropTypes.node.isRequired,
Copy link
Owner

Choose a reason for hiding this comment

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

Could you change it for something like this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sure, will do it now

@xotahal
Copy link
Owner

xotahal commented Dec 21, 2016

Cool, thank you @NewOldMax ;)

@xotahal xotahal merged commit decb49a into xotahal:master Dec 21, 2016
@NewOldMax NewOldMax mentioned this pull request Dec 21, 2016
Closed
davearata added a commit to davearata/react-native-material-ui that referenced this pull request Dec 21, 2016
@davearata
Merge remote-tracking branch 'upstream/master'
a857dc1 
* upstream/master:
  [BottomNavigation] Ability to handle custom Icons instead of icon names. (xotahal#62)
@NewOldMax NewOldMax mentioned this pull request Dec 27, 2016
Merged
@NewOldMax NewOldMax deleted the bottomnav_handle_custom_icons branch December 27, 2016 13:59
xotahal pushed a commit that referenced this pull request Jan 10, 2017
@HofmannZ @xotahal
[BottomNavigation] Add show and hide animations (#55)
663e417 
* Remove code specific to Android in Toolbar Search (#54)

All platforms (iOS, android and 3rd party windows) implements BackAndroid (iOS mocks it).

* [BottomNavigation] Added component (#52)

* Add bottom navigation component

* Fixed a bug where the list item component uses the wrong then color refrence

* Fixed a bug where the list item component uses a static background instad of canvas collor

* Added onPress ad required prop type

* Fix bottom navigation component

- moves BottomNavigationAction under BottomNavigation.Action
- makes styles global, moves them to getTheme.js
- adds ability to use action without label
- adds missing paddingTop
- adds missing comments
- fixes lint

* Update BottomNavigation.md

* Update README.md

* Delete BottomNavigationAction.md

* Bump version

* Added show and hide animations to BottomNavigation component following the material design mation guidelines

* Edit based on feedback in pull request

* Fix eslint errors

* Update jest

* Add snapshot tests for Subheader

* Add circle.yml

* Update codecov.yml

* Add codecov.io (#57)

* Add tests for Container.react.js

* Update README.md

* [BottomNavigation] Ability to handle custom Icons instead of icon names. (#62)

* [BottomNavigation] Ability to handle custom Icons instead of icon names.

* Fix PropTypes.

* [RippleFeedback] Use TouchableOpacity for iOS (#41) (#64)

* Minor bug fix and added nativa animation driver support for android

* Fixed lint error.

* Added useNAtiveDriver and fixed the heigth issue

* Fix getting height of bottom navigation
xotahal pushed a commit that referenced this pull request Jan 10, 2017
@HofmannZ @xotahal
[BottomNavigation] Add show and hide animations (#55)
d61692a 
* Remove code specific to Android in Toolbar Search (#54)

All platforms (iOS, android and 3rd party windows) implements BackAndroid (iOS mocks it).

* [BottomNavigation] Added component (#52)

* Add bottom navigation component

* Fixed a bug where the list item component uses the wrong then color refrence

* Fixed a bug where the list item component uses a static background instad of canvas collor

* Added onPress ad required prop type

* Fix bottom navigation component

- moves BottomNavigationAction under BottomNavigation.Action
- makes styles global, moves them to getTheme.js
- adds ability to use action without label
- adds missing paddingTop
- adds missing comments
- fixes lint

* Update BottomNavigation.md

* Update README.md

* Delete BottomNavigationAction.md

* Bump version

* Added show and hide animations to BottomNavigation component following the material design mation guidelines

* Edit based on feedback in pull request

* Fix eslint errors

* Update jest

* Add snapshot tests for Subheader

* Add circle.yml

* Update codecov.yml

* Add codecov.io (#57)

* Add tests for Container.react.js

* Update README.md

* [BottomNavigation] Ability to handle custom Icons instead of icon names. (#62)

* [BottomNavigation] Ability to handle custom Icons instead of icon names.

* Fix PropTypes.

* [RippleFeedback] Use TouchableOpacity for iOS (#41) (#64)

* Minor bug fix and added nativa animation driver support for android

* Fixed lint error.

* Added useNAtiveDriver and fixed the heigth issue

* Fix getting height of bottom navigation
xotahal added a commit that referenced this pull request Jan 10, 2017
@xotahal
Add show and hide animation [BottomNavigation] (#73)
1b39688 
* Added bottom navigation component with dacumentation, as dricribed in the material design guidelines

* Fixed a bug where the list item component uses a static background instad of canvas collor

* Added onPress ad required prop type

* Fix bottom navigation component

- moves BottomNavigationAction under BottomNavigation.Action
- makes styles global, moves them to getTheme.js
- adds ability to use action without label
- adds missing paddingTop
- adds missing comments
- fixes lint

* [BottomNavigation] Add show and hide animations (#55)

* Remove code specific to Android in Toolbar Search (#54)

All platforms (iOS, android and 3rd party windows) implements BackAndroid (iOS mocks it).

* [BottomNavigation] Added component (#52)

* Add bottom navigation component

* Fixed a bug where the list item component uses the wrong then color refrence

* Fixed a bug where the list item component uses a static background instad of canvas collor

* Added onPress ad required prop type

* Fix bottom navigation component

- moves BottomNavigationAction under BottomNavigation.Action
- makes styles global, moves them to getTheme.js
- adds ability to use action without label
- adds missing paddingTop
- adds missing comments
- fixes lint

* Update BottomNavigation.md

* Update README.md

* Delete BottomNavigationAction.md

* Bump version

* Added show and hide animations to BottomNavigation component following the material design mation guidelines

* Edit based on feedback in pull request

* Fix eslint errors

* Update jest

* Add snapshot tests for Subheader

* Add circle.yml

* Update codecov.yml

* Add codecov.io (#57)

* Add tests for Container.react.js

* Update README.md

* [BottomNavigation] Ability to handle custom Icons instead of icon names. (#62)

* [BottomNavigation] Ability to handle custom Icons instead of icon names.

* Fix PropTypes.

* [RippleFeedback] Use TouchableOpacity for iOS (#41) (#64)

* Minor bug fix and added nativa animation driver support for android

* Fixed lint error.

* Added useNAtiveDriver and fixed the heigth issue

* Fix getting height of bottom navigation

* Fix eslint
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xotahal xotahal xotahal approved these changes

@mrcasals mrcasals mrcasals approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@NewOldMax @xotahal @mrcasals