Apply drawAboveBottomTabs on screen instead of ScreenStack

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

@@ -54,15 +54,7 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
     }
 
     private void addScreenStack(ScreenStack newStack) {
-        LayoutParams lp = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
-        if (shouldDrawScreenStackAboveBottomTabs(newStack)) {
-            lp.addRule(ABOVE, bottomTabs.getId());
-        }
-        addView(newStack, 0, lp);
-    }
-
-    private boolean shouldDrawScreenStackAboveBottomTabs(ScreenStack newStack) {
-        return newStack.getCurrentScreenStyleParams().drawScreenAboveBottomTabs;
+        addView(newStack, 0, new LayoutParams(MATCH_PARENT, MATCH_PARENT));
     }
 
     private void createBottomTabs() {

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

@@ -9,6 +9,7 @@ import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.utils.Task;
+import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.views.TitleBarBackButtonListener;
 
 import java.util.List;
@@ -22,6 +23,7 @@ public class ScreenStack extends FrameLayout {
     private final AppCompatActivity activity;
     private TitleBarBackButtonListener titleBarBackButtonListener;
     private Stack<Screen> stack = new Stack<>();
+    private final int bottomTabsHeight;
 
     public ScreenStack(AppCompatActivity activity,
                        ScreenParams initialScreenParams,
@@ -29,6 +31,7 @@ public class ScreenStack extends FrameLayout {
         super(activity);
         this.activity = activity;
         this.titleBarBackButtonListener = titleBarBackButtonListener;
+        bottomTabsHeight = (int) ViewUtils.convertDpToPixel(56);
         pushInitialScreen(initialScreenParams);
     }
 
@@ -52,7 +55,11 @@ public class ScreenStack extends FrameLayout {
 
     private void addScreen(Screen screen) {
         screen.setVisibility(INVISIBLE);
-        addView(screen, new FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
+        LayoutParams params = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
+        if (screen.screenParams.styleParams.drawScreenAboveBottomTabs) {
+            params.setMargins(0, 0, 0, bottomTabsHeight);
+        }
+        addView(screen, params);
         stack.push(screen);
     }
 

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

@@ -32,10 +32,6 @@ public class BottomTabs extends AHBottomNavigation {
         }
     }
 
-    public void setVisibility(boolean hidden, boolean animated) {
-        visibilityAnimator.setVisible(hidden, animated);
-    }
-
     public void setStyleFromScreen(StyleParams params) {
         setBackgroundColor(params.bottomTabsColor);
 
@@ -49,7 +45,15 @@ public class BottomTabs extends AHBottomNavigation {
 
         setForceTitlesDisplay(params.forceTitlesDisplay);
 
-        setVisibility(params.bottomTabsHidden);
+        setVisibility(params.bottomTabsHidden, true);
+    }
+
+    public void setVisibility(boolean hidden, boolean animated) {
+        if (visibilityAnimator != null) {
+            visibilityAnimator.setVisible(!hidden, animated);
+        } else {
+            setVisibility(hidden);
+        }
     }
 
     private void setBackgroundColor(StyleParams.Color bottomTabsColor) {