Merge pull request #4 from furkanaskin/dev

Added percentage and animationDuration attributes.

Author: furkanaskin

.idea/codeStyles/Project.xml

@@ -72,5 +72,15 @@ chart.showLegend(legendLayout)
     <td>boolean</td>
     <td>Show popup when user clicks on pie chart.</td>
   </tr>
+  <tr>
+    <td>app:showPercentage</td>
+    <td>boolean</td>
+    <td>Show percentage of slice beside popupText.</td>
+  </tr>
+  <tr>
+    <td>app:animationDuration</td>
+    <td>integer</td>
+    <td>Animation duration with milliseconds.</td>
+  </tr>
 </tbody>
 </table>

README.md

@@ -20,6 +20,8 @@
             android:layout_weight="1"
             app:centerColor="@color/white"
             app:popupText="Ziyaret"
+            app:showPercentage="true"
+            app:animationDuration="2000"
             app:showPopup="true" />
 
         <FrameLayout

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

@@ -11,6 +11,7 @@ import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.RectF
+import android.graphics.drawable.ColorDrawable
 import android.util.AttributeSet
 import android.view.*
 import android.view.animation.LinearInterpolator
@@ -23,6 +24,7 @@ import androidx.core.widget.ImageViewCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.faskn.lib.legend.LegendAdapter
+import kotlin.math.abs
 import kotlin.math.atan2
 import kotlin.math.cos
 import kotlin.math.sin
@@ -54,9 +56,11 @@ class ClickablePieChart @JvmOverloads constructor(
     private var animator: ValueAnimator? = null
     private var currentSweepAngle = 0
     private var showPopup = true
+    private var animationDuration: Int = 1000
 
     // Attributes
     private var popupText: String? = null
+    private var showPercentage = false
 
     init {
         initAttributes(attrs)
@@ -73,10 +77,18 @@ class ClickablePieChart @JvmOverloads constructor(
 
         try {
             popupText = typedArray.getString(R.styleable.ClickablePieChart_popupText) ?: ""
+
+            showPercentage =
+                typedArray.getBoolean(R.styleable.ClickablePieChart_showPercentage, false)
+
+            animationDuration =
+                abs(typedArray.getInt(R.styleable.ClickablePieChart_animationDuration, 0))
+
             centerPaint.color = typedArray.getColor(
                 R.styleable.ClickablePieChart_centerColor,
                 ContextCompat.getColor(context, android.R.color.white)
             )
+
             showPopup = typedArray.getBoolean(R.styleable.ClickablePieChart_showPopup, true)
         } finally {
             typedArray.recycle()
@@ -90,7 +102,7 @@ class ClickablePieChart @JvmOverloads constructor(
     private fun startAnimation() {
         animator?.cancel()
         animator = ValueAnimator.ofInt(0, 360).apply {
-            duration = 1000
+            duration = animationDuration.toLong()
             interpolator = LinearInterpolator()
             addUpdateListener { valueAnimator ->
                 currentSweepAngle = valueAnimator.animatedValue as Int
@@ -211,8 +223,11 @@ class ClickablePieChart @JvmOverloads constructor(
         val center = slices?.get(index)?.arc?.average()!! + pieChart?.sliceStartPoint?.toDouble()!!
         val halfRadius = rectF!!.centerX()
 
-        popupView.findViewById<TextView>(R.id.textViewPopupText).text =
-            "${slices?.get(index)!!.dataPoint.toInt()} $popupText"
+        var popupText = "${slices?.get(index)!!.dataPoint.toInt()} $popupText"
+        if (showPercentage) {
+            popupText = "$popupText (%${slices?.get(index)!!.percentage})"
+        }
+        popupView.findViewById<TextView>(R.id.textViewPopupText).text = popupText
 
         ImageViewCompat.setImageTintList(
             popupView.findViewById(R.id.imageViewPopupCircleIndicator),
@@ -239,6 +254,8 @@ class ClickablePieChart @JvmOverloads constructor(
         val popupWindowY =
             (currentViewLocation[1] + halfRadius.toInt()) + calculatedY -
                     (if (calculatedY < 0) -halfOfSliceWidth else halfOfSliceWidth)
+
+        popupWindow.setBackgroundDrawable(ColorDrawable())
         popupWindow.showAtLocation(
             this,
             Gravity.NO_GRAVITY,

lib/src/main/java/com/faskn/lib/ClickablePieChart.kt

@@ -14,6 +14,7 @@ data class PieChart(
 ) {
     fun build(): PieChart {
         initScaledArcs()
+        initPercentages()
         return PieChart(slices, clickListener, sliceStartPoint, sliceWidth)
     }
 
@@ -32,6 +33,21 @@ data class PieChart(
         }
     }
 
+    private fun initPercentages() {
+        var remainder = 100
+        slices.forEach { slice ->
+            val percentage = (100 * slice.scaledValue!!.toInt()) / 360
+            slice.percentage = percentage
+            remainder -= percentage
+        }
+        var i = 0
+        while (remainder != 0) {
+            slices[i].percentage = slices[i].percentage!! + 1
+            remainder -= 1
+            i = (i + 1) % 4
+        }
+    }
+
     private fun getSumOfDataPoints(): Float {
         return slices.sumByDouble { slice -> slice.dataPoint.toDouble() }.toFloat()
     }
@@ -64,6 +80,7 @@ class PieChartBuilder {
 
     fun build(): PieChart {
         initScaledArcs()
+        initPercentages()
         return PieChart(slices, clickListener, sliceStartPoint, sliceWidth)
     }
 
@@ -82,6 +99,21 @@ class PieChartBuilder {
         }
     }
 
+    private fun initPercentages() {
+        var remainder = 100
+        slices.forEach { slice ->
+            val percentage = (100 * slice.scaledValue!!.toInt()) / 360
+            slice.percentage = percentage
+            remainder -= percentage
+        }
+        var i = 0
+        while (remainder != 0) {
+            slices[i].percentage = slices[i].percentage!! + 1
+            remainder -= 1
+            i = (i + 1) % 4
+        }
+    }
+
     private fun getSumOfDataPoints(): Float {
         return slices.sumByDouble { slice -> slice.dataPoint.toDouble() }.toFloat()
     }

lib/src/main/java/com/faskn/lib/PieChartDsl.kt

@@ -12,7 +12,8 @@ data class Slice(
     @ColorRes val color: Int,
     val name: String,
     var arc: Arc? = null,
-    @Px var scaledValue: Float? = 0f
+    @Px var scaledValue: Float? = 0f,
+    var percentage: Int? = null
 )
 
 data class Arc(

lib/src/main/java/com/faskn/lib/Slice.kt

@@ -4,5 +4,7 @@
         <attr name="popupText" format="string" />
         <attr name="centerColor" format="color" />
         <attr name="showPopup" format="boolean" />
+        <attr name="showPercentage" format="boolean" />
+        <attr name="animationDuration" format="integer" />
     </declare-styleable>
 </resources>