await startApp

Resolve promise when startTabBasedApp and startSingleScreenApp complete.

android/app/src/main/java/com/reactnativenavigation/bridge/NavigationReactModule.java

@@ -1,5 +1,7 @@
 package com.reactnativenavigation.bridge;
 
+import android.support.annotation.Nullable;
+
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -52,8 +54,8 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void startApp(final ReadableMap params) {
-        NavigationCommandsHandler.startApp(BundleConverter.toBundle(params));
+    public void startApp(final ReadableMap params, final @Nullable Promise promise) {
+        NavigationCommandsHandler.startApp(BundleConverter.toBundle(params), promise);
     }
 
     @ReactMethod

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java

@@ -54,6 +54,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
      * Along with that, we should handle commands from the bridge using onNewIntent
      */
     static NavigationActivity currentActivity;
+    private static Promise startAppPromise;
 
     private ActivityParams activityParams;
     private ModalController modalController;
@@ -123,12 +124,20 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         currentActivity = this;
         IntentDataHandler.onResume(getIntent());
         getReactGateway().onResumeActivity(this, this);
+        resolveStartAppPromiseOnActivityResumed();
         NavigationApplication.instance.getActivityCallbacks().onActivityResumed(this);
         EventBus.instance.register(this);
         IntentDataHandler.onPostResume(getIntent());
         NavigationApplication.instance.getEventEmitter().sendActivityResumed(getCurrentlyVisibleEventId());
     }
 
+    private void resolveStartAppPromiseOnActivityResumed() {
+        if (startAppPromise != null) {
+            startAppPromise.resolve(true);
+            startAppPromise = null;
+        }
+    }
+
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
@@ -149,9 +158,16 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     @Override
     protected void onStop() {
         super.onStop();
+        clearStartAppPromise();
         NavigationApplication.instance.getActivityCallbacks().onActivityStopped(this);
     }
 
+    private void clearStartAppPromise() {
+        if (startAppPromise != null) {
+            startAppPromise = null;
+        }
+    }
+
     @Override
     protected void onDestroy() {
         destroyLayouts();
@@ -464,4 +480,8 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     public String getCurrentlyVisibleEventId() {
         return modalController.isShowing() ? modalController.getCurrentlyVisibleEventId() : layout.getCurrentScreen().getNavigatorEventId();
     }
+
+    public static void setStartAppPromise(Promise promise) {
+        NavigationActivity.startAppPromise = promise;
+    }
 }

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationCommandsHandler.java

@@ -32,18 +32,13 @@ public class NavigationCommandsHandler {
         return ActivityParamsParser.parse(intent.getBundleExtra(NavigationCommandsHandler.ACTIVITY_PARAMS_BUNDLE));
     }
 
-    /**
-     * start a new activity with CLEAR_TASK | NEW_TASK
-     *
-     * @param params ActivityParams as bundle
-     */
-
-    public static void startApp(Bundle params) {
+    public static void startApp(Bundle params, Promise promise) {
         Intent intent = new Intent(NavigationApplication.instance, NavigationActivity.class);
         IntentDataHandler.onStartApp(intent);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.putExtra(ACTIVITY_PARAMS_BUNDLE, params);
         intent.putExtra("animationType", params.getString("animationType"));
+        NavigationActivity.setStartAppPromise(promise);
         NavigationApplication.instance.startActivity(intent);
     }
 

src/Navigation.js

@@ -131,12 +131,12 @@ function dismissInAppNotification(params = {}) {
   return platformSpecific.dismissInAppNotification(params);
 }
 
-function startTabBasedApp(params) {
-  return platformSpecific.startTabBasedApp(params);
+async function startTabBasedApp(params) {
+  return await platformSpecific.startTabBasedApp(params);
 }
 
-function startSingleScreenApp(params) {
-  return platformSpecific.startSingleScreenApp(params);
+async function startSingleScreenApp(params) {
+  return await platformSpecific.startSingleScreenApp(params);
 }
 
 function setEventHandler(navigatorEventID, eventHandler) {

src/deprecated/platformSpecificDeprecated.android.js

@@ -10,7 +10,7 @@ const resolveAssetSource = require('react-native/Libraries/Image/resolveAssetSou
 
 import * as newPlatformSpecific from './../platformSpecific';
 
-function startSingleScreenApp(params) {
+async function startSingleScreenApp(params) {
   const screen = params.screen;
   if (!screen.screen) {
     console.error('startSingleScreenApp(params): screen must include a screen property');
@@ -36,7 +36,7 @@ function startSingleScreenApp(params) {
   params.overrideBackPress = screen.overrideBackPress;
   params.animateShow = convertAnimationType(params.animationType);
 
-  newPlatformSpecific.startApp(params);
+  return await newPlatformSpecific.startApp(params);
 }
 
 function getOrientation(params) {
@@ -279,7 +279,7 @@ function adaptNavigationParams(screen) {
   return screen;
 }
 
-function startTabBasedApp(params) {
+async function startTabBasedApp(params) {
   if (!params.tabs) {
     console.error('startTabBasedApp(params): params.tabs is required');
     return;
@@ -317,7 +317,7 @@ function startTabBasedApp(params) {
   params.sideMenu = convertDrawerParamsToSideMenuParams(params.drawer);
   params.animateShow = convertAnimationType(params.animationType);
 
-  newPlatformSpecific.startApp(params);
+  return await newPlatformSpecific.startApp(params);
 }
 
 function addTabIcon(tab) {

src/platformSpecific.android.js

@@ -5,9 +5,9 @@ import PropRegistry from './PropRegistry';
 
 const NativeReactModule = NativeModules.NavigationReactModule;
 
-function startApp(activityParams) {
+async function startApp(activityParams) {
   savePassProps(activityParams);
-  NativeReactModule.startApp(activityParams);
+  return await NativeReactModule.startApp(activityParams);
 }
 
 function push(screenParams) {