Преглед изворни кода

Fadeout translucent drawable when collapsing (#788)

* Fadeout translucent drawable when collapsing

* Change default scrim color to none
* Fade out translucent when collapsingToolBarCollapsedColor is not defined
Guy Carmeli пре 7 година
родитељ
комит
475708e644

+ 1
- 2
android/app/src/main/java/com/reactnativenavigation/params/parsers/CollapsingTopBarParamsParser.java Прегледај датотеку

@@ -1,6 +1,5 @@
1 1
 package com.reactnativenavigation.params.parsers;
2 2
 
3
-import android.graphics.Color;
4 3
 import android.os.Bundle;
5 4
 
6 5
 import com.reactnativenavigation.params.CollapsingTopBarParams;
@@ -33,7 +32,7 @@ class CollapsingTopBarParamsParser extends Parser {
33 32
         result.imageUri = params.getString("collapsingToolBarImage", null);
34 33
         result.reactViewId = params.getString("collapsingToolBarComponent", null);
35 34
         result.expendOnTopTabChange = params.getBoolean("expendCollapsingToolBarOnTopTabChange");
36
-        result.scrimColor = getColor(params, "collapsingToolBarCollapsedColor", new StyleParams.Color(Color.WHITE));
35
+        result.scrimColor = getColor(params, "collapsingToolBarCollapsedColor", new StyleParams.Color());
37 36
         result.showTitleWhenCollapsed = hasReactView;
38 37
         result.collapseBehaviour = getCollapseBehaviour();
39 38
         return result;

+ 1
- 1
android/app/src/main/java/com/reactnativenavigation/views/TitleBar.java Прегледај датотеку

@@ -88,7 +88,7 @@ public class TitleBar extends Toolbar {
88 88
 
89 89
     protected void setTranslucent(StyleParams params) {
90 90
         if (params.topBarTranslucent) {
91
-            setBackground(new TranslucentTitleBarBackground());
91
+            setBackground(new TranslucentDrawable());
92 92
         }
93 93
     }
94 94
 

android/app/src/main/java/com/reactnativenavigation/views/TranslucentAndSolidTitleBarBackground.java → android/app/src/main/java/com/reactnativenavigation/views/TitleBarBackground.java Прегледај датотеку

@@ -6,15 +6,20 @@ import android.graphics.drawable.TransitionDrawable;
6 6
 
7 7
 import com.reactnativenavigation.params.StyleParams;
8 8
 
9
-public class TranslucentAndSolidTitleBarBackground extends TransitionDrawable {
9
+public class TitleBarBackground extends TransitionDrawable {
10 10
     private static final int DURATION = 200;
11
+
11 12
     private enum DrawableType {Translucent, Solid}
12 13
 
13 14
     private DrawableType displayedDrawable = DrawableType.Translucent;
14 15
 
15
-    public TranslucentAndSolidTitleBarBackground(StyleParams.Color color) {
16
+    TitleBarBackground(Drawable... drawables) {
17
+        super(drawables);
18
+    }
19
+
20
+    public TitleBarBackground(StyleParams.Color color) {
16 21
         super(new Drawable[] {
17
-                new TranslucentTitleBarBackground(),
22
+                new TranslucentDrawable(),
18 23
                 new ColorDrawable(color.getColor())
19 24
         });
20 25
     }

+ 36
- 0
android/app/src/main/java/com/reactnativenavigation/views/TranslucentDrawable.java Прегледај датотеку

@@ -0,0 +1,36 @@
1
+package com.reactnativenavigation.views;
2
+
3
+import android.graphics.Color;
4
+import android.graphics.LinearGradient;
5
+import android.graphics.Shader;
6
+import android.graphics.drawable.PaintDrawable;
7
+import android.graphics.drawable.ShapeDrawable;
8
+import android.graphics.drawable.shapes.RectShape;
9
+
10
+class TranslucentDrawable extends PaintDrawable {
11
+
12
+    TranslucentDrawable() {
13
+        setShape(new RectShape());
14
+        createShader();
15
+    }
16
+
17
+    private void createShader() {
18
+        ShapeDrawable.ShaderFactory sf = new ShapeDrawable.ShaderFactory() {
19
+            @Override
20
+            public Shader resize(int width, int height) {
21
+                double angleInRadians = Math.toRadians(90);
22
+
23
+                int x1 = (int) (Math.cos(angleInRadians) * width);
24
+                int y1 = (int) (Math.sin(angleInRadians) * height);
25
+                int[] colors = new int[]{Color.argb(90, 0, 0, 0), Color.argb(15, 0, 0, 0), Color.TRANSPARENT};
26
+                float[] positions = {0, 0.78f, 1};
27
+                LinearGradient lg = new LinearGradient(0, 0, x1, y1,
28
+                        colors,
29
+                        positions,
30
+                        Shader.TileMode.REPEAT);
31
+                return lg;
32
+            }
33
+        };
34
+        setShaderFactory(sf);
35
+    }
36
+}

+ 5
- 30
android/app/src/main/java/com/reactnativenavigation/views/TranslucentTitleBarBackground.java Прегледај датотеку

@@ -1,36 +1,11 @@
1 1
 package com.reactnativenavigation.views;
2 2
 
3 3
 import android.graphics.Color;
4
-import android.graphics.LinearGradient;
5
-import android.graphics.Shader;
6
-import android.graphics.drawable.PaintDrawable;
7
-import android.graphics.drawable.ShapeDrawable;
8
-import android.graphics.drawable.shapes.RectShape;
4
+import android.graphics.drawable.ColorDrawable;
9 5
 
10
-class TranslucentTitleBarBackground extends PaintDrawable {
11
-
12
-    TranslucentTitleBarBackground() {
13
-        setShape(new RectShape());
14
-        createShader();
15
-    }
16
-
17
-    private void createShader() {
18
-        ShapeDrawable.ShaderFactory sf = new ShapeDrawable.ShaderFactory() {
19
-            @Override
20
-            public Shader resize(int width, int height) {
21
-                double angleInRadians = Math.toRadians(90);
22
-
23
-                int x1 = (int) (Math.cos(angleInRadians) * width);
24
-                int y1 = (int) (Math.sin(angleInRadians) * height);
25
-                int[] colors = new int[]{Color.argb(90, 0, 0, 0), Color.argb(15, 0, 0, 0), Color.TRANSPARENT};
26
-                float[] positions = {0, 0.78f, 1};
27
-                LinearGradient lg = new LinearGradient(0, 0, x1, y1,
28
-                        colors,
29
-                        positions,
30
-                        Shader.TileMode.REPEAT);
31
-                return lg;
32
-            }
33
-        };
34
-        setShaderFactory(sf);
6
+public class TranslucentTitleBarBackground extends TitleBarBackground {
7
+    public TranslucentTitleBarBackground() {
8
+        super(new TranslucentDrawable(), new ColorDrawable(Color.TRANSPARENT));
9
+        setCrossFadeEnabled(true);
35 10
     }
36 11
 }

+ 13
- 15
android/app/src/main/java/com/reactnativenavigation/views/collapsingToolbar/CollapsingTitleBar.java Прегледај датотеку

@@ -1,7 +1,6 @@
1 1
 package com.reactnativenavigation.views.collapsingToolbar;
2 2
 
3 3
 import android.content.Context;
4
-import android.support.annotation.Nullable;
5 4
 import android.view.MotionEvent;
6 5
 import android.view.View;
7 6
 
@@ -9,14 +8,15 @@ import com.reactnativenavigation.params.CollapsingTopBarParams;
9 8
 import com.reactnativenavigation.params.StyleParams;
10 9
 import com.reactnativenavigation.utils.ViewUtils;
11 10
 import com.reactnativenavigation.views.TitleBar;
12
-import com.reactnativenavigation.views.TranslucentAndSolidTitleBarBackground;
11
+import com.reactnativenavigation.views.TitleBarBackground;
12
+import com.reactnativenavigation.views.TranslucentTitleBarBackground;
13 13
 
14 14
 public class CollapsingTitleBar extends TitleBar implements View.OnTouchListener {
15 15
     private CollapsingTextView title;
16 16
     private int collapsedHeight;
17 17
     private final ScrollListener scrollListener;
18 18
     private final CollapsingTopBarParams params;
19
-    private @Nullable TranslucentAndSolidTitleBarBackground titleBarBackground;
19
+    private TitleBarBackground titleBarBackground;
20 20
 
21 21
     public CollapsingTitleBar(Context context, int collapsedHeight, ScrollListener scrollListener, CollapsingTopBarParams params) {
22 22
         super(context);
@@ -45,17 +45,13 @@ public class CollapsingTitleBar extends TitleBar implements View.OnTouchListener
45 45
     @Override
46 46
     public void hideTitle() {
47 47
         super.hideTitle();
48
-        if (titleBarBackground != null) {
49
-            titleBarBackground.showTranslucentBackground();
50
-        }
48
+        titleBarBackground.showTranslucentBackground();
51 49
     }
52 50
 
53 51
     @Override
54 52
     public void showTitle() {
55 53
         super.showTitle();
56
-        if (titleBarBackground != null) {
57
-            titleBarBackground.showSolidBackground();
58
-        }
54
+        titleBarBackground.showSolidBackground();
59 55
     }
60 56
 
61 57
     private void addCollapsingTitle() {
@@ -92,12 +88,14 @@ public class CollapsingTitleBar extends TitleBar implements View.OnTouchListener
92 88
 
93 89
     @Override
94 90
     protected void setBackground(StyleParams params) {
95
-        if (hasTranslucentAndSolidBackground(params)) {
96
-            titleBarBackground = new TranslucentAndSolidTitleBarBackground(params.collapsingTopBarParams.scrimColor);
97
-            setBackground(titleBarBackground);
98
-        } else {
99
-            setTranslucent(params);
100
-        }
91
+        titleBarBackground = createBackground(params);
92
+        setBackground(titleBarBackground);
93
+    }
94
+
95
+    private TitleBarBackground createBackground(StyleParams params) {
96
+        return hasTranslucentAndSolidBackground(params) ?
97
+            new TitleBarBackground(params.collapsingTopBarParams.scrimColor) :
98
+            new TranslucentTitleBarBackground();
101 99
     }
102 100
 
103 101
     private boolean hasTranslucentAndSolidBackground(StyleParams params) {