Merge branch 'switchToTab' of github.com:wix/react-native-navigation into switchToTab

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

@@ -76,7 +76,8 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void selectBottomTab(final ReadableMap params) {
+    public void selectBottomTab(String navigatorId, Integer index) {
+        NavigationCommandsHandler.selectBottomTab(navigatorId, index);
     }
 
     @ReactMethod

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

@@ -212,4 +212,10 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     public void setSideMenuVisible(boolean animated, boolean visible) {
         layout.setSideMenuVisible(animated, visible);
     }
+
+    public void selectBottomTab(String navigatorId, Integer index) {
+        if (layout instanceof BottomTabsLayout) {
+            ((BottomTabsLayout) layout).selectBottomTab(navigatorId, index);
+        }
+    }
 }

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

@@ -238,4 +238,18 @@ public class NavigationCommandsHandler {
             }
         });
     }
+
+    public static void selectBottomTab(final String navigatorId, final Integer index) {
+        final NavigationActivity currentActivity = NavigationActivity.currentActivity;
+        if (currentActivity == null) {
+            return;
+        }
+
+        NavigationApplication.instance.runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                currentActivity.selectBottomTab(navigatorId, index);
+            }
+        });
+    }
 }

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

@@ -164,18 +164,20 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
         }
     }
 
+    public void selectBottomTab(String navigatorId, Integer index) {
+        if (index != null) {
+            bottomTabs.setCurrentItem(index);
+        } else {
+            bottomTabs.setCurrentItem(getScreenStackIndex(navigatorId));
+        }
+    }
+
     @Override
     public void push(ScreenParams screenParams) {
         ScreenStack screenStack = getScreenStack(screenParams.getNavigatorId());
-        if (screenStack == null) {
-            return;
-        }
-
+        screenStack.push(screenParams, createScreenLayoutParams(screenParams));
         if (isCurrentStack(screenStack)) {
-            screenStack.push(screenParams, createScreenLayoutParams(screenParams));
             bottomTabs.setStyleFromScreen(screenParams.styleParams);
-        } else {
-            screenStack.push(screenParams, createScreenLayoutParams(screenParams));
         }
     }
 
@@ -245,13 +247,24 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
         return screenStacks[currentStackIndex];
     }
 
-    private @Nullable ScreenStack getScreenStack(String navigatorId) {
-        for (ScreenStack screenStack : screenStacks) {
-            if (screenStack.getNavigatorId().equals(navigatorId)) {
-                return screenStack;
+    private @NonNull ScreenStack getScreenStack(String navigatorId) {
+        int index = getScreenStackIndex(navigatorId);
+        return screenStacks[index];
+    }
+
+    private int getScreenStackIndex(String navigatorId) throws ScreenStackNotFoundException {
+        for (int i = 0; i < screenStacks.length; i++) {
+            if (screenStacks[i].getNavigatorId().equals(navigatorId)) {
+                return i;
             }
         }
-        return null;
+        throw new ScreenStackNotFoundException("Stack " + navigatorId + " not found");
+    }
+
+    private class ScreenStackNotFoundException extends RuntimeException {
+        public ScreenStackNotFoundException(String navigatorId) {
+            super(navigatorId);
+        }
     }
 
     private boolean isCurrentStack(ScreenStack screenStack) {

example-redux/src/screens/SecondTabScreen.js

@@ -65,7 +65,9 @@ class SecondTabScreen extends Component {
   }
 
   onSelectFirstTabPress() {
-    this.props.navigator.switchToTab()
+    this.props.navigator.switchToTab({
+      tabIndex: 0
+    })
   }
 
   onSetButton() {

src/deprecated/platformSpecificDeprecated.android.js

@@ -243,10 +243,7 @@ function navigatorSetTitle(navigator, params) {
 }
 
 function navigatorSwitchToTab(navigator, params) {
-  //RctActivity.switchToTab({
-  //  navigatorID: navigator.navigatorID,
-  //  tabIndex: params.tabIndex
-  //});
+  newPlatformSpecific.selectBottomTab(navigator.navigatorID, params.tabIndex);
 }
 
 function navigatorToggleDrawer(navigator, params) {

src/platformSpecific.android.js

@@ -92,6 +92,10 @@ function setSideMenuVisible(animated, visible) {
   NativeReactModule.setSideMenuVisible(animated, visible);
 }
 
+function selectBottomTab(navigatorId, index) {
+  NativeReactModule.selectBottomTab(navigatorId, index);
+}
+
 module.exports = {
   startApp,
   push,
@@ -106,5 +110,6 @@ module.exports = {
   dismissTopModal,
   dismissAllModals,
   toggleSideMenuVisible,
-  setSideMenuVisible
+  setSideMenuVisible,
+  selectBottomTab
 };