Fix selectedTab event

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

@@ -65,7 +65,7 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
 
     private void createAndAddScreens(int position) {
         ScreenParams screenParams = params.tabParams.get(position);
-        ScreenStack newStack = new ScreenStack(activity, getScreenStackParent(), screenParams.navigatorId, this);
+        ScreenStack newStack = new ScreenStack(activity, getScreenStackParent(), screenParams.getNavigatorId(), this);
         newStack.pushInitialScreen(screenParams, createScreenLayoutParams(screenParams));
         screenStacks[position] = newStack;
     }
@@ -166,7 +166,7 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
 
     @Override
     public void push(ScreenParams screenParams) {
-        ScreenStack screenStack = getScreenStack(screenParams.navigatorId);
+        ScreenStack screenStack = getScreenStack(screenParams.getNavigatorId());
         if (screenStack == null) {
             return;
         }
@@ -201,7 +201,7 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
         currentScreenStack.destroy();
         removeView(currentScreenStack.peek());
 
-        ScreenStack newStack = new ScreenStack(activity, getScreenStackParent(), params.navigatorId, this);
+        ScreenStack newStack = new ScreenStack(activity, getScreenStackParent(), params.getNavigatorId(), this);
         LayoutParams lp = createScreenLayoutParams(params);
         newStack.pushInitialScreen(params, lp);
         screenStacks[currentStackIndex] = newStack;

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

@@ -60,7 +60,7 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
         if (stack != null) {
             stack.destroy();
         }
-        stack = new ScreenStack(activity, parent, screenParams.navigatorId, this);
+        stack = new ScreenStack(activity, parent, screenParams.getNavigatorId(), this);
         LayoutParams lp = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
         stack.pushInitialScreen(screenParams, lp);
         stack.show();

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

@@ -0,0 +1,27 @@
+package com.reactnativenavigation.params;
+
+import android.os.Bundle;
+
+public class NavigationParams {
+    public static final String SCREEN_INSTANCE_ID = "screenInstanceID";
+    public static final String NAVIGATOR_ID = "navigatorID";
+    public static final String NAVIGATOR_EVENT_ID = "navigatorEventID";
+
+    public String screenInstanceId;
+    public String navigatorId;
+    public String navigatorEventId;
+
+    public NavigationParams(Bundle bundle) {
+        screenInstanceId = bundle.getString(SCREEN_INSTANCE_ID);
+        navigatorId = bundle.getString(NAVIGATOR_ID);
+        navigatorEventId = bundle.getString(NAVIGATOR_EVENT_ID);
+    }
+
+    public Bundle toBundle() {
+        Bundle b = new Bundle();
+        b.putString(SCREEN_INSTANCE_ID, screenInstanceId);
+        b.putString(NAVIGATOR_ID, navigatorId);
+        b.putString(NAVIGATOR_EVENT_ID, navigatorEventId);
+        return b;
+    }
+}

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

@@ -20,10 +20,7 @@ public class ScreenParams {
     public String tabLabel;
     public Drawable tabIcon;
 
-    public String screenInstanceId;
-    public String navigatorEventId;
-    public String navigatorId;
-    public Bundle navigationParams;
+    public NavigationParams navigationParams;
 
     public boolean hasTopTabs() {
         return topTabParams != null && !topTabParams.isEmpty();
@@ -32,4 +29,16 @@ public class ScreenParams {
     public boolean isFragmentScreen() {
         return fragmentCreatorClassName != null;
     }
+
+    public String getScreenInstanceId() {
+        return navigationParams.screenInstanceId;
+    }
+
+    public String getNavigatorId() {
+        return navigationParams.navigatorId;
+    }
+
+    public String getNavigatorEventId() {
+        return navigationParams.navigatorEventId;
+    }
 }

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

@@ -1,9 +1,7 @@
 package com.reactnativenavigation.params;
 
-import android.os.Bundle;
-
 public class SideMenuParams {
     public String screenId;
-    public Bundle navigationParams;
+    public NavigationParams navigationParams;
     public boolean disableOpenGesture;
 }

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

@@ -1,9 +1,7 @@
 package com.reactnativenavigation.params;
 
-import android.os.Bundle;
-
 public class TopTabParams {
     public String screenId;
     public String title;
-    public Bundle navigationParams;
+    public NavigationParams navigationParams;
 }

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

@@ -3,6 +3,7 @@ package com.reactnativenavigation.params.parsers;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 
+import com.reactnativenavigation.params.NavigationParams;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
@@ -15,9 +16,6 @@ import java.util.List;
 public class ScreenParamsParser extends Parser {
     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_NAVIGATOR_ID = "navigatorID";
     private static final String KEY_NAVIGATION_PARAMS = "navigationParams";
     private static final String KEY_RIGHT_BUTTONS = "rightButtons";
     private static final String KEY_LEFT_BUTTON = "leftButton";
@@ -32,12 +30,8 @@ public class ScreenParamsParser extends Parser {
     public static ScreenParams parse(Bundle params) {
         ScreenParams result = new ScreenParams();
         result.screenId = params.getString(KEY_SCREEN_ID);
-        result.screenInstanceId = params.getString(KEY_SCREEN_INSTANCE_ID);
         assertKeyExists(params, KEY_NAVIGATION_PARAMS);
-        result.navigationParams = params.getBundle(KEY_NAVIGATION_PARAMS);
-        result.navigatorEventId = result.navigationParams.getString(KEY_NAVIGATOR_EVENT_ID);
-        result.navigatorId = result.navigationParams.getString(KEY_NAVIGATOR_ID);
-        result.screenInstanceId = result.navigationParams.getString(KEY_SCREEN_INSTANCE_ID);
+        result.navigationParams = new NavigationParams(params.getBundle(KEY_NAVIGATION_PARAMS));
 
         result.styleParams = new StyleParamsParser(params.getBundle(STYLE_PARAMS)).parse();
 

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

@@ -2,6 +2,7 @@ package com.reactnativenavigation.params.parsers;
 
 import android.os.Bundle;
 
+import com.reactnativenavigation.params.NavigationParams;
 import com.reactnativenavigation.params.SideMenuParams;
 
 public class SideMenuParamsParser extends Parser {
@@ -9,7 +10,7 @@ public class SideMenuParamsParser extends Parser {
     public static SideMenuParams parse(Bundle sideMenu) {
         SideMenuParams result = new SideMenuParams();
         result.screenId = sideMenu.getString("screenId");
-        result.navigationParams = sideMenu.getBundle("navigationParams");
+        result.navigationParams = new NavigationParams(sideMenu.getBundle("navigationParams"));
         result.disableOpenGesture = sideMenu.getBoolean("disableOpenGesture", false);
         return result;
     }

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

@@ -3,6 +3,7 @@ package com.reactnativenavigation.params.parsers;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 
+import com.reactnativenavigation.params.NavigationParams;
 import com.reactnativenavigation.params.TopTabParams;
 
 import java.util.ArrayList;
@@ -27,7 +28,7 @@ public class TopTabParamsParser extends Parser {
         TopTabParams result = new TopTabParams();
         result.screenId = params.getString(KEY_SCREEN_ID);
         result.title = params.getString(KEY_TITLE);
-        result.navigationParams = params.getBundle(NAVIGATION_PARAMS);
+        result.navigationParams = new NavigationParams(params.getBundle(NAVIGATION_PARAMS));
         return result;
     }
 }

android/app/src/main/java/com/reactnativenavigation/screens/ContentViewPagerAdapter.java

@@ -40,8 +40,7 @@ public class ContentViewPagerAdapter extends PagerAdapter {
     private void sendPageChangeEvent() {
         WritableMap data = Arguments.createMap();
         String navigatorEventId = contentViews.get(currentPosition).getNavigatorEventId();
-        data.putInt("position", currentPosition);
-        NavigationApplication.instance.sendNavigatorEvent("selectedTabChanged", navigatorEventId, data);
+        NavigationApplication.instance.sendNavigatorEvent("tabSelected", navigatorEventId, data);
     }
 
     @Override

android/app/src/main/java/com/reactnativenavigation/screens/Screen.java

@@ -73,7 +73,7 @@ public abstract class Screen extends RelativeLayout {
         topBar.addTitleBarAndSetButtons(screenParams.rightButtons,
                 screenParams.leftButton,
                 leftButtonOnClickListener,
-                screenParams.navigatorEventId,
+                screenParams.getNavigatorEventId(),
                 screenParams.overrideBackPressInJs);
     }
 
@@ -129,7 +129,7 @@ public abstract class Screen extends RelativeLayout {
     public abstract void preventMountAfterReattachedToWindow();
 
     public String getScreenInstanceId() {
-        return screenParams.screenInstanceId;
+        return screenParams.getScreenInstanceId();
     }
 
     public void setTopBarVisible(boolean visible, boolean animate) {

android/app/src/main/java/com/reactnativenavigation/screens/ScreenStack.java

@@ -211,7 +211,7 @@ public class ScreenStack {
     public boolean handleBackPressInJs() {
         ScreenParams currentScreen = stack.peek().screenParams;
         if (currentScreen.overrideBackPressInJs) {
-            NavigationApplication.instance.sendNavigatorEvent("backPress", currentScreen.navigatorEventId);
+            NavigationApplication.instance.sendNavigatorEvent("backPress", currentScreen.getNavigatorEventId());
             return true;
         }
         return false;

android/app/src/main/java/com/reactnativenavigation/screens/ViewPagerScreen.java

@@ -45,7 +45,7 @@ public class ViewPagerScreen extends Screen {
     private void addPages() {
         contentViews = new ArrayList<>();
         for (TopTabParams tab : screenParams.topTabParams) {
-            ContentView contentView = new ContentView(getContext(), tab.screenId, tab.navigationParams, screenParams.navigatorEventId);
+            ContentView contentView = new ContentView(getContext(), tab.screenId, tab.navigationParams);
             addContent(contentView);
             contentViews.add(contentView);
         }
@@ -87,4 +87,9 @@ public class ViewPagerScreen extends Screen {
     public void setOnDisplayListener(OnDisplayListener onContentViewDisplayedListener) {
         contentViews.get(0).setOnDisplayListener(onContentViewDisplayedListener);
     }
+
+    @Override
+    public String getScreenInstanceId() {
+        return screenParams.topTabParams.get(viewPager.getCurrentItem()).navigationParams.screenInstanceId;
+    }
 }

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

@@ -1,11 +1,11 @@
 package com.reactnativenavigation.views;
 
 import android.content.Context;
-import android.os.Bundle;
 import android.view.View;
 
 import com.facebook.react.ReactRootView;
 import com.reactnativenavigation.NavigationApplication;
+import com.reactnativenavigation.params.NavigationParams;
 import com.reactnativenavigation.react.ReactViewHacks;
 import com.reactnativenavigation.screens.SingleScreen;
 import com.reactnativenavigation.utils.ViewUtils;
@@ -13,26 +13,20 @@ import com.reactnativenavigation.utils.ViewUtils;
 public class ContentView extends ReactRootView {
 
     private final String screenId;
-    private String navigatorEventId;
-    private final Bundle navigationParams;
+    private final NavigationParams navigationParams;
 
     boolean isContentVisible = false;
     private SingleScreen.OnDisplayListener onDisplayListener;
 
-    public ContentView(Context context, String screenId, Bundle navigationParams) {
-        this(context, screenId, navigationParams, null);
-    }
-
-    public ContentView(Context context, String screenId, Bundle navigationParams, String navigatorEventId) {
+    public ContentView(Context context, String screenId, NavigationParams navigationParams) {
         super(context);
         this.screenId = screenId;
-        this.navigatorEventId = navigatorEventId;
         this.navigationParams = navigationParams;
         attachToJS();
     }
 
     public String getNavigatorEventId() {
-        return navigatorEventId;
+        return navigationParams.navigatorEventId;
     }
 
     public void preventUnmountOnDetachedFromWindow() {
@@ -69,7 +63,8 @@ public class ContentView extends ReactRootView {
     }
 
     private void attachToJS() {
-        startReactApplication(NavigationApplication.instance.getReactGateway().getReactInstanceManager(), screenId, navigationParams);
+        startReactApplication(NavigationApplication.instance.getReactGateway().getReactInstanceManager(), screenId,
+                navigationParams.toBundle());
     }
 
     public void setOnDisplayListener(SingleScreen.OnDisplayListener onDisplayListener) {