Get screen LayoutParams from parent

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

@@ -1,5 +1,6 @@
 package com.reactnativenavigation.layouts;
 
+import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.RelativeLayout;
@@ -42,19 +43,24 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
 
     private void addScreenStacks() {
         for (int i = 0; i < screenStacks.length; i++) {
-            createAndAddScreenStack(i);
+            createAndAddScreens(i);
         }
     }
 
-    private void createAndAddScreenStack(int position) {
-        ScreenStack newStack = new ScreenStack(activity, params.tabParams.get(position), this);
+    private void createAndAddScreens(int position) {
+        ScreenStack newStack = new ScreenStack(activity, this, this);
+        ScreenParams screenParams = params.tabParams.get(position);
+        newStack.pushInitialScreen(screenParams, createScreenLayoutParams(screenParams));
         screenStacks[position] = newStack;
-        newStack.setVisibility(INVISIBLE);
-        addScreenStack(newStack);
     }
 
-    private void addScreenStack(ScreenStack newStack) {
-        addView(newStack, 0, new LayoutParams(MATCH_PARENT, MATCH_PARENT));
+    @NonNull
+    private LayoutParams createScreenLayoutParams(ScreenParams params) {
+        LayoutParams lp = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
+        if (params.styleParams.drawScreenAboveBottomTabs) {
+            lp.addRule(RelativeLayout.ABOVE, bottomTabs.getId());
+        }
+        return lp;
     }
 
     private void createBottomTabs() {
@@ -122,7 +128,7 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
 
     @Override
     public void push(ScreenParams screenParams) {
-        getCurrentScreenStack().push(screenParams);
+        getCurrentScreenStack().push(screenParams, createScreenLayoutParams(screenParams));
         bottomTabs.setStyleFromScreen(screenParams.styleParams);
     }
 
@@ -142,11 +148,12 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
     public void newStack(ScreenParams params) {
         ScreenStack currentScreenStack = getCurrentScreenStack();
         currentScreenStack.destroy();
-        removeView(currentScreenStack);
+        removeView(currentScreenStack.peek());
 
-        ScreenStack newStack = new ScreenStack(activity, params, this);
+        ScreenStack newStack = new ScreenStack(activity, this, this);
+        LayoutParams lp = createScreenLayoutParams(params);
+        newStack.pushInitialScreen(params, lp);
         screenStacks[currentStackIndex] = newStack;
-        addView(newStack, 0, new RelativeLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
 
         bottomTabs.setStyleFromScreen(params.styleParams);
     }
@@ -170,13 +177,13 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
     }
 
     private void showStackAndUpdateStyle(ScreenStack newStack) {
-        newStack.setVisibility(VISIBLE);
+        newStack.showScreen();
         bottomTabs.setStyleFromScreen(newStack.getCurrentScreenStyleParams());
     }
 
     private void hideCurrentStack() {
         ScreenStack currentScreenStack = getCurrentScreenStack();
-        currentScreenStack.setVisibility(INVISIBLE);
+        currentScreenStack.hideScreen();
     }
 
     private ScreenStack getCurrentScreenStack() {

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

@@ -2,7 +2,7 @@ package com.reactnativenavigation.layouts;
 
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
-import android.widget.FrameLayout;
+import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
@@ -13,9 +13,7 @@ import com.reactnativenavigation.views.TitleBarBackButtonListener;
 
 import java.util.List;
 
-import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-
-public class SingleScreenLayout extends FrameLayout implements Layout {
+public class SingleScreenLayout extends RelativeLayout implements Layout {
 
     private final AppCompatActivity activity;
     private final ScreenParams screenParams;
@@ -38,10 +36,10 @@ public class SingleScreenLayout extends FrameLayout implements Layout {
     private void createStack() {
         if (stack != null) {
             stack.destroy();
-            removeView(stack);
         }
-        stack = new ScreenStack(activity, screenParams, this);
-        addView(stack, new LayoutParams(MATCH_PARENT, MATCH_PARENT));
+        stack = new ScreenStack(activity, this, this);
+        LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+        stack.pushInitialScreen(screenParams, lp);
     }
 
     @Override
@@ -57,12 +55,12 @@ public class SingleScreenLayout extends FrameLayout implements Layout {
     @Override
     public void destroy() {
         stack.destroy();
-        removeView(stack);
     }
 
     @Override
     public void push(ScreenParams params) {
-        stack.push(params);
+        LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+        stack.push(params, lp);
     }
 
     @Override

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

@@ -162,6 +162,10 @@ public abstract class Screen extends RelativeLayout {
         }
     }
 
+    public void show() {
+        screenAnimator.show(screenParams.animateScreenTransitions);
+    }
+
     public void show(boolean animated) {
         screenAnimator.show(animated);
     }

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

@@ -1,50 +1,44 @@
 package com.reactnativenavigation.screens;
 
 import android.support.v7.app.AppCompatActivity;
-import android.view.ViewManager;
-import android.widget.FrameLayout;
+import android.view.View;
+import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.params.ScreenParams;
 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;
 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 {
+public class ScreenStack {
 
     private final AppCompatActivity activity;
+    private RelativeLayout parent;
     private TitleBarBackButtonListener titleBarBackButtonListener;
     private Stack<Screen> stack = new Stack<>();
-    private final int bottomTabsHeight;
 
     public ScreenStack(AppCompatActivity activity,
-                       ScreenParams initialScreenParams,
+                       RelativeLayout parent,
                        TitleBarBackButtonListener titleBarBackButtonListener) {
-        super(activity);
         this.activity = activity;
+        this.parent = parent;
         this.titleBarBackButtonListener = titleBarBackButtonListener;
-        bottomTabsHeight = (int) ViewUtils.convertDpToPixel(56);
-        pushInitialScreen(initialScreenParams);
     }
 
-    private void pushInitialScreen(ScreenParams initialScreenParams) {
+    public void pushInitialScreen(ScreenParams initialScreenParams, RelativeLayout.LayoutParams params) {
         Screen initialScreen = ScreenFactory.create(activity, initialScreenParams, titleBarBackButtonListener);
-        addScreen(initialScreen);
-        initialScreen.show(initialScreenParams.animateScreenTransitions);
+        initialScreen.setVisibility(View.INVISIBLE);
+        addScreen(initialScreen, params);
     }
 
-    public void push(final ScreenParams params) {
+    public void push(final ScreenParams params, RelativeLayout.LayoutParams layoutParams) {
         Screen nextScreen = ScreenFactory.create(activity, params, titleBarBackButtonListener);
         final Screen previousScreen = stack.peek();
-        addScreen(nextScreen);
+        addScreen(nextScreen, layoutParams);
         nextScreen.show(params.animateScreenTransitions, new Runnable() {
             @Override
             public void run() {
@@ -53,19 +47,14 @@ public class ScreenStack extends FrameLayout {
         });
     }
 
-    private void addScreen(Screen screen) {
-        screen.setVisibility(INVISIBLE);
-        LayoutParams params = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
-        if (screen.screenParams.styleParams.drawScreenAboveBottomTabs) {
-            params.setMargins(0, 0, 0, bottomTabsHeight);
-        }
-        addView(screen, params);
+    private void addScreen(Screen screen, RelativeLayout.LayoutParams layoutParams) {
+        parent.addView(screen, layoutParams);
         stack.push(screen);
     }
 
     private void removePreviousWithoutUnmount(Screen previous) {
         previous.preventUnmountOnDetachedFromWindow();
-        removeView(previous);
+        parent.removeView(previous);
     }
 
     public void pop(boolean animated) {
@@ -81,13 +70,17 @@ public class ScreenStack extends FrameLayout {
             @Override
             public void run() {
                 toRemove.ensureUnmountOnDetachedFromWindow();
-                removeView(toRemove);
+                parent.removeView(toRemove);
             }
         });
     }
 
+    public Screen peek() {
+        return stack.peek();
+    }
+
     private void readdPrevious(Screen previous) {
-        addView(previous, 0, new LayoutParams(MATCH_PARENT, MATCH_PARENT));
+        parent.addView(previous, 0);
         previous.preventMountAfterReattachedToWindow();
     }
 
@@ -100,17 +93,9 @@ public class ScreenStack extends FrameLayout {
     public void destroy() {
         for (Screen screen : stack) {
             screen.ensureUnmountOnDetachedFromWindow();
-            removeView(screen);
+            parent.removeView(screen);
         }
         stack.clear();
-        removeFromScreen();
-    }
-
-    private void removeFromScreen() {
-        ViewManager parent = (ViewManager) getParent();
-        if (parent != null) {
-            parent.removeView(this);
-        }
     }
 
     public int getStackSize() {
@@ -173,4 +158,12 @@ public class ScreenStack extends FrameLayout {
             }
         }
     }
+
+    public void showScreen() {
+        stack.peek().setVisibility(View.VISIBLE);
+    }
+
+    public void hideScreen() {
+        stack.peek().setVisibility(View.INVISIBLE);
+    }
 }