Merge pull request #42 from APSL/designblooz-remove-deprecation

remove ProgressBarAndroid since it is deprecated and use ActivityIndi…

Author: alvaromb

Button.js

@@ -10,8 +10,7 @@ const {
   TouchableOpacity,
   Text,
   StyleSheet,
-  ActivityIndicatorIOS,
-  ProgressBarAndroid,
+  ActivityIndicator,
   TouchableNativeFeedback,
   Platform
 } = require('react-native');
@@ -42,29 +41,17 @@ const Button = React.createClass({
     isAndroid: (Platform.OS === 'android'),
   },
 
-  _renderInnerTextAndroid: function () {
-    if (this.props.isLoading) {
-      return (
-        <ProgressBarAndroid
-          style={[{
-            height: 20,
-          }, styles.spinner]}
-          styleAttr='Inverse'
-          color={this.props.activityIndicatorColor || 'black'}
-        />
-      );
+  shouldComponentUpdate: function (nextProps, nextState) {
+    if (!isEqual(nextProps, this.props)) {
+      return true;
     }
-    return (
-      <Text style={[styles.textButton, this.props.textStyle]}>
-        {this.props.children}
-      </Text>
-    );
+    return false;
   },
 
-  _renderInnerTextiOS: function () {
+  _renderInnerText: function () {
     if (this.props.isLoading) {
       return (
-        <ActivityIndicatorIOS
+        <ActivityIndicator
           animating={true}
           size='small'
           style={styles.spinner}
@@ -79,20 +66,6 @@ const Button = React.createClass({
     );
   },
 
-  shouldComponentUpdate: function (nextProps, nextState) {
-    if (!isEqual(nextProps, this.props)) {
-      return true;
-    }
-    return false;
-  },
-
-  _renderInnerText: function () {
-    if (Button.isAndroid) {
-      return this._renderInnerTextAndroid()
-    }
-    return this._renderInnerTextiOS()
-  },
-
   render: function () {
     if (this.props.isDisabled === true || this.props.isLoading === true) {
       return (
@@ -119,15 +92,15 @@ const Button = React.createClass({
         return (
           <TouchableNativeFeedback {...touchableProps}>
             <Text style={[styles.button, this.props.style]}>
-              {this._renderInnerTextAndroid()}
+              {this._renderInnerText()}
             </Text>
           </TouchableNativeFeedback>
         )
       } else {
         return (
           <TouchableOpacity {...touchableProps}
             style={[styles.button, this.props.style]}>
-            {this._renderInnerTextiOS()}
+            {this._renderInnerText()}
           </TouchableOpacity>
         );
       }

README.md

@@ -10,7 +10,7 @@ A React Native button component customizable via ``style`` props.
 Renders a ``TouchableOpacity`` under iOS and a ``TouchableNativeFeedback`` under Android.
 
 ## Install
-
+`apsl-react-native-button>=2.6.0` needs React Native 0.28 or higher.
 `apsl-react-native-button>=2.5.0` needs React Native 0.25 or higher.
 `apsl-react-native-button<=2.4.2` needs React Native 0.16 or higher.