Implement switchToTopTab method (#1145)

Usage is identical to switchToTab, closes #842

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

@@ -52,8 +52,6 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void startApp(final ReadableMap params) {
-        boolean portraitOnlyMode = false;
-        boolean landscapeOnlyMode = false;
         NavigationCommandsHandler.startApp(BundleConverter.toBundle(params));
     }
 
@@ -118,6 +116,16 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
         NavigationCommandsHandler.selectBottomTabByNavigatorId(navigatorId);
     }
 
+    @ReactMethod
+    public void selectTopTabByTabIndex(String screenInstanceId, int index) {
+        NavigationCommandsHandler.selectTopTabByTabIndex(screenInstanceId, index);
+    }
+
+    @ReactMethod
+    public void selectTopTabByScreen(String screenInstanceId) {
+        NavigationCommandsHandler.selectTopTabByScreen(screenInstanceId);
+    }
+
     @ReactMethod
     public void toggleSideMenuVisible(boolean animated, String side) {
         NavigationCommandsHandler.toggleSideMenuVisible(animated, Side.fromString(side));

android/app/src/main/java/com/reactnativenavigation/controllers/Modal.java

@@ -82,6 +82,14 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
     public void onSideMenuButtonClick() {
     }
 
+    void selectTopTabByScreen(String screenInstanceId) {
+        layout.selectTopTabByScreen(screenInstanceId);
+    }
+
+    public void selectTopTabByTabIndex(String screenInstanceId, int index) {
+        layout.selectTopTabByTabIndex(screenInstanceId, index);
+    }
+
     interface OnModalDismissedListener {
         void onModalDismissed(Modal modal);
     }

android/app/src/main/java/com/reactnativenavigation/controllers/ModalController.java

@@ -164,4 +164,16 @@ class ModalController implements ScreenStackContainer, Modal.OnModalDismissedLis
     Window getWindow() {
         return stack.peek().getWindow();
     }
+
+    void selectTopTabByTabIndex(String screenInstanceId, int index) {
+        for (Modal modal : stack) {
+            modal.selectTopTabByTabIndex(screenInstanceId, index);
+        }
+    }
+
+    void selectTopTabByScreen(String screenInstanceId) {
+        for (Modal modal : stack) {
+            modal.selectTopTabByScreen(screenInstanceId);
+        }
+    }
 }

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java

@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
@@ -298,6 +299,16 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         layout.setSideMenuVisible(animated, visible, side);
     }
 
+    public void selectTopTabByTabIndex(String screenInstanceId, int index) {
+        layout.selectTopTabByTabIndex(screenInstanceId, index);
+        modalController.selectTopTabByTabIndex(screenInstanceId, index);
+    }
+
+    public void selectTopTabByScreen(String screenInstanceId) {
+        layout.selectTopTabByScreen(screenInstanceId);
+        modalController.selectTopTabByScreen(screenInstanceId);
+    }
+
     public void selectBottomTabByTabIndex(Integer index) {
         if (layout instanceof BottomTabsLayout) {
             ((BottomTabsLayout) layout).selectBottomTabByTabIndex(index);
@@ -398,7 +409,8 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         requestPermissions(permissions, requestCode);
     }
 
-    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         NavigationApplication.instance.getActivityCallbacks().onRequestPermissionsResult(requestCode, permissions, grantResults);
         if (mPermissionListener != null && mPermissionListener.onRequestPermissionsResult(requestCode, permissions, grantResults)) {
             mPermissionListener = null;

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationCommandsHandler.java

@@ -303,6 +303,33 @@ public class NavigationCommandsHandler {
         });
     }
 
+    public static void selectTopTabByTabIndex(final String screenInstanceId, final int index) {
+        final NavigationActivity currentActivity = NavigationActivity.currentActivity;
+        if (currentActivity == null) {
+            return;
+        }
+
+        NavigationApplication.instance.runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                currentActivity.selectTopTabByTabIndex(screenInstanceId, index);
+            }
+        });
+    }
+
+    public static void selectTopTabByScreen(final String screenInstanceId) {
+        final NavigationActivity currentActivity = NavigationActivity.currentActivity;
+        if (currentActivity == null) {
+            return;
+        }
+        NavigationApplication.instance.runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                currentActivity.selectTopTabByScreen(screenInstanceId);
+            }
+        });
+    }
+
     public static void selectBottomTabByTabIndex(final Integer index) {
         final NavigationActivity currentActivity = NavigationActivity.currentActivity;
         if (currentActivity == null) {

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

@@ -195,6 +195,20 @@ public class BottomTabsLayout extends BaseLayout implements AHBottomNavigation.O
         }
     }
 
+    @Override
+    public void selectTopTabByTabIndex(String screenInstanceId, int index) {
+        for (int i = 0; i < bottomTabs.getItemsCount(); i++) {
+            screenStacks[i].selectTopTabByTabIndex(screenInstanceId, index);
+        }
+    }
+
+    @Override
+    public void selectTopTabByScreen(String screenInstanceId) {
+        for (int i = 0; i < bottomTabs.getItemsCount(); i++) {
+            screenStacks[i].selectTopTabByScreen(screenInstanceId);
+        }
+    }
+
     @Override
     public void toggleSideMenuVisible(boolean animated, Side side) {
         if (sideMenu != null) {

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

@@ -57,4 +57,8 @@ public interface Layout extends ScreenStackContainer {
     void showLightBox(LightBoxParams params);
 
     void dismissLightBox();
+
+    void selectTopTabByTabIndex(String screenInstanceId, int index);
+
+    void selectTopTabByScreen(String screenInstanceId);
 }

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

@@ -250,6 +250,16 @@ public class SingleScreenLayout extends BaseLayout {
         }
     }
 
+    @Override
+    public void selectTopTabByTabIndex(String screenInstanceId, int index) {
+        stack.selectTopTabByTabIndex(screenInstanceId, index);
+    }
+
+    @Override
+    public void selectTopTabByScreen(String screenInstanceId) {
+        stack.selectTopTabByScreen(screenInstanceId);
+    }
+
     @Override
     public void showSlidingOverlay(final SlidingOverlayParams params) {
         slidingOverlaysQueue.add(new SlidingOverlay(this, params));

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

@@ -179,6 +179,10 @@ public abstract class Screen extends RelativeLayout implements Subscriber {
         return screenParams.getScreenInstanceId();
     }
 
+    public boolean hasScreenInstance(String screenInstanceId) {
+        return screenParams.getScreenInstanceId().equals(screenInstanceId);
+    }
+
     public abstract String getNavigatorEventId();
 
     public BaseScreenParams getScreenParams() {

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

@@ -358,6 +358,26 @@ public class ScreenStack {
         });
     }
 
+    public void selectTopTabByTabIndex(String screenInstanceId, final int index) {
+        performOnScreen(screenInstanceId, new Task<Screen>() {
+            @Override
+            public void run(Screen screen) {
+                if (screen.screenParams.hasTopTabs()) {
+                    ((ViewPagerScreen) screen).selectTopTabByTabIndex(index);
+                }
+            }
+        });
+    }
+
+    public void selectTopTabByScreen(final String screenInstanceId) {
+        performOnScreen(screenInstanceId, new Task<Screen>() {
+            @Override
+            public void run(Screen screen) {
+                ((ViewPagerScreen) screen).selectTopTabByTabByScreen(screenInstanceId);
+            }
+        });
+    }
+
     public StyleParams getCurrentScreenStyleParams() {
         return stack.peek().getStyleParams();
     }
@@ -375,9 +395,8 @@ public class ScreenStack {
         if (stack.isEmpty()) {
             return;
         }
-
         for (Screen screen : stack) {
-            if (screen.getScreenInstanceId().equals(screenInstanceId)) {
+            if (screen.hasScreenInstance(screenInstanceId)) {
                 task.run(screen);
                 return;
             }

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

@@ -127,4 +127,26 @@ public class ViewPagerScreen extends Screen {
     public String getNavigatorEventId() {
         return screenParams.topTabParams.get(viewPager.getCurrentItem()).navigationParams.navigatorEventId;
     }
+
+    public void selectTopTabByTabIndex(int index) {
+        viewPager.setCurrentItem(index);
+    }
+
+    @Override
+    public boolean hasScreenInstance(String screenInstanceId) {
+        for (PageParams topTabParam : screenParams.topTabParams) {
+            if(screenInstanceId.equals(topTabParam.getScreenInstanceId())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void selectTopTabByTabByScreen(String screenInstanceId) {
+        for (int i = 0; i < screenParams.topTabParams.size(); i++) {
+            if (screenParams.topTabParams.get(i).getScreenInstanceId().equals(screenInstanceId)) {
+                viewPager.setCurrentItem(i);
+            }
+        }
+    }
 }

src/Screen.js

@@ -116,6 +116,10 @@ class Navigator {
     return platformSpecific.navigatorSwitchToTab(this, params);
   }
 
+  switchToTopTab(params = {}) {
+    return platformSpecific.navigatorSwitchToTopTab(this, params);
+  }
+
   showSnackbar(params = {}) {
     return platformSpecific.showSnackbar(this, params);
   }

src/deprecated/platformSpecificDeprecated.android.js

@@ -350,6 +350,14 @@ function navigatorSwitchToTab(navigator, params) {
   }
 }
 
+function navigatorSwitchToTopTab(navigator, params) {
+  if (params.tabIndex >= 0) {
+    newPlatformSpecific.selectTopTabByTabIndex(navigator.screenInstanceID, params.tabIndex);
+  } else {
+    newPlatformSpecific.selectTopTabByScreen(navigator.screenInstanceID);
+  }
+}
+
 function navigatorToggleDrawer(navigator, params) {
   const animated = !(params.animated === false);
   if (params.to) {
@@ -661,6 +669,7 @@ export default {
   navigatorSetTitle,
   navigatorSetSubtitle,
   navigatorSwitchToTab,
+  navigatorSwitchToTopTab,
   navigatorToggleDrawer,
   navigatorToggleTabs,
   navigatorToggleNavBar,

src/platformSpecific.android.js

@@ -121,6 +121,14 @@ function setSideMenuVisible(animated, visible, side) {
   NativeReactModule.setSideMenuVisible(animated, visible, side);
 }
 
+function selectTopTabByTabIndex(screenInstanceId, index) {
+  NativeReactModule.selectTopTabByTabIndex(screenInstanceId, index);
+}
+
+function selectTopTabByScreen(screenInstanceId) {
+  NativeReactModule.selectTopTabByScreen(screenInstanceId);
+}
+
 function selectBottomTabByNavigatorId(navigatorId) {
   NativeReactModule.selectBottomTabByNavigatorId(navigatorId);
 }
@@ -169,6 +177,8 @@ module.exports = {
   dismissAllModals,
   showLightBox,
   dismissLightBox,
+  selectTopTabByScreen,
+  selectTopTabByTabIndex,
   showInAppNotification,
   dismissInAppNotification,
   toggleSideMenuVisible,