Merge branch 'master' of github.com:infinitered/react_native_base

Author: GantMan

ignite-base/App/Root.js

@@ -6,7 +6,7 @@ import Actions from './Actions/Creators'
 import Drawer from 'react-native-drawer'
 import DebugSettings from './Config/DebugSettings'
 import DrawerContent from './Components/DrawerContent'
-import './Config/PushConfig'
+// import './Config/PushConfig'
 
 // Styles
 import styles, {drawerStyles} from './Containers/Styles/RootStyle'

ignite-base/ios/RNBase/AppDelegate.m

@@ -10,7 +10,7 @@
 #import "AppDelegate.h"
 
 #import "RCTRootView.h"
-#import "RCTPushNotificationManager.h"
+// #import "RCTPushNotificationManager.h"
 
 @implementation AppDelegate
 
@@ -59,29 +59,29 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   return YES;
 }
 
-// Required to register for notifications
-- (void)application:(UIApplication *)application didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings
-{
-  [RCTPushNotificationManager didRegisterUserNotificationSettings:notificationSettings];
-}
-
-// Required for the register event.
-- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
-{
-  [RCTPushNotificationManager didRegisterForRemoteNotificationsWithDeviceToken:deviceToken];
-}
-
-// Required for the notification event.
-- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)notification
-{
-  [RCTPushNotificationManager didReceiveRemoteNotification:notification];
-}
-
-// Required for the localNotification event.
-- (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification
-{
-  [RCTPushNotificationManager didReceiveLocalNotification:notification];
-}
+// // Required to register for notifications
+// - (void)application:(UIApplication *)application didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings
+// {
+//   [RCTPushNotificationManager didRegisterUserNotificationSettings:notificationSettings];
+// }
+
+// // Required for the register event.
+// - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
+// {
+//   [RCTPushNotificationManager didRegisterForRemoteNotificationsWithDeviceToken:deviceToken];
+// }
+
+// // Required for the notification event.
+// - (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)notification
+// {
+//   [RCTPushNotificationManager didReceiveRemoteNotification:notification];
+// }
+
+// // Required for the localNotification event.
+// - (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification
+// {
+//   [RCTPushNotificationManager didReceiveLocalNotification:notification];
+// }
 
 
 @end

ignite-base/package.json

@@ -24,12 +24,11 @@
     "querystringify": "0.0.3",
     "ramda": "^0.21.0",
     "react": "^15.1.0",
-    "react-native": "^0.27.2",
+    "react-native": "^0.28.0",
     "react-native-animatable": "^0.6.0",
     "react-native-device-info": "^0.9.3",
     "react-native-drawer": "^2.2.4",
     "react-native-i18n": "0.0.8",
-    "react-native-push-notification": "^1.0.7",
     "react-native-vector-icons": "^2.0.2",
     "react-redux": "^4.4.2",
     "redux": "^3.4.0",

ignite-base/package.json.template

@@ -24,12 +24,11 @@
     "querystringify": "0.0.3",
     "ramda": "^0.21.0",
     "react": "^15.1.0",
-    "react-native": "^0.27.2",
+    "react-native": "^0.28.0",
     "react-native-animatable": "^0.6.0",
     "react-native-device-info": "^0.9.3",
     "react-native-drawer": "^2.2.4",
     "react-native-i18n": "0.0.8",
-    "react-native-push-notification": "^1.0.7",
     "react-native-vector-icons": "^2.0.2",
     "react-redux": "^4.4.2",
     "redux": "^3.4.0",

ignite-generator/src/app/index.es

@@ -374,8 +374,11 @@ export class AppGenerator extends Generators.Base {
             this.spinner.stop()
             this.log(`${check} ${rnpmStatus}`)
 
-            // then update the android manifest
-            this._updateAndroidManifest()
+            // Push notifications code, disabled for now
+            // Causing issues :(
+            // update the android manifest
+            // this._updateAndroidManifest()
+
             // then update Plist
             this._updatePList()
             done()