add actual navigatorID to screens

android/app/src/main/java/com/reactnativenavigation/core/objects/Screen.java

@@ -16,7 +16,6 @@ public class Screen extends JsonObject implements Serializable {
     private static final String KEY_TITLE = "title";
     private static final String KEY_SCREEN = "screen";
     public static final String KEY_SCREEN_INSTANCE_ID = "screenInstanceID";
-    public static final String KEY_STACK_ID = "stackID";
     public static final String KEY_NAVIGATOR_ID = "navigatorID";
     public static final String KEY_NAVIGATOR_EVENT_ID = "navigatorEventID";
     private static final String KEY_ICON = "icon";
@@ -25,7 +24,6 @@ public class Screen extends JsonObject implements Serializable {
     public String title;
     public String screenId;
     public String screenInstanceId;
-    public String stackId;
     public String navigatorId;
     public String navigatorEventId;
     public int icon;
@@ -35,7 +33,6 @@ public class Screen extends JsonObject implements Serializable {
         title = getString(screen, KEY_TITLE);
         screenId = getString(screen, KEY_SCREEN);
         screenInstanceId = getString(screen, KEY_SCREEN_INSTANCE_ID);
-        stackId = getString(screen, KEY_STACK_ID);
         navigatorId = getString(screen, KEY_NAVIGATOR_ID);
         navigatorEventId = getString(screen, KEY_NAVIGATOR_EVENT_ID);
         icon = getInt(screen, KEY_ICON);

android/app/src/main/java/com/reactnativenavigation/views/RctView.java

@@ -23,7 +23,6 @@ public class RctView extends FrameLayout {
         String componentName = screen.screenId;
         Bundle passProps = new Bundle();
         passProps.putString(Screen.KEY_SCREEN_INSTANCE_ID, screen.screenInstanceId);
-        passProps.putString(Screen.KEY_STACK_ID, screen.stackId);
         passProps.putString(Screen.KEY_NAVIGATOR_ID, screen.navigatorId);
         passProps.putString(Screen.KEY_NAVIGATOR_EVENT_ID, screen.navigatorEventId);
 

src/platformSpecific.android.js

@@ -14,7 +14,6 @@ function startSingleScreenApp(params) {
     return;
   }
 
-  console.log(RctActivity);
   addNavigatorParams(screen);
   addNavigatorButtons(screen);
   RctActivity.startSingleScreenApp(screen);
@@ -27,7 +26,7 @@ function startTabBasedApp(params) {
   }
 
   params.tabs.forEach(function (tab, idx) {
-    addNavigatorParams(tab, idx)
+    addNavigatorParams(tab, null, idx)
     addNavigatorButtons(tab);
   });
 
@@ -35,16 +34,15 @@ function startTabBasedApp(params) {
 }
 
 function navigatorPush(navigator, params) {
-  addNavigatorParams(params)
+  addNavigatorParams(params, navigator)
   addNavigatorButtons(params);
   RctActivity.navigatorPush(params);
 }
 
-function addNavigatorParams(screen, idx = '') {
-  screen.stackID = utils.getRandomId();
-  screen.navigatorID = utils.getRandomId() + '_nav' + idx;
+function addNavigatorParams(screen, navigator = null, idx = '') {
+  screen.navigatorID = navigator ? navigator.navigatorID : utils.getRandomId() + '_nav' + idx;
   screen.screenInstanceID = utils.getRandomId();
-  screen.navigatorEventID = screen.screenInstanceID + '_events';
+  screen.navigatorEventID = navigator ? navigator.navigatorEventID : screen.screenInstanceID + '_events';
 }
 
 function addNavigatorButtons(screen) {