Some work on eventEmitter

android/app/src/main/java/com/reactnativenavigation/NavigationApplication.java

@@ -5,7 +5,9 @@ import android.os.Handler;
 import android.support.annotation.NonNull;
 
 import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.shell.MainReactPackage;
+import com.reactnativenavigation.bridge.NavigationReactEventEmitter;
 import com.reactnativenavigation.bridge.NavigationReactPackage;
 import com.reactnativenavigation.react.NavigationReactInstance;
 
@@ -16,6 +18,7 @@ public abstract class NavigationApplication extends Application {
 
     public static NavigationApplication instance;
     private NavigationReactInstance navigationReactInstance;
+    private NavigationReactEventEmitter reactEventEmitter;
     private Handler handler;
 
     @Override
@@ -27,6 +30,18 @@ public abstract class NavigationApplication extends Application {
         navigationReactInstance.startReactContextOnceInBackgroundAndExecuteJS();
     }
 
+    public NavigationReactEventEmitter getReactEventEmitter() {
+        if (reactEventEmitter == null) {
+            reactEventEmitter = new NavigationReactEventEmitter(getCurrentReactContext());
+        }
+
+        return reactEventEmitter;
+    }
+
+    private ReactContext getCurrentReactContext() {
+        return navigationReactInstance.getReactInstanceManager().getCurrentReactContext();
+    }
+
     public Handler getMainHandler() {
         return handler;
     }

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

@@ -1,5 +1,7 @@
 package com.reactnativenavigation.bridge;
 
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter;
 
@@ -8,15 +10,17 @@ public class NavigationReactEventEmitter {
     private static final String KEY_EVENT_ID = "id";
     private static final String KEY_EVENT_TYPE = "type";
     private static final String EVENT_TYPE = "NavBarButtonPress";
+    private RCTDeviceEventEmitter eventEmitter;
 
-    public void sendEvent(RCTDeviceEventEmitter eventEmitter, String eventName, String navigatorEventId, WritableMap params) {
-        if (eventEmitter == null) {
-            return;
-        }
+    public NavigationReactEventEmitter(ReactContext reactContext) {
+        this.eventEmitter = reactContext.getJSModule(RCTDeviceEventEmitter.class);
+    }
 
+    public void sendEvent(String eventId, String screenInstanceId) {
+        WritableMap params = Arguments.createMap();
         params.putString(KEY_EVENT_TYPE, EVENT_TYPE);
-        params.putString(KEY_EVENT_ID, eventName);
-//        params.putString(_Screen.KEY_NAVIGATOR_EVENT_ID, navigatorEventId);
-        eventEmitter.emit(navigatorEventId, params);
+        params.putString(KEY_EVENT_ID, eventId);
+        params.putString("navigatorEventID", screenInstanceId);
+        eventEmitter.emit(screenInstanceId, 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, this);
+        topBar.addTitleBarAndSetButtons(screenParams.buttons, screenParams.screenInstanceId);
         topBar.setTitle(screenParams.title);
     }
 

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

@@ -2,7 +2,6 @@ package com.reactnativenavigation.layouts;
 
 import android.content.Context;
 import android.support.design.widget.AppBarLayout;
-import android.view.MenuItem;
 
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.views.TitleBar;
@@ -18,10 +17,10 @@ public class TopBar extends AppBarLayout {
         setFitsSystemWindows(true);
     }
 
-    public void addTitleBarAndSetButtons(List<TitleBarButtonParams> buttons, MenuItem.OnMenuItemClickListener onTitleBarButtonClickListener) {
+    public void addTitleBarAndSetButtons(List<TitleBarButtonParams> buttons, String screenInstanceId) {
         titleBar = new TitleBar(getContext());
         addView(titleBar);
-        titleBar.setButtons(buttons, onTitleBarButtonClickListener);
+        titleBar.setButtons(buttons, screenInstanceId);
     }
 
     public void setTitleBarVisibility(boolean isHidden) {

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

@@ -17,7 +17,7 @@ public class TitleBarButtonParams {
         }
     }
 
-    // Todo: add id for click listener
+    public String eventId;
     public String label;
     public Drawable icon;
     public ScreenStyleParams.Color color;

android/app/src/main/java/com/reactnativenavigation/react/NavigationReactInstance.java

@@ -5,9 +5,7 @@ import android.content.Intent;
 import com.facebook.react.LifecycleState;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
-import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.controllers.NavigationActivity;
 
@@ -38,15 +36,6 @@ public class NavigationReactInstance {
         }
     }
 
-    public RCTDeviceEventEmitter getEventEmitter() {
-        ReactContext currentReactContext = reactInstanceManager.getCurrentReactContext();
-        if (currentReactContext == null) {
-            return null;
-        }
-
-        return currentReactContext.getJSModule(RCTDeviceEventEmitter.class);
-    }
-
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         reactInstanceManager.onActivityResult(requestCode, resultCode, data);
     }

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

@@ -3,7 +3,6 @@ package com.reactnativenavigation.views;
 import android.content.Context;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
-import android.view.MenuItem;
 
 import com.reactnativenavigation.animation.HideOnScrollAnimator;
 import com.reactnativenavigation.params.TitleBarButtonParams;
@@ -19,12 +18,12 @@ public class TitleBar extends Toolbar {
         super(context);
     }
 
-    public void setButtons(List<TitleBarButtonParams> buttons, MenuItem.OnMenuItemClickListener onTitleBarButtonClickListener) {
+    public void setButtons(List<TitleBarButtonParams> buttons, String screenInstanceId) {
         Menu menu = getMenu();
         menu.clear();
 
         for (int i = 0; i < buttons.size(); i++) {
-            final TitleBarButton button = new TitleBarButton(menu, this, buttons.get(i), onTitleBarButtonClickListener);
+            final TitleBarButton button = new TitleBarButton(menu, this, buttons.get(i), screenInstanceId);
             // 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

@@ -6,24 +6,25 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
 
+import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.utils.ImageUtils;
 import com.reactnativenavigation.utils.ViewUtils;
 
 import java.util.ArrayList;
 
-public class TitleBarButton {
+public class TitleBarButton implements MenuItem.OnMenuItemClickListener {
 
     private final Menu menu;
     private final View parent;
     private TitleBarButtonParams buttonParams;
-    private MenuItem.OnMenuItemClickListener onMenuItemClickListener;
+    private String screenInstanceId;
 
-    public TitleBarButton(Menu menu, View parent, TitleBarButtonParams buttonParams, MenuItem.OnMenuItemClickListener onMenuItemClickListener) {
+    public TitleBarButton(Menu menu, View parent, TitleBarButtonParams buttonParams, String screenInstanceId) {
         this.menu = menu;
         this.parent = parent;
         this.buttonParams = buttonParams;
-        this.onMenuItemClickListener = onMenuItemClickListener;
+        this.screenInstanceId = screenInstanceId;
     }
 
     public MenuItem addToMenu(int index) {
@@ -32,7 +33,7 @@ public class TitleBarButton {
         item.setEnabled(buttonParams.enabled);
         setIcon(item);
         setColor();
-        item.setOnMenuItemClickListener(onMenuItemClickListener);
+        item.setOnMenuItemClickListener(this);
         return item;
     }
 
@@ -89,4 +90,10 @@ public class TitleBarButton {
     private boolean hasColor() {
         return buttonParams.color.hasColor();
     }
+
+    @Override
+    public boolean onMenuItemClick(MenuItem item) {
+        NavigationApplication.instance.getReactEventEmitter().sendEvent(buttonParams.eventId, screenInstanceId);
+        return true;
+    }
 }