From 6f0e9494aad0da6555111c172ed22d2a1ffe94ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michae=CC=88l=20Fortin?= Date: Fri, 5 Jan 2018 13:11:19 -0500 Subject: [PATCH 1/3] Fix "next" and "done" button position on iOS --- AppIntro.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/AppIntro.js b/AppIntro.js index 52b42d9..4646794 100644 --- a/AppIntro.js +++ b/AppIntro.js @@ -75,7 +75,7 @@ const defaulStyles = { right: 0, flexDirection: 'row', flex: 1, - justifyContent: 'center', + justifyContent: 'space-between', alignItems: 'center', backgroundColor: 'transparent', }, @@ -212,10 +212,12 @@ export default class AppIntro extends Component { onSkipBtnClick={() => this.props.onSkipBtnClick(index)} /> : } - {this.props.showDots && RenderDots(index, total, { - ...this.props, - styles: this.styles - })} + + {this.props.showDots && RenderDots(index, total, { + ...this.props, + styles: this.styles + })} + {this.props.showDoneButton ? Date: Tue, 27 Feb 2018 13:27:31 -0500 Subject: [PATCH 2/3] Use prop-types package instead of React.PropTypes (removed in latest React) --- .vscode/settings.json | 3 ++ AppIntro.js | 3 +- Example/AppIntro.js | 3 +- package-lock.json | 119 ++++++++++++++++++++++++++++++++++++++++++ package.json | 1 + 5 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 package-lock.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..9792498 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "editor.formatOnSave": false +} \ No newline at end of file diff --git a/AppIntro.js b/AppIntro.js index 4646794..46e6301 100644 --- a/AppIntro.js +++ b/AppIntro.js @@ -1,5 +1,6 @@ import assign from 'assign-deep'; -import React, { Component, PropTypes } from 'react'; +import PropTypes from "prop-types"; +import React, { Component } from 'react'; import { StatusBar, StyleSheet, diff --git a/Example/AppIntro.js b/Example/AppIntro.js index 52b42d9..60fb376 100644 --- a/Example/AppIntro.js +++ b/Example/AppIntro.js @@ -1,5 +1,6 @@ import assign from 'assign-deep'; -import React, { Component, PropTypes } from 'react'; +import PropTypes from "prop-types"; +import React, { Component } from 'react'; import { StatusBar, StyleSheet, diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..d952c2d --- /dev/null +++ b/package-lock.json @@ -0,0 +1,119 @@ +{ + "name": "react-native-app-intro", + "version": "1.1.5", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" + }, + "core-js": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", + "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" + }, + "encoding": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", + "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", + "requires": { + "iconv-lite": "0.4.19" + } + }, + "fbjs": { + "version": "0.8.16", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz", + "integrity": "sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=", + "requires": { + "core-js": "1.2.7", + "isomorphic-fetch": "2.2.1", + "loose-envify": "1.3.1", + "object-assign": "4.1.1", + "promise": "7.3.1", + "setimmediate": "1.0.5", + "ua-parser-js": "0.7.17" + } + }, + "iconv-lite": { + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", + "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==" + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + }, + "isomorphic-fetch": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", + "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", + "requires": { + "node-fetch": "1.7.3", + "whatwg-fetch": "2.0.3" + } + }, + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" + }, + "loose-envify": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", + "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", + "requires": { + "js-tokens": "3.0.2" + } + }, + "node-fetch": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", + "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", + "requires": { + "encoding": "0.1.12", + "is-stream": "1.1.0" + } + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, + "promise": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "requires": { + "asap": "2.0.6" + } + }, + "prop-types": { + "version": "15.6.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz", + "integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==", + "requires": { + "fbjs": "0.8.16", + "loose-envify": "1.3.1", + "object-assign": "4.1.1" + } + }, + "setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" + }, + "ua-parser-js": { + "version": "0.7.17", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz", + "integrity": "sha512-uRdSdu1oA1rncCQL7sCj8vSyZkgtL7faaw9Tc9rZ3mGgraQ7+Pdx7w5mnOSF3gw9ZNG6oc+KXfkon3bKuROm0g==" + }, + "whatwg-fetch": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz", + "integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ=" + } + } +} diff --git a/package.json b/package.json index ed3fbd5..d38c988 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "homepage": "https://github.com/fuyaode/react-native-app-intro#readme", "dependencies": { "assign-deep": "^0.4.5", + "prop-types": "^15.6.1", "react-native-swiper": "git+https://github.com/FuYaoDe/react-native-swiper.git" } } From 29b57b53f0559937755ee01ceb74668d662c42be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michae=CC=88l=20Fortin?= Date: Tue, 27 Feb 2018 13:34:53 -0500 Subject: [PATCH 3/3] Use the latest react-native-swiper --- package-lock.json | 33 +++++++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index d952c2d..d3d974d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,21 @@ "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" }, + "assign-deep": { + "version": "0.4.7", + "resolved": "https://registry.npmjs.org/assign-deep/-/assign-deep-0.4.7.tgz", + "integrity": "sha512-tYlXoIH6RM2rclkx9uLXDKPKrDGsnxoWHE2J5+9tq2StAXeAAo8hLPZtOqwt22p8r6H5hnMgd8Oz8qPJl3W31g==", + "requires": { + "assign-symbols": "0.1.1", + "is-primitive": "2.0.0", + "kind-of": "5.1.0" + } + }, + "assign-symbols": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-0.1.1.tgz", + "integrity": "sha1-ywJZRO9OyKNpPwhunhEsdOOg/tk=" + }, "core-js": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", @@ -41,6 +56,11 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==" }, + "is-primitive": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", + "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=" + }, "is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", @@ -60,6 +80,11 @@ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" }, + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + }, "loose-envify": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", @@ -100,6 +125,14 @@ "object-assign": "4.1.1" } }, + "react-native-swiper": { + "version": "1.5.13", + "resolved": "https://registry.npmjs.org/react-native-swiper/-/react-native-swiper-1.5.13.tgz", + "integrity": "sha512-byBPx3qz3FvZhk4O8LR8am5SoO/pwm2Sj1OmFuXOOLYEj87+PzQaTr9u7+mgU76Ti2TP1OWnCPTXH6XUXYwxyw==", + "requires": { + "prop-types": "15.6.1" + } + }, "setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", diff --git a/package.json b/package.json index d38c988..93ae67c 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,6 @@ "dependencies": { "assign-deep": "^0.4.5", "prop-types": "^15.6.1", - "react-native-swiper": "git+https://github.com/FuYaoDe/react-native-swiper.git" + "react-native-swiper": "^1.5.13" } }