Browse Source

Add missing files

Guy Carmeli 8 years ago
parent
commit
fa3d50d94f

+ 3
- 3
android/app/src/main/java/com/reactnativenavigation/activities/BaseReactActivity.java View File

@@ -184,7 +184,7 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
184 184
         ContextProvider.setActivityContext(this);
185 185
 
186 186
         if (mReactInstanceManager != null) {
187
-            mReactInstanceManager.onResume(this, this);
187
+            mReactInstanceManager.onHostResume(this, this);
188 188
         }
189 189
     }
190 190
 
@@ -193,7 +193,7 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
193 193
         super.onPause();
194 194
 
195 195
         if (mReactInstanceManager != null) {
196
-            mReactInstanceManager.onPause();
196
+            mReactInstanceManager.onHostPause();
197 197
         }
198 198
 
199 199
         ContextProvider.clearActivityContext();
@@ -207,7 +207,7 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
207 207
         BaseReactActivity activity = ContextProvider.getActivityContext();
208 208
         if (mReactInstanceManager != null && (activity == null || activity.isFinishing())) {
209 209
             Log.i(TAG, "Destroying ReactInstanceManager");
210
-            mReactInstanceManager.onDestroy();
210
+            mReactInstanceManager.onHostDestroy();
211 211
         } else {
212 212
             Log.d(TAG, "Not destroying ReactInstanceManager");
213 213
         }

+ 4
- 4
src/platformSpecific.android.js View File

@@ -10,7 +10,7 @@ import {
10 10
   RctActivity
11 11
 } from 'react-native-navigation';
12 12
 
13
-var resolveAssetSource = require('resolveAssetSource');
13
+const resolveAssetSource = require('react-native/Libraries/Image/resolveAssetSource');
14 14
 
15 15
 function startSingleScreenApp(params) {
16 16
   let screen = params.screen;
@@ -31,8 +31,8 @@ function startTabBasedApp(params) {
31 31
     return;
32 32
   }
33 33
 
34
-  params.tabs.forEach(function (tab, idx) {
35
-    addNavigatorParams(tab, null, idx)
34
+  params.tabs.forEach(function(tab, idx) {
35
+    addNavigatorParams(tab, null, idx);
36 36
     addNavigatorButtons(tab);
37 37
     addNavigationStyleParams(tab);
38 38
   });
@@ -41,7 +41,7 @@ function startTabBasedApp(params) {
41 41
 }
42 42
 
43 43
 function navigatorPush(navigator, params) {
44
-  addNavigatorParams(params, navigator)
44
+  addNavigatorParams(params, navigator);
45 45
   addNavigatorButtons(params);
46 46
   addNavigationStyleParams(params);
47 47
   RctActivity.navigatorPush(params);