Merge pull request taskrabbit#31 from taskrabbit/upgrade

Upgrade to react-native 0.33.0

Author: bleonard

App/Components/SpinnerLoader.js

@@ -5,12 +5,11 @@ import {
   PixelRatio,
   View,
   PropTypes,
+  ActivityIndicator,
 } from 'react-native';
 
 import cssVar from '../Lib/cssVar';
 
-import ActivityIndicator from '../Platform/ActivityIndicator';
-
 const SpinnerLoader = React.createClass({
   propTypes: {
     spinning: React.PropTypes.bool,

App/Mixins/KeyboardListener.js

@@ -1,6 +1,9 @@
 import React from 'react';
-import KeyboardEvents from 'react-native-keyboardevents';
-var KeyboardEventEmitter = KeyboardEvents.Emitter;
+
+import {
+  Keyboard,
+} from 'react-native';
+
 
 var KeyboardListener = {
   getInitialState: function() {
@@ -13,9 +16,13 @@ var KeyboardListener = {
     return this.state.keyboardSpace > 0;
   },
 
-  updateKeyboardSpace: function(frames) {
-    if (this.isMounted() && frames && frames.end) {
-      this.setState({keyboardSpace: frames.end.height});
+  isKeyboardVisible: function() {
+    return this.state.keyboardSpace > 0;
+  },
+
+  updateKeyboardSpace: function(e) {
+    if (this.isMounted() && e && e.endCoordinates) {
+      this.setState({keyboardSpace: e.endCoordinates.height});
     }
   },
 
@@ -25,15 +32,32 @@ var KeyboardListener = {
     }
   },
 
+  // onKeyboardHideCallback: function() {
+  //   // TODO handle case when the keyboard never showed up in the first place
+  //   // Might want to use state to check that it did showed up
+  //   if (this.params.onKeyboardHide) {
+  //     this.params.onKeyboardHide.call(this.originalComponent());
+  //   }
+  // },
+
+
   componentDidMount: function() {
-    KeyboardEventEmitter.on(KeyboardEvents.KeyboardDidShowEvent, this.updateKeyboardSpace);
-    KeyboardEventEmitter.on(KeyboardEvents.KeyboardWillHideEvent, this.resetKeyboardSpace);
+    this._keyboardSubscriptions = [];
+    this._keyboardSubscriptions.push(Keyboard.addListener('keyboardWillShow', this.updateKeyboardSpace));
+    this._keyboardSubscriptions.push(Keyboard.addListener('keyboardDidShow', this.updateKeyboardSpace));
+    this._keyboardSubscriptions.push(Keyboard.addListener('keyboardWillHide', this.resetKeyboardSpace));
+    this._keyboardSubscriptions.push(Keyboard.addListener('keyboardDidHide', this.resetKeyboardSpace));
+    //if (this.params.onKeyboardHide) {
+    //  this._keyboardSubscriptions.push(Keyboard.addListener('keyboardDidHide', this.onKeyboardHideCallback));
+    //}
   },
 
   componentWillUnmount: function() {
-    KeyboardEventEmitter.off(KeyboardEvents.KeyboardDidShowEvent, this.updateKeyboardSpace);
-    KeyboardEventEmitter.off(KeyboardEvents.KeyboardWillHideEvent, this.resetKeyboardSpace);
+    this._keyboardSubscriptions.forEach((subscription) => {
+      subscription.remove();
+    });
   },
+
 };
 
 export default KeyboardListener;

App/Platform/ActivityIndicator.js

@@ -66,11 +66,17 @@ var SingletonStore = assign({}, EventEmitter.prototype, {
 Dispatcher.register(function(action) {
   switch(action.actionType) {
     case AppConstants.APP_LAUNCHED:
-      Keychain.getGenericPassword(KEYCHAIN_SERVICE, function(keychainError, username, token) {
-        LocalKeyStore.getKey(LOCAL_STORE_KEY, function(storeError, props) {
-          initSingleton(props, token, username);
+      Keychain.getGenericPassword(KEYCHAIN_SERVICE).then((values) => {
+        const { username, password } = values || {};
+        // password is the stored token.
+        LocalKeyStore.getKey(LOCAL_STORE_KEY, (storeError, props) => {
+          initSingleton(props, password, username);
           SingletonStore.emitChange();
         });
+      }).catch((error) => {
+        console.log(error);
+        initSingleton({}, null, null);
+        SingletonStore.emitChange();
       });
       break;
     case AppConstants.LOGIN_USER:

App/Stores/CurrentUserStore.js

@@ -7,7 +7,7 @@ import React, {
 import {
   View,
   Text,
-  ActivityIndicatorIOS,
+  ActivityIndicator,
   StyleSheet,
 } from 'react-native';
 
@@ -19,7 +19,7 @@ var RefreshingIndicator = React.createClass({
   },
   getDefaultProps() {
     return {
-      activityIndicatorComponent: ActivityIndicatorIOS,
+      activityIndicatorComponent: ActivityIndicator,
     }
   },
   renderActivityIndicator(style) {