dev: align status with current prop added

Author: Parminder

app/src/main/java/jugnoo/com/learningcustomvviews/StatusView.kt

@@ -26,14 +26,12 @@ class StatusView @JvmOverloads constructor(
 
         /*
          TODO
-       alignAllStatusWithCurrent
-       Pass font to textView
-       Ensure Text single line & text gap prop
+       Display status above|bottom
        Text Appearance?
        LTR Support
        Orientation draw vertical too
-       Display status above|bottom
-      */
+
+     */
 
     companion object {
         const val CIRCLE_COLOR_TYPE_FILL = 1
@@ -132,6 +130,14 @@ class StatusView @JvmOverloads constructor(
      */
      var labelTopMargin by OnLayoutProp( 4.0f.pxValue())
 
+    /**
+     *  set true to align all status to align same as current Status y-pos
+     *
+     */
+     var alignStatusWithCurrent by OnValidateProp(false){
+        setDrawingDimensions()
+    }
+
     /**
      * Stroke width of the line between circles (dp)
      */
@@ -429,6 +435,7 @@ class StatusView @JvmOverloads constructor(
 
             circleFillColorCurrent = a.getColor(R.styleable.StatusView_circleColorCurrent, circleFillColorIncomplete)
             currentStatusZoom = a.getFloat(R.styleable.StatusView_currentStatusZoom, currentStatusZoom)
+            alignStatusWithCurrent = a.getBoolean(R.styleable.StatusView_alignStatusWithCurrent, alignStatusWithCurrent)
 
             val entries = a.getTextArray(R.styleable.StatusView_android_entries)
             if (entries != null) {
@@ -756,7 +763,8 @@ class StatusView @JvmOverloads constructor(
             lastPoint.x += ((circleRadius) * 2.0f) + (circleStrokeWidth / 2)
 
             if(i<statusData.size){
-                labelItemText = StatusItemText(circleItem.center.x, circleItem.center.y + circleRadius + circleStrokeWidth/2 + labelTopMargin, statusData[i].staticLayout)
+                val radii = if(isShowingCurrentStatus() && alignStatusWithCurrent) currentStatusRadius else circleRadius
+                labelItemText = StatusItemText(circleItem.center.x, circleItem.center.y + radii + circleStrokeWidth/2 + labelTopMargin, statusData[i].staticLayout)
             }
 
 

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

@@ -22,12 +22,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:circleColorType="fillStroke"
-            app:statusCount="3"
-            app:currentCount="1"
+            app:statusCount="4"
+            app:currentCount="3"
             app:lineLength="25dp"
             app:circleRadius="25dp"
             app:obeyLineLength="false"
-            app:currentStatusZoom="0.0"
+            app:currentStatusZoom="0.5"
             app:drawCount="true"
             app:statusFont="@font/bree_serif"
             app:labelFont="@font/pt_sans"

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

@@ -39,6 +39,7 @@
         <attr name="minStatusMargin" format="dimension"/>
         <attr name="labelTopMargin" format="dimension"/>
         <attr name="currentStatusZoom" format="float"/>
+        <attr name="alignStatusWithCurrent" format="boolean"/>
         <attr name="statusFont" format="reference"/>
         <attr name="labelFont" format="reference"/>
         <attr name="android:entries" />

app/src/main/res/values/strings.xml

@@ -3,7 +3,8 @@
     <string name="customViewLabel">Fan Control</string>
 
     <string-array name="statuses">
-        <item>On the way</item>
+        <item>Confirmed</item>
+        <item>Dispatched</item>
         <item>Arriving</item>
         <item>Delivered</item>
     </string-array>