Merged with upstream

Author: auser

AppIntro.js

@@ -247,13 +247,13 @@ export default class AppIntro extends Component {
   }
 
   renderPagination = (index, total, context) => {
-    const { dotStyles, activeDotColor, dotColor, rightTextColor } = this.props;
+    const { activeDotColor, dotColor, rightTextColor, leftTextColor } = this.props;
     const ActiveDot = (
       <View
-        style={[this.styles.activeDotStyle, dotStyles, { backgroundColor: activeDotColor }]}
+        style={[this.styles.activeDotStyle, { backgroundColor: activeDotColor }]}
       />
     );
-    const Dot = <View style={[this.styles.dotStyle, dotStyles, { backgroundColor: dotColor }]} />;
+    const Dot = <View style={[this.styles.dotStyle, { backgroundColor: dotColor }]} />;
     let dots = [];
     for (let i = 0; i < total; i++) {
       dots.push(i === index ?
@@ -301,7 +301,7 @@ export default class AppIntro extends Component {
               style={this.styles.full}
               onPress={isSkipBtnShow ? () => this.props.onSkipBtnClick(index) : null}
             >
-              <Text style={[this.styles.controllText, { color: rightTextColor }]}>{this.props.skipBtnLabel}</Text>
+              <Text style={[this.styles.controllText, { color: leftTextColor }]}>{this.props.skipBtnLabel}</Text>
             </TouchableOpacity>
           </View>
           <View style={this.styles.dotContainer}>
@@ -359,13 +359,7 @@ export default class AppIntro extends Component {
     const root = children.props.children;
     let nodes = children;
     if (Array.isArray(root)) {
-      nodes = root.map((node, i) => {
-        let element = node;
-        if (node.type.displayName === 'View') {
-          element = this.renderChild(node, pageIndex, `${index}_${i}`);
-        }
-        return element;
-      });
+      nodes = root.map((node, i) => this.renderChild(node, pageIndex, `${index}_${i}`));
     }
     let animatedChild = children;
     if (level !== 0) {

Example/AppIntro.js

@@ -189,7 +189,7 @@ export default class AppIntro extends Component {
   }
 
   renderPagination = (index, total, context) => {
-    const { activeDotColor, dotColor, rightTextColor } = this.props;
+    const { activeDotColor, dotColor, rightTextColor, leftTextColor } = this.props;
     const ActiveDot = (
       <View
         style={[this.styles.activeDotStyle, { backgroundColor: activeDotColor }]}
@@ -237,7 +237,7 @@ export default class AppIntro extends Component {
               style={this.styles.full}
               onPress={isSkipBtnShow ? () => this.props.onSkipBtnClick(index) : null}
             >
-              <Text style={[this.styles.controllText, { color: rightTextColor }]}>{this.props.skipBtnLabel}</Text>
+              <Text style={[this.styles.controllText, { color: leftTextColor }]}>{this.props.skipBtnLabel}</Text>
             </TouchableOpacity>
           </Animated.View>
           <View style={this.styles.dotContainer}>
@@ -284,7 +284,7 @@ export default class AppIntro extends Component {
               style={this.styles.full}
               onPress={isSkipBtnShow ? () => this.props.onSkipBtnClick(index) : null}
             >
-              <Text style={[this.styles.controllText, { color: rightTextColor }]}>{this.props.skipBtnLabel}</Text>
+              <Text style={[this.styles.controllText, { color: leftTextColor }]}>{this.props.skipBtnLabel}</Text>
             </TouchableOpacity>
           </View>
           <View style={this.styles.dotContainer}>
@@ -342,13 +342,7 @@ export default class AppIntro extends Component {
     const root = children.props.children;
     let nodes = children;
     if (Array.isArray(root)) {
-      nodes = root.map((node, i) => {
-        let element = node;
-        if (node.type.displayName === 'View') {
-          element = this.renderChild(node, pageIndex, `${index}_${i}`);
-        }
-        return element;
-      });
+      nodes = root.map((node, i) => this.renderChild(node, pageIndex, `${index}_${i}`));
     }
     let animatedChild = children;
     if (level !== 0) {

Example/index.android.js

@@ -66,7 +66,7 @@ class Example extends Component {
   doneBtnHandle = () => {
     Alert.alert('Done');
   }
-  nextBtnHendle = (index) => {
+  nextBtnHandle = (index) => {
     Alert.alert('Next');
     console.log(index);
   }
@@ -77,7 +77,7 @@ class Example extends Component {
   render() {
     return (
       <AppIntro
-        onNextBtnClick={this.nextBtnHendle}
+        onNextBtnClick={this.nextBtnHandle}
         onDoneBtnClick={this.doneBtnHandle}
         onSkipBtnClick={this.onSkipBtnHandle}
         onSlideChange={this.onSlideChangeHandle}

Example/index.ios.js

@@ -6,8 +6,8 @@
 
 import React, { Component } from 'react';
 import { AppRegistry, StyleSheet, Text, View, Alert, Image } from 'react-native';
-import AppIntro from 'react-native-app-intro';
-// import AppIntro from './AppIntro';
+// import AppIntro from 'react-native-app-intro';
+import AppIntro from './AppIntro';
 
 const styles = StyleSheet.create({
   slide: {
@@ -57,7 +57,7 @@ class Example extends Component {
   doneBtnHandle = () => {
     Alert.alert('Done');
   }
-  nextBtnHendle = (index) => {
+  nextBtnHandle = (index) => {
     Alert.alert('Next');
     console.log(index);
   }
@@ -68,7 +68,7 @@ class Example extends Component {
   render() {
     return (
       <AppIntro
-        onNextBtnClick={this.nextBtnHendle}
+        onNextBtnClick={this.nextBtnHandle}
         onDoneBtnClick={this.doneBtnHandle}
         onSkipBtnClick={this.onSkipBtnHandle}
         onSlideChange={this.onSlideChangeHandle}

README.md

@@ -36,7 +36,7 @@ class Example extends Component {
   doneBtnHandle = () => {
     Alert.alert('Done');
   }
-  nextBtnHendle = (index) => {
+  nextBtnHandle = (index) => {
     Alert.alert('Next');
     console.log(index);
   }
@@ -69,7 +69,7 @@ class Example extends Component {
     }];
     return (
       <AppIntro
-        onNextBtnClick={this.nextBtnHendle}
+        onNextBtnClick={this.nextBtnHandle}
         onDoneBtnClick={this.doneBtnHandle}
         onSkipBtnClick={this.onSkipBtnHandle}
         onSlideChange={this.onSlideChangeHandle}