Dynamic height of collapsing react header (#730)

* Dynamic height of collapsing react header

* Add missing class after rebase

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

@@ -98,7 +98,7 @@ public class TopBar extends AppBarLayout {
 
     public TopTabs initTabs() {
         topTabs = new TopTabs(getContext());
-        addView(topTabs);
+        addView(topTabs, new ViewGroup.LayoutParams(MATCH_PARENT, (int) ViewUtils.convertDpToPixel(48)));
         return topTabs;
     }
 

android/app/src/main/java/com/reactnativenavigation/views/collapsingToolbar/CollapsingReactHeaderMeasurer.java

@@ -0,0 +1,22 @@
+package com.reactnativenavigation.views.collapsingToolbar;
+
+import android.view.ViewGroup;
+
+import com.reactnativenavigation.views.utils.ViewMeasurer;
+
+class CollapsingReactHeaderMeasurer extends ViewMeasurer {
+    private ViewGroup header;
+
+    CollapsingReactHeaderMeasurer(ViewGroup header) {
+        this.header = header;
+    }
+
+    @Override
+    public int getMeasuredHeight(int heightMeasureSpec) {
+        return hasChildren() ? header.getChildAt(0).getMeasuredHeight() : super.getMeasuredHeight(heightMeasureSpec);
+    }
+
+    private boolean hasChildren() {
+        return header.getChildCount() > 0;
+    }
+}

android/app/src/main/java/com/reactnativenavigation/views/collapsingToolbar/CollapsingTopBar.java

@@ -10,6 +10,7 @@ import android.widget.ScrollView;
 import com.reactnativenavigation.params.CollapsingTopBarParams;
 import com.reactnativenavigation.params.NavigationParams;
 import com.reactnativenavigation.params.StyleParams;
+import com.reactnativenavigation.screens.Screen;
 import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.views.TitleBar;
 import com.reactnativenavigation.views.TopBar;
@@ -77,9 +78,15 @@ public class CollapsingTopBar extends TopBar implements CollapsingView {
             header = new CollapsingTopBarReactHeader(getContext(),
                     params,
                     new NavigationParams(Bundle.EMPTY),
-                    scrollListener);
-            LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT, (int) ViewUtils.convertDpToPixel(params.reactViewHeight));
-            titleBarAndContextualMenuContainer.addView(header, lp);
+                    scrollListener,
+                    new Screen.OnDisplayListener() {
+                        @Override
+                        public void onDisplay() {
+                            calculateFinalCollapsedTranslation();
+                            header.setOnDisplayListener(null);
+                        }
+                    });
+            titleBarAndContextualMenuContainer.addView(header, new LayoutParams(MATCH_PARENT, WRAP_CONTENT));
             header.setOnHiddenListener(new CollapsingTopBarReactHeaderAnimator.OnHiddenListener() {
                 @Override
                 public void onHidden() {
@@ -169,4 +176,8 @@ public class CollapsingTopBar extends TopBar implements CollapsingView {
     public View asView() {
         return this;
     }
+
+    public int getTitleBarHeight() {
+        return titleBar.getHeight();
+    }
 }

android/app/src/main/java/com/reactnativenavigation/views/collapsingToolbar/CollapsingTopBarReactHeader.java

@@ -12,11 +12,13 @@ import com.facebook.react.uimanager.events.EventDispatcher;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.params.CollapsingTopBarParams;
 import com.reactnativenavigation.params.NavigationParams;
+import com.reactnativenavigation.screens.Screen;
 import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.views.ContentView;
 
-public class CollapsingTopBarReactHeader extends ContentView implements CollapsingTopBarReactHeaderAnimator.OnVisibleListener, CollapsingTopBarReactHeaderAnimator.OnHiddenListener {
+public class CollapsingTopBarReactHeader extends ContentView implements CollapsingTopBarReactHeaderAnimator.OnVisibleListener, CollapsingTopBarReactHeaderAnimator.OnHiddenListener, Screen.OnDisplayListener {
     private ScrollListener listener;
+    private Screen.OnDisplayListener onDisplayListener;
     private boolean mIsScrolling;
     private int mTouchSlop;
     private int touchDown = -1;
@@ -33,19 +35,33 @@ public class CollapsingTopBarReactHeader extends ContentView implements Collapsi
         this.onHiddenListener = onHiddenListener;
     }
 
-    public CollapsingTopBarReactHeader(Context context, CollapsingTopBarParams params, NavigationParams navigationParams, ScrollListener scrollListener) {
+    public CollapsingTopBarReactHeader(Context context, CollapsingTopBarParams params, NavigationParams navigationParams, ScrollListener scrollListener, Screen.OnDisplayListener onDisplayListener) {
         super(context, params.reactViewId, navigationParams);
         listener = scrollListener;
+        this.onDisplayListener = onDisplayListener;
         ViewConfiguration vc = ViewConfiguration.get(context);
         mTouchSlop = vc.getScaledTouchSlop();
-        createVisibilityAnimator(params.reactViewHeight);
+        setViewMeasurer(new CollapsingReactHeaderMeasurer(this));
+        setOnDisplayListener(this);
     }
 
-    private void createVisibilityAnimator(int reactViewHeight) {
-        float height = ViewUtils.convertDpToPixel(reactViewHeight);
-        visibilityAnimator = new CollapsingTopBarReactHeaderAnimator(this, height * 0.6f, height * 0.60f);
-        visibilityAnimator.setOnHiddenListener(this);
-        visibilityAnimator.setOnVisibleListener(this);
+    @Override
+    public void onDisplay() {
+        createVisibilityAnimator();
+        onDisplayListener.onDisplay();
+    }
+
+    private void createVisibilityAnimator() {
+        ViewUtils.runOnPreDraw(this, new Runnable() {
+            @Override
+            public void run() {
+                final CollapsingTopBarReactHeader header = CollapsingTopBarReactHeader.this;
+                float height = getHeight();
+                visibilityAnimator = new CollapsingTopBarReactHeaderAnimator(header, height * 0.6f, height * 0.60f);
+                visibilityAnimator.setOnHiddenListener(header);
+                visibilityAnimator.setOnVisibleListener(header);
+            }
+        });
     }
 
     public void collapse(float amount) {

android/app/src/main/java/com/reactnativenavigation/views/collapsingToolbar/CollapsingViewMeasurer.java

@@ -6,38 +6,30 @@ import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.views.utils.ViewMeasurer;
 
 public class CollapsingViewMeasurer extends ViewMeasurer {
-    int collapsedTopBarHeight;
-    private float finalCollapseValue;
     int screenHeight;
     int bottomTabsHeight = 0;
+    CollapsingTopBar topBar;
     protected StyleParams styleParams;
 
     public CollapsingViewMeasurer(final CollapsingTopBar topBar, final Screen collapsingSingleScreen, StyleParams styleParams) {
+        this.topBar = topBar;
         this.styleParams = styleParams;
         bottomTabsHeight = (int) ViewUtils.convertDpToPixel(56);
-        ViewUtils.runOnPreDraw(topBar, new Runnable() {
-            @Override
-            public void run() {
-                collapsedTopBarHeight = topBar.getCollapsedHeight();
-                finalCollapseValue = topBar.getFinalCollapseValue();
-            }
-        });
-
         ViewUtils.runOnPreDraw(collapsingSingleScreen, new Runnable() {
             @Override
             public void run() {
-                screenHeight = collapsingSingleScreen.getMeasuredHeight();
+                screenHeight = collapsingSingleScreen.getHeight();
             }
         });
     }
 
     public float getFinalCollapseValue() {
-        return finalCollapseValue;
+        return topBar.getFinalCollapseValue();
     }
 
     @Override
     public int getMeasuredHeight(int heightMeasureSpec) {
-        int height = screenHeight - collapsedTopBarHeight;
+        int height = screenHeight - topBar.getCollapsedHeight();
         if (styleParams.bottomTabsHidden) {
             height += bottomTabsHeight;
         }

android/app/src/main/java/com/reactnativenavigation/views/collapsingToolbar/CollapsingViewPagerContentViewMeasurer.java

@@ -2,19 +2,33 @@ package com.reactnativenavigation.views.collapsingToolbar;
 
 import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.screens.Screen;
+import com.reactnativenavigation.utils.ViewUtils;
 
 public class CollapsingViewPagerContentViewMeasurer extends CollapsingViewMeasurer {
+    private int titleBarHeight;
 
-    public CollapsingViewPagerContentViewMeasurer(CollapsingTopBar topBar, Screen screen, StyleParams styleParams) {
+    public CollapsingViewPagerContentViewMeasurer(final CollapsingTopBar topBar, Screen screen, StyleParams styleParams) {
         super(topBar, screen, styleParams);
+        ViewUtils.runOnPreDraw(topBar, new Runnable() {
+            @Override
+            public void run() {
+                titleBarHeight = topBar.getTitleBarHeight();
+            }
+        });
     }
 
     @Override
     public int getMeasuredHeight(int heightMeasureSpec) {
-        int height = screenHeight - collapsedTopBarHeight;
-//        if (styleParams.bottomTabsHidden) {
+        int height = screenHeight - topBar.getCollapsedHeight();
+        if (styleParams.bottomTabsHidden) {
             height -= bottomTabsHeight;
-//        }
+        }
+        if (!styleParams.titleBarHideOnScroll) {
+            height -= titleBarHeight;
+        }
+        if (!styleParams.drawScreenAboveBottomTabs) {
+            height -= bottomTabsHeight;
+        }
         return height;
     }
 }