Implement collapsingToolBarExpendedColor and showTitleWhenExpended (#793)

collapsingToolBarExpendedColor - determines the TitleBar color in expended mode
showTitleWhenExpended - defaults to true when expended color is defined.

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

@@ -10,7 +10,9 @@ public class CollapsingTopBarParams {
     public StyleParams.Color scrimColor;
     public CollapseBehaviour collapseBehaviour;
     public boolean expendOnTopTabChange;
+    public boolean showTitleWhenExpended;
     public boolean showTitleWhenCollapsed;
+    public StyleParams.Color expendedTitleBarColor;
 
     public boolean hasBackgroundImage() {
         return imageUri != null;

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

@@ -35,6 +35,10 @@ public class StyleParams {
         public String getHexColor() {
             return String.format("#%06X", (0xFFFFFF & getColor()));
         }
+
+        public int getColor(int defaultColor) {
+            return hasColor() ? getColor() : defaultColor;
+        }
     }
 
     public Color statusBarColor;

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

@@ -33,7 +33,9 @@ class CollapsingTopBarParamsParser extends Parser {
         result.reactViewId = params.getString("collapsingToolBarComponent", null);
         result.expendOnTopTabChange = params.getBoolean("expendCollapsingToolBarOnTopTabChange");
         result.scrimColor = getColor(params, "collapsingToolBarCollapsedColor", new StyleParams.Color());
+        result.expendedTitleBarColor = getColor(params, "collapsingToolBarExpendedColor", new StyleParams.Color());
         result.showTitleWhenCollapsed = hasReactView;
+        result.showTitleWhenExpended = params.getBoolean("showTitleWhenExpended", result.expendedTitleBarColor.hasColor());
         result.collapseBehaviour = getCollapseBehaviour();
         return result;
     }

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

@@ -1,11 +1,8 @@
 package com.reactnativenavigation.views;
 
-import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.TransitionDrawable;
 
-import com.reactnativenavigation.params.StyleParams;
-
 public class TitleBarBackground extends TransitionDrawable {
     private static final int DURATION = 200;
 
@@ -13,17 +10,10 @@ public class TitleBarBackground extends TransitionDrawable {
 
     private DrawableType displayedDrawable = DrawableType.Translucent;
 
-    TitleBarBackground(Drawable... drawables) {
+    public TitleBarBackground(Drawable... drawables) {
         super(drawables);
     }
 
-    public TitleBarBackground(StyleParams.Color color) {
-        super(new Drawable[] {
-                new TranslucentDrawable(),
-                new ColorDrawable(color.getColor())
-        });
-    }
-
     public void showTranslucentBackground() {
         if (displayedDrawable == DrawableType.Translucent) {
             return;

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

@@ -7,9 +7,9 @@ import android.graphics.drawable.PaintDrawable;
 import android.graphics.drawable.ShapeDrawable;
 import android.graphics.drawable.shapes.RectShape;
 
-class TranslucentDrawable extends PaintDrawable {
+public class TranslucentDrawable extends PaintDrawable {
 
-    TranslucentDrawable() {
+    public TranslucentDrawable() {
         setShape(new RectShape());
         createShader();
     }

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

@@ -1,11 +0,0 @@
-package com.reactnativenavigation.views;
-
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-
-public class TranslucentTitleBarBackground extends TitleBarBackground {
-    public TranslucentTitleBarBackground() {
-        super(new TranslucentDrawable(), new ColorDrawable(Color.TRANSPARENT));
-        setCrossFadeEnabled(true);
-    }
-}

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

@@ -1,6 +1,9 @@
 package com.reactnativenavigation.views.collapsingToolbar;
 
 import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
 import android.view.MotionEvent;
 import android.view.View;
 
@@ -9,7 +12,7 @@ import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.views.TitleBar;
 import com.reactnativenavigation.views.TitleBarBackground;
-import com.reactnativenavigation.views.TranslucentTitleBarBackground;
+import com.reactnativenavigation.views.TranslucentDrawable;
 
 public class CollapsingTitleBar extends TitleBar implements View.OnTouchListener {
     private CollapsingTextView title;
@@ -25,26 +28,32 @@ public class CollapsingTitleBar extends TitleBar implements View.OnTouchListener
         this.params = params;
         addCollapsingTitle();
         setOnTouchListener(this);
-        hideTitle(params);
+        setInitialTitleViewVisibility();
     }
 
-    private void hideTitle(CollapsingTopBarParams params) {
-        if (params.showTitleWhenCollapsed) {
-            ViewUtils.runOnPreDraw(this, new Runnable() {
-                @Override
-                public void run() {
-                    View titleView = getTitleView();
-                    if (titleView != null) {
-                        titleView.setAlpha(0);
-                    }
+    private void setInitialTitleViewVisibility() {
+        ViewUtils.runOnPreDraw(this, new Runnable() {
+            @Override
+            public void run() {
+                View titleView = getTitleView();
+                if (titleView == null) {
+                    return;
                 }
-            });
-        }
+                if (params.showTitleWhenExpended) {
+                    titleView.setAlpha(1);
+                } else if (params.showTitleWhenCollapsed) {
+                    titleView.setAlpha(0);
+                }
+            }
+        });
+
     }
 
     @Override
     public void hideTitle() {
-        super.hideTitle();
+        if (!params.showTitleWhenExpended) {
+            super.hideTitle();
+        }
         titleBarBackground.showTranslucentBackground();
     }
 
@@ -88,18 +97,16 @@ public class CollapsingTitleBar extends TitleBar implements View.OnTouchListener
 
     @Override
     protected void setBackground(StyleParams params) {
-        titleBarBackground = createBackground(params);
+        titleBarBackground = createBackground(params,
+                params.collapsingTopBarParams.expendedTitleBarColor,
+                params.collapsingTopBarParams.scrimColor);
         setBackground(titleBarBackground);
     }
 
-    private TitleBarBackground createBackground(StyleParams params) {
-        return hasTranslucentAndSolidBackground(params) ?
-            new TitleBarBackground(params.collapsingTopBarParams.scrimColor) :
-            new TranslucentTitleBarBackground();
-    }
-
-    private boolean hasTranslucentAndSolidBackground(StyleParams params) {
-        return params.topBarTranslucent && params.collapsingTopBarParams.scrimColor.hasColor();
+    private TitleBarBackground createBackground(StyleParams styleParams, StyleParams.Color expendedColor, StyleParams.Color collapsedColor) {
+        final Drawable expendedDrawable = styleParams.topBarTranslucent ? new TranslucentDrawable() : new ColorDrawable(expendedColor.getColor(Color.TRANSPARENT));
+        final Drawable collapsedDrawable = new ColorDrawable(collapsedColor.getColor(Color.TRANSPARENT));
+        return new TitleBarBackground(expendedDrawable, collapsedDrawable);
     }
 
     public void collapse(CollapseAmount amount) {

src/deprecated/platformSpecificDeprecated.android.js

@@ -130,6 +130,8 @@ function convertStyleParams(originalStyleObject) {
     collapsingToolBarComponent: originalStyleObject.collapsingToolBarComponent,
     collapsingToolBarComponentHeight: originalStyleObject.collapsingToolBarComponentHeight,
     collapsingToolBarCollapsedColor: processColor(originalStyleObject.collapsingToolBarCollapsedColor),
+    collapsingToolBarExpendedColor: processColor(originalStyleObject.collapsingToolBarExpendedColor),
+    showTitleWhenExpended: originalStyleObject.showTitleWhenExpended,
     expendCollapsingToolBarOnTopTabChange: originalStyleObject.expendCollapsingToolBarOnTopTabChange,
     titleBarHidden: originalStyleObject.navBarHidden,
     titleBarHideOnScroll: originalStyleObject.navBarHideOnScroll,