Fix TitleBar back button in Modal

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

@@ -39,8 +39,11 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
     }
 
     @Override
-    public void onTitleBarBackPress() {
-        layout.onTitleBarBackPress();
+    public boolean onTitleBarBackPress() {
+        if (!layout.onBackPressed()) {
+            onBackPressed();
+        }
+        return true;
     }
 
     public interface OnModalDismissedListener {
@@ -63,7 +66,7 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
         setCancelable(true);
         setOnDismissListener(this);
         requestWindowFeature(Window.FEATURE_NO_TITLE);
-        layout = new SingleScreenLayout(getActivity(), screenParams);
+        layout = new SingleScreenLayout(getActivity(), screenParams, this);
         setContentView(layout.asView());
     }
 

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

@@ -98,7 +98,8 @@ public class ModalController implements ScreenStackContainer, Modal.OnModalDismi
     }
 
     @Override
-    public void onTitleBarBackPress() {
+    public boolean onTitleBarBackPress() {
         // Do nothing and let the layout handle the back press
+        return false;
     }
 }

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

@@ -196,10 +196,13 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
     }
 
     @Override
-    public void onTitleBarBackPress() {
+    public boolean onTitleBarBackPress() {
         if (getCurrentScreenStack().canPop()) {
             getCurrentScreenStack().pop();
             setBottomTabsStyleFromCurrentScreen();
+            return true;
         }
+
+        return false;
     }
 }

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

@@ -8,6 +8,7 @@ import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.screens.ScreenStack;
+import com.reactnativenavigation.views.TitleBarBackButtonListener;
 
 import java.util.List;
 
@@ -18,6 +19,12 @@ public class SingleScreenLayout extends FrameLayout implements Layout {
     private final AppCompatActivity activity;
     private final ScreenParams screenParams;
     private ScreenStack stack;
+    private TitleBarBackButtonListener titleBarBackButtonListener;
+
+    public SingleScreenLayout(AppCompatActivity activity, ScreenParams screenParams, TitleBarBackButtonListener titleBarBackButtonListener) {
+        this(activity, screenParams);
+        this.titleBarBackButtonListener = titleBarBackButtonListener;
+    }
 
     public SingleScreenLayout(AppCompatActivity activity, ScreenParams screenParams) {
         super(activity);
@@ -48,6 +55,7 @@ public class SingleScreenLayout extends FrameLayout implements Layout {
     @Override
     public void destroy() {
         stack.destroy();
+        removeView(stack);
     }
 
     @Override
@@ -97,9 +105,11 @@ public class SingleScreenLayout extends FrameLayout implements Layout {
     }
 
     @Override
-    public void onTitleBarBackPress() {
-        if (stack.canPop()) {
-            stack.pop();
+    public boolean onTitleBarBackPress() {
+        if (titleBarBackButtonListener != null) {
+            return titleBarBackButtonListener.onTitleBarBackPress();
         }
+
+        return onBackPressed();
     }
 }

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

@@ -1,5 +1,5 @@
 package com.reactnativenavigation.views;
 
 public interface TitleBarBackButtonListener {
-    void onTitleBarBackPress();
+    boolean onTitleBarBackPress();
 }