Keep Using navigatorEventId for now

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

@@ -16,11 +16,11 @@ public class NavigationReactEventEmitter {
         this.eventEmitter = reactContext.getJSModule(RCTDeviceEventEmitter.class);
     }
 
-    public void sendEvent(String eventId, String screenInstanceId) {
+    public void sendEvent(String eventId, String navigatorEventId) {
         WritableMap params = Arguments.createMap();
         params.putString(KEY_EVENT_TYPE, EVENT_TYPE);
         params.putString(KEY_EVENT_ID, eventId);
-        params.putString("navigatorEventID", screenInstanceId);
-        eventEmitter.emit(screenInstanceId, params);
+        params.putString("navigatorEventID", navigatorEventId);
+        eventEmitter.emit(navigatorEventId, params);
     }
 }

android/app/src/main/java/com/reactnativenavigation/layouts/ScreenLayout.java

@@ -40,7 +40,7 @@ public class ScreenLayout extends LinearLayout implements ScrollDirectionListene
     }
 
     private void addTitleBar() {
-        topBar.addTitleBarAndSetButtons(screenParams.buttons, screenParams.screenInstanceId);
+        topBar.addTitleBarAndSetButtons(screenParams.buttons, screenParams.navigatorEventId);
         topBar.setTitle(screenParams.title);
     }
 
@@ -50,7 +50,7 @@ public class ScreenLayout extends LinearLayout implements ScrollDirectionListene
     }
 
     private void addContentView() {
-        contentView = new ContentView(getContext(), screenParams.screenId, screenParams.passProps, this);
+        contentView = new ContentView(getContext(), screenParams, this);
         addView(contentView, new LayoutParams(MATCH_PARENT, MATCH_PARENT));
         contentView.init();
     }

android/app/src/main/java/com/reactnativenavigation/layouts/TopBar.java

@@ -17,10 +17,10 @@ public class TopBar extends AppBarLayout {
         setFitsSystemWindows(true);
     }
 
-    public void addTitleBarAndSetButtons(List<TitleBarButtonParams> buttons, String screenInstanceId) {
+    public void addTitleBarAndSetButtons(List<TitleBarButtonParams> buttons, String navigatorEventId) {
         titleBar = new TitleBar(getContext());
         addView(titleBar);
-        titleBar.setButtons(buttons, screenInstanceId);
+        titleBar.setButtons(buttons, navigatorEventId);
     }
 
     public void setTitleBarVisibility(boolean isHidden) {

android/app/src/main/java/com/reactnativenavigation/params/ScreenParams.java

@@ -8,9 +8,11 @@ public class ScreenParams {
     public String screenId;
     public String screenInstanceId;
     public Bundle passProps;
+    public String navigatorEventId;
     public List<TitleBarButtonParams> buttons;
     public String title;
     public ScreenStyleParams styleParams;
+    public Bundle navigationParams;
     //    public String tabLabel; TODO when tabs are supported move to TabParams
     //    public Drawable tabIcon;
 }

android/app/src/main/java/com/reactnativenavigation/params/parsers/ScreenParamsParser.java

@@ -8,7 +8,9 @@ public class ScreenParamsParser {
     private static final String KEY_TITLE = "title";
     private static final String KEY_SCREEN_ID = "screenId";
     private static final String KEY_SCREEN_INSTANCE_ID = "screenInstanceID";
+    private static final String KEY_NAVIGATOR_EVENT_ID = "navigatorEventID";
     private static final String KEY_PROPS = "passProps";
+    private static final String KEY_NAVIGATION_PARAMS = "navigationParams";
     private static final String KEY_BUTTONS = "titleBarButtons";
     private static final String STYLE_PARAMS = "styleParams";
 
@@ -17,6 +19,9 @@ public class ScreenParamsParser {
         result.screenId = params.getString(KEY_SCREEN_ID);
         result.screenInstanceId = params.getString(KEY_SCREEN_INSTANCE_ID);
         result.passProps = params.getBundle(KEY_PROPS);
+        result.navigationParams = params.getBundle(KEY_NAVIGATION_PARAMS);
+        assert result.navigationParams != null;
+        result.navigatorEventId = result.navigationParams.getString(KEY_NAVIGATOR_EVENT_ID);
         result.buttons = TitleBarButtonParamsParser.parse(params.getBundle(KEY_BUTTONS));
         result.title = params.getString(KEY_TITLE);
         result.styleParams = ScreenStyleParamsParser.parse(params.getBundle(STYLE_PARAMS));

android/app/src/main/java/com/reactnativenavigation/params/parsers/TitleBarButtonParamsParser.java

@@ -31,6 +31,7 @@ public class TitleBarButtonParamsParser extends Parser {
         result.color = new ScreenStyleParams.Color(ColorParser.parse(bundle.getString("color")));
         result.showAsAction = parseShowAsAction(bundle.getString("showAsAction"));
         result.enabled = bundle.getBoolean("enabled", true);
+        result.eventId = bundle.getString("id");
         return result;
     }
 

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

@@ -7,27 +7,37 @@ import android.view.ViewGroup;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
 import com.reactnativenavigation.NavigationApplication;
+import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.react.ReactViewHacks;
 
 public class ContentView extends ReactRootView {
 
     private final String screenId;
     private final Bundle passProps;
+    private Bundle navigationParams;
     private final ScrollDirectionListener.OnScrollChanged scrollListener;
 
-    public ContentView(Context context, String screenId, Bundle passProps, ScrollDirectionListener.OnScrollChanged scrollListener) {
+    public ContentView(Context context, ScreenParams screenParams, ScrollDirectionListener.OnScrollChanged scrollListener) {
         super(context);
-        this.screenId = screenId;
-        this.passProps = passProps;
+        this.screenId = screenParams.screenId;
+        this.passProps = screenParams.passProps;
+        this.navigationParams = screenParams.navigationParams;
         this.scrollListener = scrollListener;
     }
 
     public void init() {
         ReactInstanceManager react = NavigationApplication.instance.getNavigationReactInstance().getReactInstanceManager();
-        startReactApplication(react, screenId, passProps);
+        startReactApplication(react, screenId, mergePropsAndNavigationParams());
         new ScrollViewAttacher(this, scrollListener).attach();
     }
 
+    private Bundle mergePropsAndNavigationParams() {
+        if (passProps != null) {
+            navigationParams.putAll(passProps);
+        }
+        return navigationParams;
+    }
+
     public void removeFromParentWithoutUnmount() {
         // Hack in order to prevent the react view from getting unmounted
         ReactViewHacks.preventUnmountOnDetachedFromWindow(this);

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

@@ -18,12 +18,12 @@ public class TitleBar extends Toolbar {
         super(context);
     }
 
-    public void setButtons(List<TitleBarButtonParams> buttons, String screenInstanceId) {
+    public void setButtons(List<TitleBarButtonParams> buttons, String navigatorEventId) {
         Menu menu = getMenu();
         menu.clear();
 
         for (int i = 0; i < buttons.size(); i++) {
-            final TitleBarButton button = new TitleBarButton(menu, this, buttons.get(i), screenInstanceId);
+            final TitleBarButton button = new TitleBarButton(menu, this, buttons.get(i), navigatorEventId);
             // Add button in reverse order because in iOS index 0 starts at right
             final int index = buttons.size() - i - 1;
             button.addToMenu(index);

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

@@ -18,13 +18,13 @@ public class TitleBarButton implements MenuItem.OnMenuItemClickListener {
     private final Menu menu;
     private final View parent;
     private TitleBarButtonParams buttonParams;
-    private String screenInstanceId;
+    private String navigatorEventId;
 
-    public TitleBarButton(Menu menu, View parent, TitleBarButtonParams buttonParams, String screenInstanceId) {
+    public TitleBarButton(Menu menu, View parent, TitleBarButtonParams buttonParams, String navigatorEventId) {
         this.menu = menu;
         this.parent = parent;
         this.buttonParams = buttonParams;
-        this.screenInstanceId = screenInstanceId;
+        this.navigatorEventId = navigatorEventId;
     }
 
     public MenuItem addToMenu(int index) {
@@ -93,7 +93,7 @@ public class TitleBarButton implements MenuItem.OnMenuItemClickListener {
 
     @Override
     public boolean onMenuItemClick(MenuItem item) {
-        NavigationApplication.instance.getReactEventEmitter().sendEvent(buttonParams.eventId, screenInstanceId);
+        NavigationApplication.instance.getReactEventEmitter().sendEvent(buttonParams.eventId, navigatorEventId);
         return true;
     }
 }

src/Screen.js

@@ -11,10 +11,9 @@ import _ from 'lodash';
 const _allNavigatorEventHandlers = {};
 
 class Navigator {
-  constructor(navigatorID, navigatorEventID, screenInstanceId) {
+  constructor(navigatorID, navigatorEventID) {
     this.navigatorID = navigatorID;
     this.navigatorEventID = navigatorEventID;
-    this.screenInstanceId = screenInstanceId;
     this.navigatorEventHandler = null;
     this.navigatorEventSubscription = null;
   }
@@ -102,15 +101,9 @@ class Navigator {
   setOnNavigatorEvent(callback) {
     this.navigatorEventHandler = callback;
     if (!this.navigatorEventSubscription) {
-      if (Platform.OS === 'android') {
-        let Emitter = DeviceEventEmitter;
-        this.navigatorEventSubscription = Emitter.addListener(this.screenInstanceId, (event) => this.onNavigatorEvent(event));
-        _allNavigatorEventHandlers[this.screenInstanceId] = (event) => this.onNavigatorEvent(event);
-      } else {
-        let Emitter = NativeAppEventEmitter;
-        this.navigatorEventSubscription = Emitter.addListener(this.navigatorEventID, (event) => this.onNavigatorEvent(event));
-        _allNavigatorEventHandlers[this.navigatorEventID] = (event) => this.onNavigatorEvent(event);
-      }
+      let Emitter = Platform.OS === 'android' ? DeviceEventEmitter : NativeAppEventEmitter;
+      this.navigatorEventSubscription = Emitter.addListener(this.navigatorEventID, (event) => this.onNavigatorEvent(event));
+      _allNavigatorEventHandlers[this.navigatorEventID] = (event) => this.onNavigatorEvent(event);
     }
   }
 
@@ -145,15 +138,9 @@ export default class Screen extends Component {
 
   constructor(props) {
     super(props);
-    // TODO: remove this shit
-    if (!props.navigatorID) {
-      props.navigatorID = _.uniqueId('navigatorId');
+    if (props.navigatorID) {
+      this.navigator = new Navigator(props.navigatorID, props.navigatorEventID);
     }
-    // TODO: keep this shit?
-    if (!props.screenInstanceId) {
-      props.screenInstanceId = _.uniqueId('screenInstanceId');
-    }
-    this.navigator = new Navigator(props.navigatorID, props.navigatorEventID, props.screenInstanceId);
   }
 
   componentWillUnmount() {

src/platformSpecific.android.js

@@ -14,6 +14,7 @@ function startApp(params) {
   }
 
   params.screen = convertNavigationStyleToScreenStyle(screen);
+  params.screen = createNavigationParams(screen);
 
   NativeModules.NavigationReactModule.startApp(params);
 }
@@ -39,6 +40,16 @@ function convertNavigationStyleToScreenStyle(screen) {
   return screen;
 }
 
+function createNavigationParams(screen) {
+  screen.navigationParams = {
+    screenInstanceID: screen.screenInstanceID,
+    navigatorID: screen.navigatorID,
+    navigatorEventID: screen.navigatorEventID
+  };
+  screen = _.omit(screen, ['screenInstanceID', 'navigatorID', 'navigatorEventID']);
+  return screen;
+}
+
 module.exports = {
   startApp
 };