Merge pull request #17 from cidermole/percentage-hide

GIGAMOLE · web-flow · commit c2a79a5dcec1 · 2017-07-26T21:19:53.000+03:00
add switch apsv_show_progress to disable progress percentage text
diff --git a/arcprogressstackview/src/main/java/devlight/io/library/ArcProgressStackView.java b/arcprogressstackview/src/main/java/devlight/io/library/ArcProgressStackView.java
@@ -149,6 +149,7 @@ public class ArcProgressStackView extends View {
     private boolean mIsRounded;
     private boolean mIsDragged;
     private boolean mIsModelBgEnabled;
+    private boolean mIsShowProgress;
     private boolean mIsLeveled;
 
     // Colors
@@ -271,6 +272,11 @@ public ArcProgressStackView(final Context context, final AttributeSet attrs, fin
                             R.styleable.ArcProgressStackView_apsv_model_bg_enabled, false
                     )
             );
+            setShowProgress(
+                    typedArray.getBoolean(
+                            R.styleable.ArcProgressStackView_apsv_show_progress, true
+                    )
+            );
 
             // Set orientation
             final int orientationOrdinal =
@@ -456,6 +462,15 @@ public void setModelBgEnabled(final boolean modelBgEnabled) {
         postInvalidate();
     }
 
+    public boolean isShowProgress() {
+        return mIsShowProgress;
+    }
+
+    public void setShowProgress(final boolean showProgress) {
+        mIsShowProgress = showProgress;
+        postInvalidate();
+    }
+
     public boolean isRounded() {
         return mIsRounded;
     }
@@ -977,12 +992,14 @@ protected void onDraw(final Canvas canvas) {
                 // Draw progress value
                 canvas.save();
                 canvas.rotate(indicatorProgressAngle, model.mPos[0], model.mPos[1]);
-                canvas.drawText(
-                        percentProgress,
-                        model.mPos[0] - model.mTextBounds.exactCenterX(),
-                        model.mPos[1] - model.mTextBounds.exactCenterY(),
-                        mTextPaint
-                );
+                if (mIsShowProgress) {
+                    canvas.drawText(
+                            percentProgress,
+                            model.mPos[0] - model.mTextBounds.exactCenterX(),
+                            model.mPos[1] - model.mTextBounds.exactCenterY(),
+                            mTextPaint
+                    );
+                }
                 canvas.restore();
             }
 
diff --git a/arcprogressstackview/src/main/res/values/attrs.xml b/arcprogressstackview/src/main/res/values/attrs.xml
@@ -35,6 +35,7 @@ limitations under the License.
         <attr name="apsv_draw_width" format="fraction|dimension"/>
         <attr name="apsv_model_offset" format="dimension"/>
         <attr name="apsv_model_bg_enabled" format="boolean"/>
+        <attr name="apsv_show_progress" format="boolean"/>
 
         <attr name="apsv_start_angle" format="integer"/>
         <attr name="apsv_sweep_angle" format="integer"/>
@@ -46,4 +47,4 @@ limitations under the License.
         <attr name="apsv_preview_colors" format="reference"/>
         <attr name="apsv_preview_bg" format="color"/>
     </declare-styleable>
-</resources>
+</resources>
