Fix appLaunched and button press events on Android

Both events broke in 104e3f97

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationEvent.java

@@ -1,7 +1,5 @@
 package com.reactnativenavigation.react;
 
-import android.support.annotation.NonNull;
-
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableMap;
@@ -10,10 +8,11 @@ import com.facebook.react.modules.core.DeviceEventManagerModule;
 import static com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter;
 
 public class NavigationEvent {
-	private static final String onAppLaunched = "RNN.onAppLaunched";
+	private static final String onAppLaunched = "RNN.appLaunched";
 	private static final String componentDidAppear = "RNN.componentDidAppear";
 	private static final String componentDidDisappear = "RNN.componentDidDisappear";
-	private static final String onNavigationButtonPressed = "RNN.onNavigationButtonPressed";
+	private static final String nativeEvent = "RNN.nativeEvent";
+    private static final String buttonPressedEvent = "buttonPressed";
 
 	private final RCTDeviceEventEmitter emitter;
 
@@ -37,16 +36,19 @@ public class NavigationEvent {
 		WritableMap map = Arguments.createMap();
 		map.putString("componentId", id);
 		map.putString("componentName", componentName);
-
 		emit(componentDidAppear, map);
 	}
 
     public void sendOnNavigationButtonPressed(String id, String buttonId) {
-		WritableMap map = Arguments.createMap();
-		map.putString("componentId", id);
-		map.putString("buttonId", buttonId);
+		WritableMap params = Arguments.createMap();
+		params.putString("componentId", id);
+		params.putString("buttonId", buttonId);
+
+        WritableMap map = Arguments.createMap();
+        map.putString("name", buttonPressedEvent);
+        map.putMap("params", params);
 
-		emit(onNavigationButtonPressed, map);
+		emit(nativeEvent, map);
 	}
 
 	private void emit(String eventName) {

playground/src/app.js

@@ -22,7 +22,7 @@ if (Platform.OS === 'android') {
 
 function start() {
   registerScreens();
-  Navigation.events().onAppLaunched(() => {
+  Navigation.events().registerAppLaunchedListener(() => {
     Navigation.setDefaultOptions({
       _animations: {
         startApp: {

playground/src/screens/StaticLifecycleOverlay.js

@@ -10,17 +10,17 @@ class StaticLifecycleOverlay extends Component {
       text: 'nothing yet',
       events: []
     };
-    Navigation.events().componentDidAppear((componentId, componentName) => {
+    Navigation.events().registerComponentDidAppearListener((componentId, componentName) => {
       this.setState({
         events: [...this.state.events, { event: 'componentDidAppear', componentId, componentName }]
       });
     });
-    Navigation.events().componentDidDisappear((componentId, componentName) => {
+    Navigation.events().registerComponentDidDisappearListener((componentId, componentName) => {
       this.setState({
         events: [...this.state.events, { event: 'componentDidDisappear', componentId, componentName }]
       });
     });
-    Navigation.events().onNavigationCommand((name, params) => {
+    Navigation.events().registerCommandListener((name, params) => {
       // console.log('RNN', `name: ${JSON.stringify(name)}`);
       // console.log('RNN', `params: ${JSON.stringify(params)}`);
     });