Set BottomTab style after TitleBar back button click

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

@@ -19,6 +19,8 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
 
     private final AppCompatActivity activity;
     private final OnModalDismissedListener onModalDismissedListener;
+    private final ScreenParams screenParams;
+    private Layout layout;
 
     public void setTopBarVisible(String screenInstanceId, boolean hidden, boolean animated) {
         layout.setTopBarVisible(screenInstanceId, hidden, animated);
@@ -36,13 +38,15 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
         layout.setTitleBarLeftButton(screenInstanceId, navigatorEventId, titleBarLeftButton);
     }
 
+    @Override
+    public void onTitleBarBackPress() {
+        layout.onTitleBarBackPress();
+    }
+
     public interface OnModalDismissedListener {
         void onModalDismissed(Modal modal);
     }
 
-    private final ScreenParams screenParams;
-    private Layout layout;
-
     public Modal(AppCompatActivity activity, OnModalDismissedListener onModalDismissedListener, ScreenParams screenParams) {
         super(activity, R.style.Modal);
         this.activity = activity;

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

@@ -96,4 +96,9 @@ public class ModalController implements ScreenStackContainer, Modal.OnModalDismi
             modal.setTitleBarLeftButton(screenInstanceId, navigatorEventId, titleBarLeftButton);
         }
     }
+
+    @Override
+    public void onTitleBarBackPress() {
+        // Do nothing and let the layout handle the back press
+    }
 }

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

@@ -47,7 +47,7 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
     }
 
     private void createAndAddScreenStack(int position) {
-        ScreenStack newStack = new ScreenStack(activity, params.tabParams.get(position));
+        ScreenStack newStack = new ScreenStack(activity, params.tabParams.get(position), this);
         screenStacks[position] = newStack;
         newStack.setVisibility(INVISIBLE);
         LayoutParams lp = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
@@ -138,7 +138,7 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
         currentScreenStack.destroy();
         removeView(currentScreenStack);
 
-        ScreenStack newStack = new ScreenStack(activity, params);
+        ScreenStack newStack = new ScreenStack(activity, params, this);
         screenStacks[currentStackIndex] = newStack;
         addView(newStack, 0, new RelativeLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
 
@@ -180,4 +180,12 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
     private void setBottomTabsStyleFromCurrentScreen() {
         bottomTabs.setStyleFromScreen(getCurrentScreenStack().getCurrentScreenStyleParams());
     }
+
+    @Override
+    public void onTitleBarBackPress() {
+        if (getCurrentScreenStack().canPop()) {
+            getCurrentScreenStack().pop();
+            setBottomTabsStyleFromCurrentScreen();
+        }
+    }
 }

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

@@ -1,8 +1,9 @@
 package com.reactnativenavigation.layouts;
 
 import com.reactnativenavigation.params.ScreenParams;
+import com.reactnativenavigation.views.TitleBarBackButtonListener;
 
-public interface ScreenStackContainer {
+public interface ScreenStackContainer extends TitleBarBackButtonListener {
     void push(ScreenParams screenParams);
 
     void pop(ScreenParams screenParams);

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

@@ -31,7 +31,7 @@ public class SingleScreenLayout extends FrameLayout implements Layout {
             stack.destroy();
             removeView(stack);
         }
-        stack = new ScreenStack(activity, screenParams);
+        stack = new ScreenStack(activity, screenParams, this);
         addView(stack, new LayoutParams(MATCH_PARENT, MATCH_PARENT));
     }
 
@@ -95,4 +95,11 @@ public class SingleScreenLayout extends FrameLayout implements Layout {
     public void setTitleBarLeftButton(String screenInstanceId, String navigatorEventId, TitleBarLeftButtonParams titleBarLeftButtonParams) {
         stack.setScreenTitleBarLeftButton(screenInstanceId, navigatorEventId, titleBarLeftButtonParams);
     }
+
+    @Override
+    public void onTitleBarBackPress() {
+        if (stack.canPop()) {
+            stack.pop();
+        }
+    }
 }

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

@@ -18,14 +18,16 @@ import java.util.Stack;
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 
 // TODO there's really no reason for ScreenStack to extend FrameLayout. All screens can be added to parent.
-public class ScreenStack extends FrameLayout implements TitleBarBackButtonListener {
+public class ScreenStack extends FrameLayout {
 
     private final AppCompatActivity activity;
+    private TitleBarBackButtonListener titleBarBackButtonListener;
     private Stack<Screen> stack = new Stack<>();
 
-    public ScreenStack(AppCompatActivity activity, ScreenParams initialScreenParams) {
+    public ScreenStack(AppCompatActivity activity, ScreenParams initialScreenParams, TitleBarBackButtonListener titleBarBackButtonListener) {
         super(activity);
         this.activity = activity;
+        this.titleBarBackButtonListener = titleBarBackButtonListener;
         setLayoutTransition(new LayoutTransition());
         pushInitialScreen(initialScreenParams);
     }
@@ -41,7 +43,7 @@ public class ScreenStack extends FrameLayout implements TitleBarBackButtonListen
     }
 
     private void addScreen(ScreenParams screenParams) {
-        Screen screen = ScreenFactory.create(activity, screenParams, this);
+        Screen screen = ScreenFactory.create(activity, screenParams, titleBarBackButtonListener);
         addView(screen, new FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
         stack.push(screen);
     }
@@ -131,18 +133,11 @@ public class ScreenStack extends FrameLayout implements TitleBarBackButtonListen
         performOnScreen(screenInstanceId, new Task<Screen>() {
             @Override
             public void run(Screen param) {
-                param.setTitleBarLeftButton(navigatorEventId, ScreenStack.this, titleBarLeftButtonParams);
+                param.setTitleBarLeftButton(navigatorEventId, titleBarBackButtonListener, titleBarLeftButtonParams);
             }
         });
     }
 
-    @Override
-    public void onTitleBarBackPress() {
-        if (canPop()) {
-            pop();
-        }
-    }
-
     public StyleParams getCurrentScreenStyleParams() {
         return stack.peek().getStyleParams();
     }