Support drawScreenAboveBottomTabs

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

@@ -50,11 +50,21 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
         ScreenStack newStack = new ScreenStack(activity, params.tabParams.get(position), this);
         screenStacks[position] = newStack;
         newStack.setVisibility(INVISIBLE);
+        addScreenStack(newStack);
+    }
+
+    private void addScreenStack(ScreenStack newStack) {
         LayoutParams lp = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
-        lp.addRule(ABOVE, bottomTabs.getId());
+        if (shouldDrawScreenStackAboveBottomTabs(newStack)) {
+            lp.addRule(ABOVE, bottomTabs.getId());
+        }
         addView(newStack, 0, lp);
     }
 
+    private boolean shouldDrawScreenStackAboveBottomTabs(ScreenStack newStack) {
+        return newStack.getCurrentScreenStyleParams().drawScreenAboveBottomTabs;
+    }
+
     private void createBottomTabs() {
         bottomTabs = new BottomTabs(getContext());
         bottomTabs.addTabs(params.tabParams, this);

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

@@ -39,6 +39,7 @@ public class StyleParams {
     public Color topBarColor;
     public boolean topBarHidden;
     public boolean topTabsHidden;
+    public boolean drawScreenBelowTopBar;
 
     public boolean titleBarHidden;
     public Color titleBarTitleColor;
@@ -50,6 +51,8 @@ public class StyleParams {
     public int selectedTopTabIndicatorHeight;
     public Color selectedTopTabIndicatorColor;
 
+    public boolean drawScreenAboveBottomTabs;
+
     public boolean bottomTabsHidden;
     public boolean bottomTabsHiddenOnScroll;
     public Color bottomTabsColor;
@@ -57,6 +60,4 @@ public class StyleParams {
     public Color bottomTabsButtonColor;
 
     public Color navigationBarColor;
-
-    public boolean drawScreenBelowTopBar;
 }

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

@@ -38,6 +38,9 @@ public class StyleParamsParser {
         //result.drawScreenBelowTopBar = params.getBoolean("drawBelowTopBar", isDefaultScreenBelowTopBar());
         result.drawScreenBelowTopBar = true;
 
+        result.drawScreenAboveBottomTabs =
+                params.getBoolean("drawScreenAboveBottomTabs", getDefaultDrawScreenAboveBottomTabs());
+
         result.bottomTabsHidden = getBoolean("bottomTabsHidden", getDefaultBottomTabsHidden());
         result.bottomTabsHiddenOnScroll =
                 getBoolean("bottomTabsHiddenOnScroll", getDefaultBottomTabsHiddenOnScroll());
@@ -51,6 +54,10 @@ public class StyleParamsParser {
         return result;
     }
 
+    private boolean getDefaultDrawScreenAboveBottomTabs() {
+        return AppStyle.appStyle == null || AppStyle.appStyle.drawScreenAboveBottomTabs;
+    }
+
     private StyleParams.Color getDefaultSelectedTopTabIndicatorColor() {
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.selectedTopTabIndicatorColor;
     }

src/deprecated/platformSpecificDeprecated.android.js

@@ -109,6 +109,8 @@ function convertStyleParams(originalStyleObject) {
     selectedTopTabIndicatorHeight: originalStyleObject.selectedTopTabIndicatorHeight,
     selectedTopTabIndicatorColor: originalStyleObject.selectedTopTabIndicatorColor,
 
+    drawScreenAboveBottomTabs: !originalStyleObject.drawUnderTabBar,
+
     bottomTabsColor: originalStyleObject.tabBarBackgroundColor,
     bottomTabsButtonColor: originalStyleObject.tabBarButtonColor,
     bottomTabsSelectedButtonColor: originalStyleObject.tabBarSelectedButtonColor,