Support pushing screens to unselected tabs

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

@@ -52,7 +52,6 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
         if (sideMenuParams == null) {
             return;
         }
-
         sideMenu = new SideMenu(getContext(), sideMenuParams);
         RelativeLayout.LayoutParams lp = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
         addView(sideMenu, lp);
@@ -65,8 +64,8 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
     }
 
     private void createAndAddScreens(int position) {
-        ScreenStack newStack = new ScreenStack(activity, getContentContainer(), this);
         ScreenParams screenParams = params.tabParams.get(position);
+        ScreenStack newStack = new ScreenStack(activity, getContentContainer(), screenParams.navigatorId, this);
         newStack.pushInitialScreen(screenParams, createScreenLayoutParams(screenParams));
         screenStacks[position] = newStack;
     }
@@ -163,8 +162,17 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
 
     @Override
     public void push(ScreenParams screenParams) {
-        getCurrentScreenStack().push(screenParams, createScreenLayoutParams(screenParams));
-        bottomTabs.setStyleFromScreen(screenParams.styleParams);
+        ScreenStack screenStack = getScreenStack(screenParams.navigatorId);
+        if (screenStack == null) {
+            return;
+        }
+
+        if (isCurrentStack(screenStack)) {
+            screenStack.push(screenParams, createScreenLayoutParams(screenParams));
+            bottomTabs.setStyleFromScreen(screenParams.styleParams);
+        } else {
+            screenStack.push(screenParams, createScreenLayoutParams(screenParams));
+        }
     }
 
     @Override
@@ -189,7 +197,7 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
         currentScreenStack.destroy();
         removeView(currentScreenStack.peek());
 
-        ScreenStack newStack = new ScreenStack(activity, this, this);
+        ScreenStack newStack = new ScreenStack(activity, this, params.navigatorId, this);
         LayoutParams lp = createScreenLayoutParams(params);
         newStack.pushInitialScreen(params, lp);
         screenStacks[currentStackIndex] = newStack;
@@ -220,19 +228,32 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
     }
 
     private void showStackAndUpdateStyle(ScreenStack newStack) {
-        newStack.showFirstScreen();
+        newStack.show();
         bottomTabs.setStyleFromScreen(newStack.getCurrentScreenStyleParams());
     }
 
     private void hideCurrentStack() {
         ScreenStack currentScreenStack = getCurrentScreenStack();
-        currentScreenStack.hideScreen();
+        currentScreenStack.hide();
     }
 
     private ScreenStack getCurrentScreenStack() {
         return screenStacks[currentStackIndex];
     }
 
+    private @Nullable ScreenStack getScreenStack(String navigatorId) {
+        for (ScreenStack screenStack : screenStacks) {
+            if (screenStack.getNavigatorId().equals(navigatorId)) {
+                return screenStack;
+            }
+        }
+        return null;
+    }
+
+    private boolean isCurrentStack(ScreenStack screenStack) {
+        return getCurrentScreenStack() == screenStack;
+    }
+
     private void setBottomTabsStyleFromCurrentScreen() {
         bottomTabs.setStyleFromScreen(getCurrentScreenStack().getCurrentScreenStyleParams());
     }
@@ -248,7 +269,6 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
             });
             return true;
         }
-
         return false;
     }
 

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

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

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

@@ -21,6 +21,7 @@ public class ScreenParams {
 
     public String screenInstanceId;
     public String navigatorEventId;
+    public String navigatorId;
     public Bundle navigationParams;
 
     public boolean hasTopTabs() {

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

@@ -17,6 +17,7 @@ public class ScreenParamsParser extends Parser {
     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";
@@ -34,6 +35,7 @@ public class ScreenParamsParser extends Parser {
         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.styleParams = new StyleParamsParser(params.getBundle(STYLE_PARAMS)).parse();

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

@@ -27,12 +27,20 @@ public class ScreenStack {
     private LeftButtonOnClickListener leftButtonOnClickListener;
     private Stack<Screen> stack = new Stack<>();
     private final KeyboardVisibilityDetector keyboardVisibilityDetector;
+    private boolean isStackVisible = false;
+    private final String navigatorId;
+
+    public String getNavigatorId() {
+        return navigatorId;
+    }
 
     public ScreenStack(AppCompatActivity activity,
                        RelativeLayout parent,
+                       String navigatorId,
                        LeftButtonOnClickListener leftButtonOnClickListener) {
         this.activity = activity;
         this.parent = parent;
+        this.navigatorId = navigatorId;
         this.leftButtonOnClickListener = leftButtonOnClickListener;
         keyboardVisibilityDetector = new KeyboardVisibilityDetector(parent);
     }
@@ -46,6 +54,15 @@ public class ScreenStack {
     public void push(final ScreenParams params, RelativeLayout.LayoutParams layoutParams) {
         Screen nextScreen = ScreenFactory.create(activity, params, leftButtonOnClickListener);
         final Screen previousScreen = stack.peek();
+        if (isStackVisible) {
+            pushScreenToVisibleStack(params, layoutParams, nextScreen, previousScreen);
+        } else {
+            pushScreenToInvisibleStack(layoutParams, nextScreen, previousScreen);
+        }
+    }
+
+    private void pushScreenToVisibleStack(ScreenParams params, RelativeLayout.LayoutParams layoutParams,
+                                          Screen nextScreen, final Screen previousScreen) {
         addScreen(nextScreen, layoutParams);
         nextScreen.show(params.animateScreenTransitions, new Runnable() {
             @Override
@@ -55,6 +72,13 @@ public class ScreenStack {
         });
     }
 
+    private void pushScreenToInvisibleStack(RelativeLayout.LayoutParams layoutParams, Screen nextScreen,
+                                            Screen previousScreen) {
+        nextScreen.setVisibility(View.INVISIBLE);
+        addScreen(nextScreen, layoutParams);
+        removePreviousWithoutUnmount(previousScreen);
+    }
+
     private void addScreen(Screen screen, RelativeLayout.LayoutParams layoutParams) {
         parent.addView(screen, layoutParams);
         stack.push(screen);
@@ -109,6 +133,7 @@ public class ScreenStack {
     }
 
     private void readdPrevious(Screen previous) {
+        previous.setVisibility(View.VISIBLE);
         parent.addView(previous, 0);
         previous.preventMountAfterReattachedToWindow();
     }
@@ -188,11 +213,13 @@ public class ScreenStack {
         }
     }
 
-    public void showFirstScreen() {
+    public void show() {
+        isStackVisible = true;
         stack.peek().setVisibility(View.VISIBLE);
     }
 
-    public void hideScreen() {
+    public void hide() {
+        isStackVisible = false;
         stack.peek().setVisibility(View.INVISIBLE);
     }
 }