Revert "Dynamic height for CollapsingReactHeader (#726)" (#728)

This reverts commit 326f4833f0.

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

@@ -7,6 +7,7 @@ import com.reactnativenavigation.views.collapsingToolbar.behaviours.CollapseBeha
 public class CollapsingTopBarParams {
     public @Nullable String imageUri;
     public @Nullable String reactViewId;
+    public int reactViewHeight;
     public StyleParams.Color scrimColor;
     public CollapseBehaviour collapseBehaviour;
     public boolean expendOnTopTabChange;

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

@@ -32,6 +32,7 @@ class CollapsingTopBarParamsParser extends Parser {
         CollapsingTopBarParams result = new CollapsingTopBarParams();
         result.imageUri = params.getString("collapsingToolBarImage", null);
         result.reactViewId = params.getString("collapsingToolBarComponent", null);
+        result.reactViewHeight = params.getInt("collapsingToolBarComponentHeight");
         result.expendOnTopTabChange = params.getBoolean("expendCollapsingToolBarOnTopTabChange");
         result.scrimColor = getColor(params, "collapsingToolBarCollapsedColor", new StyleParams.Color(Color.WHITE));
         result.showTitleWhenCollapsed = hasReactView;

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

@@ -50,8 +50,9 @@ public class ContentView extends ReactRootView {
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        int measuredHeight = viewMeasurer.getMeasuredHeight(heightMeasureSpec);
         setMeasuredDimension(viewMeasurer.getMeasuredWidth(widthMeasureSpec),
-                viewMeasurer.getMeasuredHeight(heightMeasureSpec));
+                measuredHeight);
     }
 
     @Override

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

@@ -1,22 +0,0 @@
-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

@@ -78,7 +78,8 @@ public class CollapsingTopBar extends TopBar implements CollapsingView {
                     params,
                     new NavigationParams(Bundle.EMPTY),
                     scrollListener);
-            titleBarAndContextualMenuContainer.addView(header, new LayoutParams(MATCH_PARENT, WRAP_CONTENT));
+            LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT, (int) ViewUtils.convertDpToPixel(params.reactViewHeight));
+            titleBarAndContextualMenuContainer.addView(header, lp);
             header.setOnHiddenListener(new CollapsingTopBarReactHeaderAnimator.OnHiddenListener() {
                 @Override
                 public void onHidden() {

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

@@ -38,21 +38,14 @@ public class CollapsingTopBarReactHeader extends ContentView implements Collapsi
         listener = scrollListener;
         ViewConfiguration vc = ViewConfiguration.get(context);
         mTouchSlop = vc.getScaledTouchSlop();
-        setViewMeasurer(new CollapsingReactHeaderMeasurer(this));
-        createVisibilityAnimator(getHeight());
+        createVisibilityAnimator(params.reactViewHeight);
     }
 
-    private void createVisibilityAnimator(final int reactViewHeight) {
-        ViewUtils.runOnPreDraw(this, new Runnable() {
-            @Override
-            public void run() {
-                final CollapsingTopBarReactHeader header = CollapsingTopBarReactHeader.this;
-                float height = ViewUtils.convertDpToPixel(reactViewHeight);
-                visibilityAnimator = new CollapsingTopBarReactHeaderAnimator(header, height * 0.6f, height * 0.60f);
-                visibilityAnimator.setOnHiddenListener(header);
-                visibilityAnimator.setOnVisibleListener(header);
-            }
-        });
+    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);
     }
 
     public void collapse(float amount) {

src/deprecated/platformSpecificDeprecated.android.js

@@ -128,6 +128,7 @@ function convertStyleParams(originalStyleObject) {
     topBarCollapseOnScroll: originalStyleObject.topBarCollapseOnScroll,
     collapsingToolBarImage: originalStyleObject.collapsingToolBarImage,
     collapsingToolBarComponent: originalStyleObject.collapsingToolBarComponent,
+    collapsingToolBarComponentHeight: originalStyleObject.collapsingToolBarComponentHeight,
     collapsingToolBarCollapsedColor: processColor(originalStyleObject.collapsingToolBarCollapsedColor),
     expendCollapsingToolBarOnTopTabChange: originalStyleObject.expendCollapsingToolBarOnTopTabChange,
     titleBarHidden: originalStyleObject.navBarHidden,