Allow setting different stroke width for progress and background rings

Author: antonKozyriatskyi

circularprogressindicator/src/main/java/antonkozyriatskyi/circularprogressindicator/CircularProgressIndicator.java

@@ -26,6 +26,9 @@
 import android.view.View;
 import android.view.animation.AccelerateDecelerateInterpolator;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
 /**
  * Created by Anton on 03.03.2018.
  */
@@ -115,6 +118,7 @@ private void init(@NonNull Context context, @Nullable AttributeSet attrs) {
         int progressColor = Color.parseColor(DEFAULT_PROGRESS_COLOR);
         int progressBackgroundColor = Color.parseColor(DEFAULT_PROGRESS_BACKGROUND_COLOR);
         int progressStrokeWidth = dp2px(DEFAULT_STROKE_WIDTH_DP);
+        int progressBackgroundStrokeWidth = progressStrokeWidth;
         int textColor = progressColor;
         int textSize = sp2px(DEFAULT_TEXT_SIZE_SP);
 
@@ -130,6 +134,7 @@ private void init(@NonNull Context context, @Nullable AttributeSet attrs) {
             progressColor = a.getColor(R.styleable.CircularProgressIndicator_progressColor, progressColor);
             progressBackgroundColor = a.getColor(R.styleable.CircularProgressIndicator_progressBackgroundColor, progressBackgroundColor);
             progressStrokeWidth = a.getDimensionPixelSize(R.styleable.CircularProgressIndicator_progressStrokeWidth, progressStrokeWidth);
+            progressBackgroundStrokeWidth = a.getDimensionPixelSize(R.styleable.CircularProgressIndicator_progressBackgroundStrokeWidth, progressStrokeWidth);
             textColor = a.getColor(R.styleable.CircularProgressIndicator_textColor, progressColor);
             textSize = a.getDimensionPixelSize(R.styleable.CircularProgressIndicator_textSize, textSize);
 
@@ -170,7 +175,7 @@ private void init(@NonNull Context context, @Nullable AttributeSet attrs) {
 
         progressBackgroundPaint = new Paint();
         progressBackgroundPaint.setStyle(Paint.Style.STROKE);
-        progressBackgroundPaint.setStrokeWidth(progressStrokeWidth);
+        progressBackgroundPaint.setStrokeWidth(progressBackgroundStrokeWidth);
         progressBackgroundPaint.setColor(progressBackgroundColor);
         progressBackgroundPaint.setAntiAlias(true);
 
@@ -208,7 +213,12 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         Rect textBoundsRect = new Rect();
         textPaint.getTextBounds(progressText, 0, progressText.length(), textBoundsRect);
 
-        float strokeSizeOffset = (shouldDrawDot) ? Math.max(dotPaint.getStrokeWidth(), progressPaint.getStrokeWidth()) : progressPaint.getStrokeWidth(); // to prevent progress or dot from drawing over the bounds
+
+        float dotWidth = dotPaint.getStrokeWidth();
+        float progressWidth = progressPaint.getStrokeWidth();
+        float progressBackgroundWidth = progressBackgroundPaint.getStrokeWidth();
+        float strokeSizeOffset = (shouldDrawDot) ? Math.max(dotWidth, Math.max(progressWidth, progressBackgroundWidth)) : Math.max(progressWidth, progressBackgroundWidth);
+
         int desiredSize = ((int) strokeSizeOffset) + dp2px(DESIRED_WIDTH_DP) +
                 Math.max(paddingBottom + paddingTop, paddingLeft + paddingRight);
 
@@ -256,7 +266,10 @@ protected void onSizeChanged(int w, int h, int oldw, int oldh) {
     private void calculateBounds(int w, int h) {
         radius = w / 2f;
 
-        float strokeSizeOffset = (shouldDrawDot) ? Math.max(dotPaint.getStrokeWidth(), progressPaint.getStrokeWidth()) : progressPaint.getStrokeWidth(); // to prevent progress or dot from drawing over the bounds
+        float dotWidth = dotPaint.getStrokeWidth();
+        float progressWidth = progressPaint.getStrokeWidth();
+        float progressBackgroundWidth = progressBackgroundPaint.getStrokeWidth();
+        float strokeSizeOffset = (shouldDrawDot) ? Math.max(dotWidth, Math.max(progressWidth, progressBackgroundWidth)) : Math.max(progressWidth, progressBackgroundWidth); // to prevent progress or dot from drawing over the bounds
         float halfOffset = strokeSizeOffset / 2f;
 
         circleBounds.left = halfOffset;
@@ -436,8 +449,17 @@ public void setProgressStrokeWidthDp(@Dimension int strokeWidth) {
         setProgressStrokeWidthPx(dp2px(strokeWidth));
     }
 
-    public void setProgressStrokeWidthPx(@Dimension final int strokeWidth) {
+    public void setProgressStrokeWidthPx(@Dimension int strokeWidth) {
         progressPaint.setStrokeWidth(strokeWidth);
+
+        invalidateEverything();
+    }
+
+    public void setProgressBackgroundStrokeWidthDp(@Dimension int strokeWidth) {
+        setProgressBackgroundStrokeWidthPx(dp2px(strokeWidth));
+    }
+
+    public void setProgressBackgroundStrokeWidthPx(@Dimension int strokeWidth) {
         progressBackgroundPaint.setStrokeWidth(strokeWidth);
 
         invalidateEverything();
@@ -495,7 +517,7 @@ public void setDotWidthDp(@Dimension int width) {
         setDotWidthPx(dp2px(width));
     }
 
-    public void setDotWidthPx(@Dimension final int width) {
+    public void setDotWidthPx(@Dimension int width) {
         dotPaint.setStrokeWidth(width);
 
         invalidateEverything();
@@ -533,6 +555,9 @@ public float getProgressStrokeWidth() {
         return progressPaint.getStrokeWidth();
     }
 
+    public float getProgressBackgroundStrokeWidth() {
+        return progressBackgroundPaint.getStrokeWidth();
+    }
 
     @ColorInt
     public int getTextColor() {
@@ -617,10 +642,12 @@ public boolean isAnimationEnabled() {
         return isAnimationEnabled;
     }
 
+    @Retention(RetentionPolicy.SOURCE)
     @IntDef({DIRECTION_CLOCKWISE, DIRECTION_COUNTERCLOCKWISE})
     public @interface Direction {
     }
 
+    @Retention(RetentionPolicy.SOURCE)
     @IntDef({CAP_ROUND, CAP_BUTT})
     public @interface Cap {
     }

circularprogressindicator/src/main/res/values/attrs.xml

@@ -5,6 +5,7 @@
         <attr name="progressColor" format="color" />
         <attr name="progressBackgroundColor" format="color" />
         <attr name="progressStrokeWidth" format="dimension" />
+        <attr name="progressBackgroundStrokeWidth" format="dimension" />
 
         <attr name="textColor" format="color" />
         <attr name="textSize" format="dimension" />