Changes to event emitter

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

@@ -5,6 +5,8 @@ import android.os.Handler;
 import android.support.annotation.NonNull;
 
 import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.shell.MainReactPackage;
 import com.reactnativenavigation.bridge.NavigationReactPackage;
 import com.reactnativenavigation.react.NavigationReactInstance;
@@ -66,15 +68,27 @@ public abstract class NavigationApplication extends Application {
         return "index.android.bundle";
     }
 
+    public ReactContext getReactContext() {
+        return navigationReactInstance.getReactInstanceManager().getCurrentReactContext();
+    }
+
     public abstract boolean isDebug();
 
     @NonNull
     public abstract List<ReactPackage> createAdditionalReactPackages();
 
+    public void sendNavigatorEvent(String eventId, String navigatorEventId) {
+        navigationReactInstance.getReactEventEmitter().sendNavigatorEvent(eventId, navigatorEventId);
+    }
+
     public void sendEvent(String eventId, String navigatorEventId) {
         navigationReactInstance.getReactEventEmitter().sendEvent(eventId, navigatorEventId);
     }
 
+    public void sendNavigatorEvent(String eventId, WritableMap arguments) {
+        navigationReactInstance.getReactEventEmitter().sendEvent(eventId, arguments);
+    }
+
     public void startReactContext() {
         navigationReactInstance = new NavigationReactInstance();
         navigationReactInstance.startReactContextOnceInBackgroundAndExecuteJS();

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

@@ -17,11 +17,19 @@ public class NavigationReactEventEmitter {
         this.eventEmitter = reactContext.getJSModule(RCTDeviceEventEmitter.class);
     }
 
-    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(KEY_NAVIGATOR_EVENT_ID, navigatorEventId);
-        eventEmitter.emit(navigatorEventId, params);
+    public void sendNavigatorEvent(String eventId, String navigatorEventId) {
+        WritableMap data = Arguments.createMap();
+        data.putString(KEY_EVENT_TYPE, EVENT_TYPE);
+        data.putString(KEY_EVENT_ID, eventId);
+        data.putString(KEY_NAVIGATOR_EVENT_ID, navigatorEventId);
+        eventEmitter.emit(navigatorEventId, data);
+    }
+
+    public void sendEvent(String eventId, String data) {
+        eventEmitter.emit(eventId, data);
+    }
+
+    public void sendEvent(String eventId, WritableMap data) {
+        eventEmitter.emit(eventId, data);
     }
 }

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

@@ -63,6 +63,6 @@ public class LeftButton extends MaterialMenuDrawable implements View.OnClickList
     }
 
     private void sendClickEvent() {
-        NavigationApplication.instance.sendEvent(params.eventId, navigatorEventId);
+        NavigationApplication.instance.sendNavigatorEvent(params.eventId, navigatorEventId);
     }
 }

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

@@ -92,7 +92,7 @@ public class TitleBarButton implements MenuItem.OnMenuItemClickListener {
 
     @Override
     public boolean onMenuItemClick(MenuItem item) {
-        NavigationApplication.instance.sendEvent(buttonParams.eventId, navigatorEventId);
+        NavigationApplication.instance.sendNavigatorEvent(buttonParams.eventId, navigatorEventId);
         return true;
     }
 }