Less intrusive collapse (#590)

* Less intrusive collapsing implementation

In order for a screen to implement collapsingTopBar, it had to define
a specific set of style properties such as drawUnderTabBar or
drawUnderNavBar. This commit aims to make implementing collapsingTopBar
less intrusive by inferring these properties from hideTitleBarOnScroll.

This commit introduces a few fixes and changes related to
the collapsingTopBar mechanism.

1. Screens are now drawn under bottomTabs if titleBarHideOnScroll
   is true.

2. TitleBarHideOnScroll can be passed in AppStyle.

3. ScrollView is detected properly after it gets detached due to large
   diff in render.

4. Take BottomTabs height into account when measuring collapsing
   screens.

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

@@ -12,13 +12,17 @@ import com.reactnativenavigation.views.collapsingToolbar.behaviours.TitleBarHide
 
 class CollapsingTopBarParamsParser extends Parser {
     private Bundle params;
+    private boolean titleBarHideOnScroll;
+    private boolean drawBelowTopBar;
 
-    CollapsingTopBarParamsParser(Bundle params) {
+    CollapsingTopBarParamsParser(Bundle params, boolean titleBarHideOnScroll, boolean drawBelowTopBar) {
         this.params = params;
+        this.titleBarHideOnScroll = titleBarHideOnScroll;
+        this.drawBelowTopBar = drawBelowTopBar;
     }
 
     public CollapsingTopBarParams parse() {
-        if (!hasBackgroundImage() && !shouldHideTitleBarOnScroll()) {
+        if (!hasBackgroundImage() && !titleBarHideOnScroll) {
             return null;
         }
 
@@ -35,7 +39,7 @@ class CollapsingTopBarParamsParser extends Parser {
         if (hasBackgroundImage()) {
             return new CollapseTopBarBehaviour();
         }
-        if (shouldHideTitleBarOnScroll() && params.getBoolean("drawBelowTopBar", false)) {
+        if (titleBarHideOnScroll && drawBelowTopBar) {
             return new CollapseTitleBarBehaviour();
         }
         return new TitleBarHideOnScrollBehaviour();
@@ -44,8 +48,4 @@ class CollapsingTopBarParamsParser extends Parser {
     private boolean hasBackgroundImage() {
         return params.containsKey("collapsingToolBarImage");
     }
-
-    private boolean shouldHideTitleBarOnScroll() {
-        return params.getBoolean("titleBarHideOnScroll", false);
-    }
 }

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

@@ -14,26 +14,28 @@ public class StyleParamsParser {
     }
 
     public StyleParams parse() {
-        StyleParams result = new StyleParams();
         if (params == null) {
-            result.titleBarDisabledButtonColor = getTitleBarDisabledButtonColor();
-            result.topBarElevationShadowEnabled = true;
-            return result;
+            return createDefaultStyleParams();
         }
 
+        StyleParams result = new StyleParams();
         result.statusBarColor = getColor("statusBarColor", getDefaultStatusBarColor());
         result.contextualMenuStatusBarColor = getColor("contextualMenuStatusBarColor", getDefaultContextualMenuStatusBarColor());
         result.contextualMenuButtonsColor = getColor("contextualMenuButtonsColor", getDefaultContextualMenuButtonsColor());
         result.contextualMenuBackgroundColor = getColor("contextualMenuBackgroundColor", getDefaultContextualMenuBackgroundColor());
 
         result.topBarColor = getColor("topBarColor", getDefaultTopBarColor());
-        result.collapsingTopBarParams = new CollapsingTopBarParamsParser(params).parse();
-        result.titleBarHidden = getBoolean("titleBarHidden", getDefaultTopBarHidden());
+        result.titleBarHideOnScroll = getBoolean("titleBarHideOnScroll", getDefaultTitleBarHideOnScroll());
         result.topBarTransparent = getBoolean("topBarTransparent", getDefaultTopBarHidden());
+        result.drawScreenBelowTopBar = params.getBoolean("drawBelowTopBar", getDefaultScreenBelowTopBar());
+        if (result.topBarTransparent) {
+            result.drawScreenBelowTopBar = false;
+        }
+        result.collapsingTopBarParams = new CollapsingTopBarParamsParser(params, result.titleBarHideOnScroll, result.drawScreenBelowTopBar).parse();
+        result.titleBarHidden = getBoolean("titleBarHidden", getDefaultTopBarHidden());
         result.topBarElevationShadowEnabled = getBoolean("topBarElevationShadowEnabled", getDefaultTopBarElevationShadowEnabled());
         result.titleBarTitleColor = getColor("titleBarTitleColor", getDefaultTitleBarColor());
         result.topBarTranslucent = getBoolean("topBarTranslucent", getDefaultTopBarTranslucent());
-        result.titleBarHideOnScroll = getBoolean("titleBarHideOnScroll", getDefaultTitleBarHideOnScroll());
 
         result.titleBarSubtitleColor = getColor("titleBarSubtitleColor", getDefaultSubtitleBarColor());
         result.titleBarButtonColor = getColor("titleBarButtonColor", getTitleBarButtonColor());
@@ -46,18 +48,13 @@ public class StyleParamsParser {
         result.selectedTopTabIndicatorHeight = getInt("selectedTopTabIndicatorHeight", getDefaultSelectedTopTabIndicatorHeight());
         result.selectedTopTabIndicatorColor = getColor("selectedTopTabIndicatorColor", getDefaultSelectedTopTabIndicatorColor());
 
-        result.drawScreenBelowTopBar = params.getBoolean("drawBelowTopBar", getDefaultScreenBelowTopBar());
-        if (result.topBarTransparent) {
-            result.drawScreenBelowTopBar = false;
-        }
-
         result.screenBackgroundColor = getColor("screenBackgroundColor", getDefaultScreenBackgroundColor());
 
         result.bottomTabsHidden = getBoolean("bottomTabsHidden", getDefaultBottomTabsHidden());
         result.drawScreenAboveBottomTabs = !result.bottomTabsHidden &&
                                            params.getBoolean("drawScreenAboveBottomTabs", getDefaultDrawScreenAboveBottomTabs());
-        result.bottomTabsHiddenOnScroll =
-                getBoolean("bottomTabsHiddenOnScroll", getDefaultBottomTabsHiddenOnScroll());
+        result.drawScreenAboveBottomTabs = drawScreenUnderBottomTabsIfTitleBarIsHiddenOnScroll(result);
+        result.bottomTabsHiddenOnScroll = getBoolean("bottomTabsHiddenOnScroll", getDefaultBottomTabsHiddenOnScroll());
         result.bottomTabsColor = getColor("bottomTabsColor", getDefaultBottomTabsColor());
         result.bottomTabsButtonColor = getColor("bottomTabsButtonColor", getDefaultBottomTabsButtonColor());
         result.selectedBottomTabsButtonColor =
@@ -71,6 +68,18 @@ public class StyleParamsParser {
         return result;
     }
 
+    private StyleParams createDefaultStyleParams() {
+        StyleParams result = new StyleParams();
+        result.titleBarDisabledButtonColor = getTitleBarDisabledButtonColor();
+        result.topBarElevationShadowEnabled = true;
+        result.titleBarHideOnScroll = false;
+        return result;
+    }
+
+    private boolean drawScreenUnderBottomTabsIfTitleBarIsHiddenOnScroll(StyleParams result) {
+        return !result.titleBarHideOnScroll;
+    }
+
     private StyleParams.Color getDefaultContextualMenuStatusBarColor() {
         return new StyleParams.Color(Color.parseColor("#7c7c7c"));
     }

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

@@ -38,13 +38,17 @@ public class CollapsingSingleScreen extends SingleScreen {
     @Override
     protected void createContent() {
         contentView = new CollapsingContentView(getContext(), screenParams.screenId, screenParams.navigationParams);
-        if (screenParams.styleParams.drawScreenBelowTopBar) {
-            contentView.setViewMeasurer(new CollapsingViewMeasurer((CollapsingTopBar) topBar, this));
-        }
+        setViewMeasurer();
         setupCollapseDetection((CollapsingTopBar) topBar);
         addView(contentView, createLayoutParams());
     }
 
+    private void setViewMeasurer() {
+        if (screenParams.styleParams.drawScreenBelowTopBar || screenParams.styleParams.drawScreenAboveBottomTabs) {
+            contentView.setViewMeasurer(new CollapsingViewMeasurer((CollapsingTopBar) topBar, this, screenParams.styleParams));
+        }
+    }
+
     private void setupCollapseDetection(final CollapsingTopBar topBar) {
         ((CollapsingContentView) contentView).setupCollapseDetection(getScrollListener(topBar), new OnScrollViewAddedListener() {
             @Override

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

@@ -1,5 +1,6 @@
 package com.reactnativenavigation.screens;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.AppCompatActivity;
@@ -19,13 +20,14 @@ import com.reactnativenavigation.views.collapsingToolbar.CollapsingTopBar;
 import com.reactnativenavigation.views.collapsingToolbar.CollapsingView;
 import com.reactnativenavigation.views.collapsingToolbar.CollapsingViewMeasurer;
 import com.reactnativenavigation.views.collapsingToolbar.CollapsingViewPager;
+import com.reactnativenavigation.views.collapsingToolbar.CollapsingViewPagerContentViewMeasurer;
 import com.reactnativenavigation.views.collapsingToolbar.OnScrollListener;
 import com.reactnativenavigation.views.collapsingToolbar.OnScrollViewAddedListener;
 import com.reactnativenavigation.views.collapsingToolbar.ScrollListener;
 import com.reactnativenavigation.views.collapsingToolbar.behaviours.CollapseBehaviour;
 
+@SuppressLint("ViewConstructor")
 public class CollapsingViewPagerScreen extends ViewPagerScreen {
-
     public CollapsingViewPagerScreen(AppCompatActivity activity, ScreenParams screenParams, LeftButtonOnClickListener backButtonListener) {
         super(activity, screenParams, backButtonListener);
     }
@@ -49,7 +51,7 @@ public class CollapsingViewPagerScreen extends ViewPagerScreen {
     protected ContentView createContentView(PageParams tab) {
         if (tab.hasCollapsingTopBar()) {
             CollapsingContentView contentView = new CollapsingContentView(getContext(), tab.screenId, tab.navigationParams);
-            contentView.setViewMeasurer(new CollapsingViewMeasurer((CollapsingTopBar) topBar, this));
+            contentView.setViewMeasurer(new CollapsingViewPagerContentViewMeasurer((CollapsingTopBar) topBar, this, screenParams.styleParams));
             setupCollapseDetection(contentView);
             return contentView;
         } else {

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

@@ -1,5 +1,6 @@
 package com.reactnativenavigation.views;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.support.annotation.Nullable;
 import android.view.MotionEvent;
@@ -15,6 +16,7 @@ import com.reactnativenavigation.views.collapsingToolbar.ScrollViewDelegate;
 import com.reactnativenavigation.views.collapsingToolbar.ViewCollapser;
 import com.reactnativenavigation.views.utils.ScrollViewDetector;
 
+@SuppressLint("ViewConstructor")
 public class CollapsingContentView extends ContentView implements CollapsingView {
 
     private @Nullable ScrollViewDelegate scrollViewDelegate;
@@ -46,7 +48,7 @@ public class CollapsingContentView extends ContentView implements CollapsingView
     public void onViewAdded(final View child) {
         super.onViewAdded(child);
         if (scrollViewDetector != null) {
-            scrollViewDetector.detectScrollViewAdded(child);
+            scrollViewDetector.findScrollView(child);
         }
     }
 

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

@@ -1,20 +1,30 @@
 package com.reactnativenavigation.views.collapsingToolbar;
 
+import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.screens.Screen;
 import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.views.utils.ViewMeasurer;
 
 public class CollapsingViewMeasurer extends ViewMeasurer {
-    private int collapsedTopBarHeight;
-    private float getFinalCollapseValue;
-    private int screenHeight;
+
+    int collapsedTopBarHeight;
+    private float finalCollapseValue;
+    int screenHeight;
+    int bottomTabsHeight = 0;
+    boolean bottomTabsHidden;
+
+    public CollapsingViewMeasurer(CollapsingTopBar topBar, Screen screen, StyleParams styleParams) {
+        this(topBar, screen);
+        bottomTabsHidden = styleParams.bottomTabsHidden;
+        bottomTabsHeight = (int) ViewUtils.convertDpToPixel(56);
+    }
 
     public CollapsingViewMeasurer(final CollapsingTopBar topBar, final Screen collapsingSingleScreen) {
         ViewUtils.runOnPreDraw(topBar, new Runnable() {
             @Override
             public void run() {
                 collapsedTopBarHeight = topBar.getCollapsedHeight();
-                getFinalCollapseValue = topBar.getFinalCollapseValue();
+                finalCollapseValue = topBar.getFinalCollapseValue();
             }
         });
 
@@ -27,11 +37,11 @@ public class CollapsingViewMeasurer extends ViewMeasurer {
     }
 
     public float getFinalCollapseValue() {
-        return getFinalCollapseValue;
+        return finalCollapseValue;
     }
 
     @Override
     public int getMeasuredHeight(int heightMeasureSpec) {
-        return screenHeight - collapsedTopBarHeight;
+        return screenHeight - collapsedTopBarHeight + (bottomTabsHidden ? bottomTabsHeight : 0);
     }
 }

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

@@ -0,0 +1,16 @@
+package com.reactnativenavigation.views.collapsingToolbar;
+
+import com.reactnativenavigation.params.StyleParams;
+import com.reactnativenavigation.screens.Screen;
+
+public class CollapsingViewPagerContentViewMeasurer extends CollapsingViewMeasurer {
+
+    public CollapsingViewPagerContentViewMeasurer(CollapsingTopBar topBar, Screen screen, StyleParams styleParams) {
+        super(topBar, screen, styleParams);
+    }
+
+    @Override
+    public int getMeasuredHeight(int heightMeasureSpec) {
+        return screenHeight - collapsedTopBarHeight - (bottomTabsHidden ? 0 : bottomTabsHeight);
+    }
+}

android/app/src/main/java/com/reactnativenavigation/views/utils/ScrollViewDetector.java

@@ -2,6 +2,7 @@ package com.reactnativenavigation.views.utils;
 
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
 import android.widget.ScrollView;
 
 import com.reactnativenavigation.utils.ViewUtils;
@@ -10,57 +11,70 @@ import com.reactnativenavigation.views.collapsingToolbar.OnScrollViewAddedListen
 import com.reactnativenavigation.views.collapsingToolbar.ScrollViewDelegate;
 
 public class ScrollViewDetector {
+    private static final boolean SCROLLVIEW_FOUND = true;
+    private static final boolean SCROLLVIEW_NOT_FOUND = false;
     private OnScrollViewAddedListener scrollViewAddedListener;
     private ScrollViewDelegate scrollViewDelegate;
-    private View.OnAttachStateChangeListener stateChangeListener;
+    private View.OnAttachStateChangeListener scrollViewStateChangeListener;
+    private ViewTreeObserver.OnGlobalLayoutListener scrollViewDetectorListener;
 
-    public ScrollViewDetector(final ContentView contentView,
-                              OnScrollViewAddedListener onScrollViewAddedListener,
-                              final ScrollViewDelegate scrollViewDelegate) {
+    public ScrollViewDetector(ContentView contentView, OnScrollViewAddedListener onScrollViewAddedListener,
+                              ScrollViewDelegate scrollViewDelegate) {
         this.scrollViewAddedListener = onScrollViewAddedListener;
         this.scrollViewDelegate = scrollViewDelegate;
-        stateChangeListener = new View.OnAttachStateChangeListener() {
-            @Override
-            public void onViewAttachedToWindow(View v) {
-
-            }
+        scrollViewStateChangeListener = createScrollViewStateChangeListener(contentView, scrollViewDelegate);
+    }
 
+    private StateChangeListenerAdapter createScrollViewStateChangeListener(final ContentView contentView, final ScrollViewDelegate scrollViewDelegate) {
+        return new StateChangeListenerAdapter() {
             @Override
-            public void onViewDetachedFromWindow(View v) {
+            public void onViewDetachedFromWindow(View scrollView) {
                 scrollViewDelegate.getScrollView().removeOnAttachStateChangeListener(this);
                 scrollViewDelegate.onScrollViewRemoved();
-                contentView.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        detectScrollViewAdded(contentView);
+                detectScrollView(scrollViewDelegate, contentView);
+            }
+        };
+    }
+
+    private void detectScrollView(final ScrollViewDelegate scrollViewDelegate, final ContentView contentView) {
+        scrollViewDetectorListener = new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                if (!scrollViewDelegate.hasScrollView()) {
+                    if (findScrollView(contentView) && contentView.getViewTreeObserver().isAlive()) {
+                        contentView.getViewTreeObserver().removeOnGlobalLayoutListener(scrollViewDetectorListener);
                     }
-                });
+                }
             }
         };
+        contentView.getViewTreeObserver().addOnGlobalLayoutListener(scrollViewDetectorListener);
     }
 
-    public void detectScrollViewAdded(View child) {
+    public boolean findScrollView(View child) {
         if (child instanceof ScrollView) {
-            onScrollViewAdded((ScrollView) child);
+            onScrollViewFound((ScrollView) child);
+            return SCROLLVIEW_FOUND;
         } else if (child instanceof ViewGroup) {
             Object maybeScrollView = ViewUtils.findChildByClass((ViewGroup) child, ScrollView.class);
             if (maybeScrollView instanceof ScrollView) {
-                onScrollViewAdded((ScrollView) maybeScrollView);
+                onScrollViewFound((ScrollView) maybeScrollView);
+                return SCROLLVIEW_FOUND;
             }
         }
+        return SCROLLVIEW_NOT_FOUND;
     }
 
-    private void onScrollViewAdded(final ScrollView scrollView) {
+    private void onScrollViewFound(final ScrollView scrollView) {
         if (scrollViewDelegate != null && !scrollViewDelegate.hasScrollView()) {
             scrollViewDelegate.onScrollViewAdded(scrollView);
             scrollViewAddedListener.onScrollViewAdded(scrollView);
-            scrollView.addOnAttachStateChangeListener(stateChangeListener);
+            scrollView.addOnAttachStateChangeListener(scrollViewStateChangeListener);
         }
     }
 
     public void destroy() {
         if (scrollViewDelegate.getScrollView() != null) {
-            scrollViewDelegate.getScrollView().removeOnAttachStateChangeListener(stateChangeListener);
+            scrollViewDelegate.getScrollView().removeOnAttachStateChangeListener(scrollViewStateChangeListener);
         }
     }
 }

android/app/src/main/java/com/reactnativenavigation/views/utils/StateChangeListenerAdapter.java

@@ -0,0 +1,15 @@
+package com.reactnativenavigation.views.utils;
+
+import android.view.View;
+
+class StateChangeListenerAdapter implements View.OnAttachStateChangeListener {
+    @Override
+    public void onViewAttachedToWindow(View view) {
+
+    }
+
+    @Override
+    public void onViewDetachedFromWindow(View view) {
+
+    }
+}