Fixed striped button,

Fixed animated drawable

Author: nikartx

app/src/main/java/com/github/nikartm/strippedprogressbutton/MainActivity.java

@@ -1,7 +1,7 @@
 package com.github.nikartm.strippedprogressbutton;
 
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 import android.widget.Button;
 
 import com.github.nikartm.support.StripedProgressButton;

app/src/main/res/layout/activity_main.xml

@@ -24,10 +24,9 @@
         android:layout_marginEnd="16dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:background="@drawable/btn_rounded"
         android:text="Example"
         android:textColor="#ffffff"
-        app:spb_active="true"
+        app:spb_cornerRadius="50"
         app:spb_duration="250" />
 
     <Button

support/src/main/java/com/github/nikartm/support/AnimatedStripedDrawable.java

@@ -25,16 +25,17 @@
  */
 public class AnimatedStripedDrawable extends Drawable implements Animatable {
 
-    private float stripeWidth = Constants.STRIPE_WIDTH;
-    private int colorBack = Constants.DEF_BACKGROUND;
-    private int colorMain = Constants.DEF_MAIN_STRIPE;
-    private int colorSub = Constants.DEF_SUB_STRIPE;
-    private float alpha = Constants.STRIPE_ALPHA;
-    private float cornerRadius = Constants.CORNER;
-    private int duration = Constants.DURATION;
-    private float tilt = Constants.STRIPE_TILT;
-    private boolean stripeRevert = Constants.REVERT;
-    private boolean showStripes = Constants.SHOW_STRIPES;
+    private float stripeWidth;
+    private int colorBack;
+    private int colorMain;
+    private int colorSub;
+    private float alpha;
+    private float cornerRadius;
+    private int duration;
+    private float tilt;
+    private boolean stripeRevert;
+    private boolean showStripes;
+    private boolean stripeGradient;
 
     private float density;
     private int viewHeight;
@@ -45,6 +46,7 @@ public class AnimatedStripedDrawable extends Drawable implements Animatable {
 
     private Context context;
     private ValueAnimator animator;
+    private Shader stripesShader;
 
     public AnimatedStripedDrawable(Context context) {
         this.context = context;
@@ -90,11 +92,11 @@ protected void onBoundsChange(Rect bounds) {
         density = context.getResources().getDisplayMetrics().density;
         viewHeight = bounds.height();
         viewWidth = bounds.width();
-        stripeWidthToDp();
+        adjustStripes();
         defineTilt();
     }
 
-    private void stripeWidthToDp() {
+    private void adjustStripes() {
         stripeWidth = stripeWidth * density;
     }
 
@@ -139,25 +141,38 @@ public void draw(@NonNull Canvas canvas) {
 
     private void drawStripes(Canvas canvas) {
         final Paint paintBack = new Paint(Paint.ANTI_ALIAS_FLAG);
-        final Paint paintCorner = new Paint(Paint.ANTI_ALIAS_FLAG);
+        final Paint paintStripes = new Paint(Paint.ANTI_ALIAS_FLAG);
         final Rect rect = new Rect(0, 0, viewWidth, viewHeight);
         final RectF rectF = new RectF(rect);
+        final int stripesAlpha = Util.computeAlpha(alpha);
+
+        if (stripeGradient) {
+            stripesShader = createGradientShader();
+        } else {
+            stripesShader = createShader();
+        }
 
         paintBack.setColor(colorBack);
         canvas.drawRoundRect(rectF, cornerRadius, cornerRadius, paintBack);
 
         if (showStripes) {
-            Shader shader = createShader();
-            paintCorner.setShader(shader);
-            paintCorner.setAlpha(Util.computeAlpha(alpha));
-            canvas.drawRoundRect(rectF, cornerRadius, cornerRadius, paintCorner);
+            paintStripes.setAlpha(stripesAlpha);
+            paintStripes.setShader(stripesShader);
+            canvas.drawRoundRect(rectF, cornerRadius, cornerRadius, paintStripes);
         }
     }
 
-    private Shader createShader() {
+    @NonNull
+    private LinearGradient createShader() {
+        return new LinearGradient(stripeWidth, tiltLeft, 0, tiltRight,
+                new int[] { colorMain, colorSub }, new float[] { .5f, .5f },
+                Shader.TileMode.REPEAT);
+    }
+
+    @NonNull
+    private LinearGradient createGradientShader() {
         return new LinearGradient(stripeWidth, tiltLeft, 0, tiltRight,
-                new int[] { colorMain, colorSub },
-                new float[] { 0.5f, 0.5f }, Shader.TileMode.REPEAT);
+                colorMain, colorSub, Shader.TileMode.REPEAT);
     }
 
     private void startAnimation() {
@@ -188,6 +203,7 @@ public void start() {
         }
         running = true;
         animator.start();
+        setShowStripes(true);
         invalidateSelf();
     }
 
@@ -198,6 +214,7 @@ public void stop() {
         }
         running = false;
         animator.cancel();
+        setShowStripes(false);
         invalidateSelf();
     }
 
@@ -305,4 +322,14 @@ public AnimatedStripedDrawable setShowStripes(boolean showStripes) {
         invalidateSelf();
         return this;
     }
+
+    public boolean isStripeGradient() {
+        return stripeGradient;
+    }
+
+    public AnimatedStripedDrawable setStripeGradient(boolean stripeGradient) {
+        this.stripeGradient = stripeGradient;
+        invalidateSelf();
+        return this;
+    }
 }

support/src/main/java/com/github/nikartm/support/AttributeController.java

@@ -5,18 +5,17 @@
 import android.util.AttributeSet;
 
 import com.github.nikartm.support.constant.Constants;
-import com.github.nikartm.support.model.StrippedButton;
 
 /**
  * @author Ivan V on 29.03.2018.
  * @version 1.0
  */
 public class AttributeController {
 
-    private StrippedButton button;
+    private AnimatedStripedDrawable drawable;
 
     public AttributeController(Context context, AttributeSet attrs) {
-        button = new StrippedButton();
+        drawable = new AnimatedStripedDrawable(context);
         initAttrs(context, attrs);
     }
 
@@ -33,26 +32,26 @@ private void initAttrs(Context context, AttributeSet attrs) {
             float cornerRadius = typedArray.getFloat(R.styleable.StripedProgressButton_spb_cornerRadius, Constants.CORNER);
             boolean stripeRevert = typedArray.getBoolean(R.styleable.StripedProgressButton_spb_stripeRevert, Constants.REVERT);
             boolean showStripes = typedArray.getBoolean(R.styleable.StripedProgressButton_spb_showStripes, Constants.SHOW_STRIPES);
-            boolean active = typedArray.getBoolean(R.styleable.StripedProgressButton_spb_active, Constants.ACTIVE);
+            boolean stripeGradient = typedArray.getBoolean(R.styleable.StripedProgressButton_spb_stripeGradient, Constants.GRADIENT);
 
-            button.setStripeWidth(stripeWidth)
+            drawable.setStripeWidth(stripeWidth)
                     .setStripeAlpha(stripeAlpha)
-                    .setStripeTilt(stripeTilt)
+                    .setTilt(stripeTilt)
                     .setDuration(duration)
-                    .setBackground(background)
-                    .setMainStripeColor(mainStripeColor)
-                    .setSubStripeColor(subStripeColor)
+                    .setColorBack(background)
+                    .setColorMain(mainStripeColor)
+                    .setColorSub(subStripeColor)
                     .setCornerRadius(cornerRadius)
                     .setStripeRevert(stripeRevert)
                     .setShowStripes(showStripes)
-                    .setActive(active);
+                    .setStripeGradient(stripeGradient);
         } finally {
             typedArray.recycle();
         }
     }
 
-    public StrippedButton getButton() {
-        return button;
+    public AnimatedStripedDrawable getStripedDrawable() {
+        return drawable;
     }
 
 }