From a7d45077ae9b620cd613e9320bd8cc7607d5b872 Mon Sep 17 00:00:00 2001 From: Andy Shi Date: Wed, 12 Oct 2016 12:19:01 -0400 Subject: [PATCH 1/7] Added Android Text Props Added Android text color/text active color; black/gray clashing with navbar --- android/segmentedControl.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/android/segmentedControl.js b/android/segmentedControl.js index 40f9da5..f90931c 100644 --- a/android/segmentedControl.js +++ b/android/segmentedControl.js @@ -60,8 +60,8 @@ class SegmentedControl extends Component { {v} )} @@ -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 = { @@ -108,4 +110,4 @@ const styles = StyleSheet.create({ } }); -export default SegmentedControl; \ No newline at end of file +export default SegmentedControl; From 2bc80b0ba7d2e6b6295fa2fbeb5bc1713c0e37da Mon Sep 17 00:00:00 2001 From: Andy Shi Date: Wed, 12 Oct 2016 12:20:10 -0400 Subject: [PATCH 2/7] Added Android specific props --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 738de8a..e7da0b9 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,8 @@ SegmentedControl.propTypes = { , onValueChange: React.PropTypes.func , androidTint: React.PropTypes.string //Android Specific, overrides tintColor , height: React.PropTypes.number //Android Specific + , androidTextActive: React.PropTypes.string //Android Specific + , androidTextColor: React.PropTypes.string //Android Specific }; SegmentedControl.defaultProps = { @@ -105,4 +107,4 @@ const styles = StyleSheet.create({ , marginBottom: 5 } }); -``` \ No newline at end of file +``` From 46f15f90e4a7c2d54056e35213151d00ba0039b4 Mon Sep 17 00:00:00 2001 From: Andy Shi Date: Wed, 12 Oct 2016 12:31:02 -0400 Subject: [PATCH 3/7] Setting Android text prop default --- android/segmentedControl.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/android/segmentedControl.js b/android/segmentedControl.js index f90931c..4b0f1d1 100644 --- a/android/segmentedControl.js +++ b/android/segmentedControl.js @@ -86,6 +86,8 @@ SegmentedControl.defaultProps = { height: 38 , enabled: true , tintColor: 'black' + , androidTextActive: 'black' + , androidTextColor: 'grey' }; const styles = StyleSheet.create({ From fc806580ae787f7154ca08ad6f9245e4b063a8eb Mon Sep 17 00:00:00 2001 From: Federico Miralles Date: Tue, 24 Jul 2018 13:05:50 -0300 Subject: [PATCH 4/7] Prop-types added --- android/segmentedControl.js | 19 ++++++++++--------- package.json | 5 ++++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/android/segmentedControl.js b/android/segmentedControl.js index 4b0f1d1..38278b4 100644 --- a/android/segmentedControl.js +++ b/android/segmentedControl.js @@ -6,6 +6,7 @@ import { , TouchableWithoutFeedback , Dimensions } from 'react-native'; +import PropTypes from 'prop-types'; class SegmentedControl extends Component { @@ -71,15 +72,15 @@ class SegmentedControl extends Component { } SegmentedControl.propTypes = { - values: React.PropTypes.arrayOf(React.PropTypes.string).isRequired - , tintColor: React.PropTypes.string - , enabled: React.PropTypes.bool - , onChange: React.PropTypes.func - , 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 + values: PropTypes.arrayOf(PropTypes.string).isRequired + , tintColor: PropTypes.string + , enabled: PropTypes.bool + , onChange: PropTypes.func + , onValueChange: PropTypes.func + , androidTint: PropTypes.string //Android Specific + , height: PropTypes.number //Android Specific + , androidTextActive: PropTypes.string //Android Specific + , androidTextColor: PropTypes.string //Android Specific }; SegmentedControl.defaultProps = { diff --git a/package.json b/package.json index 6209260..da2b926 100644 --- a/package.json +++ b/package.json @@ -15,5 +15,8 @@ "bugs": { "url": "https://github.com/natdm/segmentedControl/issues" }, - "homepage": "https://github.com/natdm/segmentedControl#readme" + "homepage": "https://github.com/natdm/segmentedControl#readme", + "devDependencies": { + "prop-types": "^15.6.2", + }, } From 477eebf0d0b849219d952e6fb2b7aec8c1ee89b9 Mon Sep 17 00:00:00 2001 From: Federico Miralles Date: Tue, 24 Jul 2018 14:57:07 -0300 Subject: [PATCH 5/7] Git related link updated and more devDependencies added --- android/segmentedControl.js | 2 +- package.json | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/android/segmentedControl.js b/android/segmentedControl.js index 38278b4..cb1c84d 100644 --- a/android/segmentedControl.js +++ b/android/segmentedControl.js @@ -71,7 +71,7 @@ class SegmentedControl extends Component { } } -SegmentedControl.propTypes = { +SegmentedControl.PropTypes = { values: PropTypes.arrayOf(PropTypes.string).isRequired , tintColor: PropTypes.string , enabled: PropTypes.bool diff --git a/package.json b/package.json index da2b926..2bd0c7e 100644 --- a/package.json +++ b/package.json @@ -8,15 +8,21 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/natdm/segmentedControl.git" + "url": "git+https://github.com/ClearScholar/segmentedControl.git" }, "author": "", "license": "ISC", "bugs": { - "url": "https://github.com/natdm/segmentedControl/issues" + "url": "https://github.com/ClearScholar/segmentedControl/issues" }, - "homepage": "https://github.com/natdm/segmentedControl#readme", + "homepage": "https://github.com/ClearScholar/segmentedControl#readme", "devDependencies": { + "babel-eslint": "^6.0.4", + "eslint": "^2.9.0", + "eslint-plugin-react": "^5.1.1", + "jest-cli": "^11.0.0", + "react": "^0.14.8", + "react-native": "^0.25.1", "prop-types": "^15.6.2", }, } From c3c6ada1c9576146290cbe001cf0b0583ecc0f88 Mon Sep 17 00:00:00 2001 From: Federico Miralles Date: Tue, 24 Jul 2018 15:21:00 -0300 Subject: [PATCH 6/7] Eslint error fixed and dependencies updated --- package.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package.json b/package.json index 2bd0c7e..6ee5ece 100644 --- a/package.json +++ b/package.json @@ -17,12 +17,6 @@ }, "homepage": "https://github.com/ClearScholar/segmentedControl#readme", "devDependencies": { - "babel-eslint": "^6.0.4", - "eslint": "^2.9.0", - "eslint-plugin-react": "^5.1.1", - "jest-cli": "^11.0.0", - "react": "^0.14.8", - "react-native": "^0.25.1", "prop-types": "^15.6.2", - }, + } } From 4fd8eebd1bd02ddef2c4a3c4f9a68101f7f5f4df Mon Sep 17 00:00:00 2001 From: Federico Miralles Date: Tue, 24 Jul 2018 15:21:59 -0300 Subject: [PATCH 7/7] Eslint error fixed --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6ee5ece..a4739fc 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,6 @@ }, "homepage": "https://github.com/ClearScholar/segmentedControl#readme", "devDependencies": { - "prop-types": "^15.6.2", + "prop-types": "^15.6.2" } }