fix start and end of PointerSpeedometer.

Signed-off-by: Anas Altair <anastr244@gmail.com>
anastr · May 10, 2020 · 2f4615c · 2f4615c
1 parent c7ba3f7
commit 2f4615c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/speedviewlib/src/main/java/com/github/anastr/speedviewlib/DeluxeSpeedView.kt b/speedviewlib/src/main/java/com/github/anastr/speedviewlib/DeluxeSpeedView.kt
@@ -7,6 +7,7 @@ import android.util.AttributeSet
 import com.github.anastr.speedviewlib.components.Section
 import com.github.anastr.speedviewlib.components.indicators.Indicator
 import com.github.anastr.speedviewlib.components.indicators.NormalSmallIndicator
+import com.github.anastr.speedviewlib.util.getRoundAngle
 
 /**
  * this Library build By Anas Altair
@@ -174,11 +175,7 @@ open class DeluxeSpeedView @JvmOverloads constructor(context: Context, attrs: At
             val startAngle = (getEndDegree() - getStartDegree()) * it.startOffset + getStartDegree()
             val sweepAngle = (getEndDegree() - getStartDegree()) * it.endOffset - (startAngle - getStartDegree())
             if (it.style == Section.Style.ROUND) {
-                // here we calculate the extra length when strokeCap = ROUND.
-                // A: Arc Length, the extra length that taken ny ROUND stroke in one side.
-                // D: Diameter of circle.
-                // round angle padding =         A       * 360 / (           D             *   PI   )
-                val roundAngle = (it.width * .5f * 360 / (speedometerRect.width()  * Math.PI)).toFloat()
+                val roundAngle = getRoundAngle(it.width, speedometerRect.width())
                 speedometerPaint.strokeCap = Paint.Cap.ROUND
                 c.drawArc(speedometerRect, startAngle + roundAngle, sweepAngle - roundAngle * 2f, false, speedometerPaint)
             }

diff --git a/speedviewlib/src/main/java/com/github/anastr/speedviewlib/PointerSpeedometer.kt b/speedviewlib/src/main/java/com/github/anastr/speedviewlib/PointerSpeedometer.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.graphics.*
 import android.util.AttributeSet
 import com.github.anastr.speedviewlib.components.indicators.SpindleIndicator
+import com.github.anastr.speedviewlib.util.getRoundAngle
 
 /**
  * this Library build By Anas Altair
@@ -135,7 +136,9 @@ open class PointerSpeedometer @JvmOverloads constructor(context: Context, attrs:
         super.onDraw(canvas)
         initDraw()
 
-        canvas.drawArc(speedometerRect, getStartDegree().toFloat(), (getEndDegree() - getStartDegree()).toFloat(), false, speedometerPaint)
+        val roundAngle = getRoundAngle(speedometerWidth, speedometerRect.width())
+        canvas.drawArc(speedometerRect, getStartDegree() + roundAngle
+                , (getEndDegree() - getStartDegree()) - roundAngle * 2f, false, speedometerPaint)
 
         if (withPointer) {
             canvas.save()

diff --git a/speedviewlib/src/main/java/com/github/anastr/speedviewlib/SpeedView.kt b/speedviewlib/src/main/java/com/github/anastr/speedviewlib/SpeedView.kt
@@ -8,6 +8,7 @@ import android.graphics.RectF
 import android.util.AttributeSet
 import com.github.anastr.speedviewlib.components.Section
 import com.github.anastr.speedviewlib.components.indicators.NormalIndicator
+import com.github.anastr.speedviewlib.util.getRoundAngle
 
 /**
  * this Library build By Anas Altair
@@ -113,11 +114,7 @@ open class SpeedView @JvmOverloads constructor(context: Context, attrs: Attribut
             val startAngle = (getEndDegree() - getStartDegree()) * it.startOffset + getStartDegree()
             val sweepAngle = (getEndDegree() - getStartDegree()) * it.endOffset - (startAngle - getStartDegree())
             if (it.style == Section.Style.ROUND) {
-                // here we calculate the extra length when strokeCap = ROUND.
-                // A: Arc Length, the extra length that taken ny ROUND stroke in one side.
-                // D: Diameter of circle.
-                // round angle padding =         A       * 360 / (           D             *   PI   )
-                val roundAngle = (it.width * .5f * 360 / (speedometerRect.width()  * Math.PI)).toFloat()
+                val roundAngle = getRoundAngle(it.width, speedometerRect.width())
                 speedometerPaint.strokeCap = Paint.Cap.ROUND
                 c.drawArc(speedometerRect, startAngle + roundAngle, sweepAngle - roundAngle * 2f, false, speedometerPaint)
             }

diff --git a/speedviewlib/src/main/java/com/github/anastr/speedviewlib/util/Utils.kt b/speedviewlib/src/main/java/com/github/anastr/speedviewlib/util/Utils.kt
@@ -54,4 +54,14 @@ fun Gauge.doOnSections(action: (section: Section) -> Unit) {
     this.clearSections()
     sections.forEach { action.invoke(it) }
     this.addSections(sections)
+}
+
+/**
+ * here we calculate the extra length when strokeCap = ROUND.
+ * round angle padding =         A       * 360 / (           D             *   PI   )
+ * @param [a] Arc Length, the extra length that taken ny ROUND stroke in one side.
+ * @param [d] Diameter of circle.
+ */
+fun getRoundAngle(a: Float, d: Float): Float {
+    return (a * .5f * 360 / (d  * Math.PI)).toFloat()
 }