Skip to content

Added Android text color props #1

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

Open
AndyShi12 wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Added Android text color props #1

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a7d4507
Added Android Text Props
AndyShi12 Oct 12, 2016
2bc80b0
Added Android specific props
AndyShi12 Oct 12, 2016
46f15f9
Setting Android text prop default
AndyShi12 Oct 12, 2016
fc80658
Prop-types added
federicoap Jul 24, 2018
477eebf
Git related link updated and more devDependencies added
federicoap Jul 24, 2018
c3c6ada
Eslint error fixed and dependencies updated
federicoap Jul 24, 2018
4fd8eeb
Eslint error fixed
federicoap Jul 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Added Android Text Props 
Added Android text color/text active color; black/gray clashing with navbar
  • Loading branch information
@AndyShi12
AndyShi12 authored Oct 12, 2016
commit a7d45077ae9b620cd613e9320bd8cc7607d5b872
8 changes: 5 additions & 3 deletions android/segmentedControl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ class SegmentedControl extends Component {
<Text
style={[styles.textValue, {
color: p.selectedIndex == i
? 'black'
: 'grey'
? this.props.androidTextActive
: this.props.androidTextColor
}]}>{v}</Text>
</View>
</TouchableWithoutFeedback>)}
Expand All @@ -78,6 +78,8 @@ SegmentedControl.propTypes = {
, onValueChange: React.PropTypes.func
, androidTint: React.PropTypes.string //Android Specific
, height: React.PropTypes.number //Android Specific
, androidTextActive: React.PropTypes.string //Android Specific
, androidTextColor: React.PropTypes.string //Android Specific
};

SegmentedControl.defaultProps = {
Expand Down Expand Up @@ -108,4 +110,4 @@ const styles = StyleSheet.create({
}
});

export default SegmentedControl;
export default SegmentedControl;