From 3f30efc0df3c5c57aafe4b3979d4dd576f452e10 Mon Sep 17 00:00:00 2001 From: Serhij Korochanskyj Date: Tue, 17 May 2016 21:23:24 +0300 Subject: [PATCH] Fix react-native imports to prevent warnings in RN 0.25 --- package.json | 3 ++- src/Navigation.js | 3 ++- src/Screen.js | 2 +- src/platformSpecific.android.js | 14 +++++--------- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index ad6f783f4cc..ca7d6fb68ca 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,8 @@ "author": "Tal Kol ", "license": "MIT", "peerDependencies": { - "react-native": ">=0.19.0" + "react-native": ">=0.19.0", + "react": ">=0.14.8" }, "dependencies": { "react-native-controllers": "^1.3.5" diff --git a/src/Navigation.js b/src/Navigation.js index aeafd1452b7..636b1974878 100644 --- a/src/Navigation.js +++ b/src/Navigation.js @@ -1,4 +1,5 @@ -import React, { AppRegistry } from 'react-native'; +import React from 'react'; +import { AppRegistry } from 'react-native'; import platformSpecific from './platformSpecific'; import Screen from './Screen'; diff --git a/src/Screen.js b/src/Screen.js index b1fb3f3840f..c799b656315 100644 --- a/src/Screen.js +++ b/src/Screen.js @@ -1,5 +1,5 @@ +import { Component } from 'react'; import { - Component, NativeAppEventEmitter, DeviceEventEmitter, Platform diff --git a/src/platformSpecific.android.js b/src/platformSpecific.android.js index 8f29f8e251e..55f6990bb4b 100644 --- a/src/platformSpecific.android.js +++ b/src/platformSpecific.android.js @@ -1,14 +1,10 @@ -import React, { - AppRegistry, - Component -} from 'react-native'; +import React, { Component } from 'react'; +import { AppRegistry } from 'react-native'; import Navigation from './Navigation'; import utils from './utils'; -import { - RctActivity -} from 'react-native-navigation'; +import { RctActivity } from 'react-native-navigation'; var resolveAssetSource = require('resolveAssetSource'); @@ -32,7 +28,7 @@ function startTabBasedApp(params) { } params.tabs.forEach(function (tab, idx) { - addNavigatorParams(tab, null, idx) + addNavigatorParams(tab, null, idx); addNavigatorButtons(tab); addNavigationStyleParams(tab); }); @@ -41,7 +37,7 @@ function startTabBasedApp(params) { } function navigatorPush(navigator, params) { - addNavigatorParams(params, navigator) + addNavigatorParams(params, navigator); addNavigatorButtons(params); addNavigationStyleParams(params); RctActivity.navigatorPush(params);