Bugfix: ripple effect not correct

Author: duanhong169

text-button/src/main/java/top/defaults/view/LayerDrawableProxy.java

@@ -2,6 +2,7 @@
 
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
+import android.graphics.drawable.RippleDrawable;
 import android.os.Build;
 
 import java.util.ArrayList;
@@ -35,9 +36,25 @@ public LayerDrawableProxy clear() {
 
     public LayerDrawableProxy addLayer(Drawable layer) {
         if (layer == null) return this;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            // Use ripple drawable as layer-list and clear others
+            if (layer instanceof RippleDrawable) {
+                this.layers.clear();
+            }
+        }
+
         this.layers.add(layer);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            layerDrawable.addLayer(layer);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            if (layer instanceof RippleDrawable) {
+                layerDrawable = (RippleDrawable) layer;
+            } else {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    layerDrawable.addLayer(layer);
+                } else {
+                    layerDrawable = new LayerDrawable(layers.toArray(new Drawable[layers.size()]));
+                }
+            }
         } else {
             layerDrawable = new LayerDrawable(layers.toArray(new Drawable[layers.size()]));
         }

text-button/src/main/java/top/defaults/view/RippleEffect.java

@@ -38,16 +38,14 @@ public void init(TextButton textButton) {
 
         ColorStateList colorStateList = new ColorStateList(
                 new int[][]{
-                        new int[]{ android.R.attr.state_pressed },
                         new int[]{} // this should be empty to make default color as we want
                 },
                 new int[]{
-                        textButton.pressedRippleColor,
-                        textButton.defaultRippleColor
+                        textButton.rippleColor
                 }
         );
 
-        ownLayer = new RippleDrawableProxy(colorStateList, null, mask).get();
+        ownLayer = new RippleDrawableProxy(colorStateList, background, mask).get();
         textButton.setBackgroundWithProxy(textButton.getBackgroundProxy().addLayer(ownLayer));
     }
 

text-button/src/main/java/top/defaults/view/TextButton.java

@@ -43,8 +43,7 @@ public class TextButton extends android.support.v7.widget.AppCompatTextView {
     @ColorInt int disabledBackgroundColor;
     @ColorInt int selectedBackgroundColor;
     int backgroundEffectType;
-    @ColorInt int defaultRippleColor;
-    @ColorInt int pressedRippleColor;
+    @ColorInt int rippleColor;
     private EffectSet effects;
 
     private Drawable instinctBackground;
@@ -120,8 +119,7 @@ public TextButton(Context context, @Nullable AttributeSet attrs, int defStyleAtt
         disabledBackgroundColor = getColor(typedArray, R.styleable.TextButton_disabledBackgroundColor, calculateDisabledColor(defaultBackgroundColor));
         selectedBackgroundColor = getColor(typedArray, R.styleable.TextButton_selectedBackgroundColor, calculateSelectedColor(defaultBackgroundColor));
         backgroundEffectType = getInt(typedArray, R.styleable.TextButton_backgroundEffect, BACKGROUND_EFFECT_NONE);
-        defaultRippleColor = getColor(typedArray, R.styleable.TextButton_defaultRippleColor, defaultTextColor);
-        pressedRippleColor = getColor(typedArray, R.styleable.TextButton_pressedRippleColor, pressedTextColor);
+        rippleColor = getColor(typedArray, R.styleable.TextButton_rippleColor, defaultTextColor);
         typedArray.recycle();
 
         instinctBackground = getBackground();

text-button/src/main/res/values/top_defaults_view_attrs.xml

@@ -22,7 +22,6 @@
             <enum name="ripple" value="1"/>
             <enum name="animateColor" value="2"/>
         </attr>
-        <attr name="defaultRippleColor" format="color"/>
-        <attr name="pressedRippleColor" format="color"/>
+        <attr name="rippleColor" format="color"/>
     </declare-styleable>
 </resources>