From a2494a3a1a2ae198fa5e311ee309223110a11d10 Mon Sep 17 00:00:00 2001
From: goksut <turkergoksu@gmail.com>
Date: Sat, 26 Sep 2020 16:06:49 +0300
Subject: [PATCH 1/6] Added percentage to popup.

---
 .idea/codeStyles/Project.xml                     | 15 ++++++++++++---
 app/src/main/res/layout/activity_main.xml        |  1 +
 .../main/java/com/faskn/lib/ClickablePieChart.kt |  9 +++++++--
 lib/src/main/java/com/faskn/lib/PieChartDsl.kt   | 16 ++++++++++++++++
 lib/src/main/java/com/faskn/lib/Slice.kt         |  3 ++-
 lib/src/main/res/values/attrs.xml                |  1 +
 6 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 7a748e4..3cc336b 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,9 +3,18 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="java.util" withSubpackages="false" static="false" />
-          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
-          <package name="io.ktor" withSubpackages="true" static="false" />
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
         </value>
       </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index e441a2f..346d986 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -20,6 +20,7 @@
             android:layout_weight="1"
             app:centerColor="@color/white"
             app:popupText="Ziyaret"
+            app:showPercentage="true"
             app:showPopup="true" />
 
         <FrameLayout
diff --git a/lib/src/main/java/com/faskn/lib/ClickablePieChart.kt b/lib/src/main/java/com/faskn/lib/ClickablePieChart.kt
index b11dc51..e8f0468 100644
--- a/lib/src/main/java/com/faskn/lib/ClickablePieChart.kt
+++ b/lib/src/main/java/com/faskn/lib/ClickablePieChart.kt
@@ -57,6 +57,7 @@ class ClickablePieChart @JvmOverloads constructor(
 
     // Attributes
     private var popupText: String? = null
+    private var showPercentage = false
 
     init {
         initAttributes(attrs)
@@ -73,6 +74,7 @@ class ClickablePieChart @JvmOverloads constructor(
 
         try {
             popupText = typedArray.getString(R.styleable.ClickablePieChart_popupText) ?: ""
+            showPercentage = typedArray.getBoolean(R.styleable.ClickablePieChart_showPercentage, false)
             centerPaint.color = typedArray.getColor(
                 R.styleable.ClickablePieChart_centerColor,
                 ContextCompat.getColor(context, android.R.color.white)
@@ -211,8 +213,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),
diff --git a/lib/src/main/java/com/faskn/lib/PieChartDsl.kt b/lib/src/main/java/com/faskn/lib/PieChartDsl.kt
index df7e573..6152d21 100644
--- a/lib/src/main/java/com/faskn/lib/PieChartDsl.kt
+++ b/lib/src/main/java/com/faskn/lib/PieChartDsl.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()
     }
diff --git a/lib/src/main/java/com/faskn/lib/Slice.kt b/lib/src/main/java/com/faskn/lib/Slice.kt
index 4f5ed1f..1bd87d7 100644
--- a/lib/src/main/java/com/faskn/lib/Slice.kt
+++ b/lib/src/main/java/com/faskn/lib/Slice.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(
diff --git a/lib/src/main/res/values/attrs.xml b/lib/src/main/res/values/attrs.xml
index bc3e783..4539812 100644
--- a/lib/src/main/res/values/attrs.xml
+++ b/lib/src/main/res/values/attrs.xml
@@ -4,5 +4,6 @@
         <attr name="popupText" format="string" />
         <attr name="centerColor" format="color" />
         <attr name="showPopup" format="boolean" />
+        <attr name="showPercentage" format="boolean" />
     </declare-styleable>
 </resources>
\ No newline at end of file

From eed61b968b5da6ae84f337a9662d50e62b1ee216 Mon Sep 17 00:00:00 2001
From: goksut <turkergoksu@gmail.com>
Date: Sat, 26 Sep 2020 16:17:59 +0300
Subject: [PATCH 2/6] Added animationDuration attribute.

---
 app/src/main/res/layout/activity_main.xml          |  1 +
 .../main/java/com/faskn/lib/ClickablePieChart.kt   | 14 +++++++++++++-
 lib/src/main/res/values/attrs.xml                  |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 346d986..77ada6f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -21,6 +21,7 @@
             app:centerColor="@color/white"
             app:popupText="Ziyaret"
             app:showPercentage="true"
+            app:animationDuration="5000"
             app:showPopup="true" />
 
         <FrameLayout
diff --git a/lib/src/main/java/com/faskn/lib/ClickablePieChart.kt b/lib/src/main/java/com/faskn/lib/ClickablePieChart.kt
index e8f0468..049f30e 100644
--- a/lib/src/main/java/com/faskn/lib/ClickablePieChart.kt
+++ b/lib/src/main/java/com/faskn/lib/ClickablePieChart.kt
@@ -54,6 +54,7 @@ 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
@@ -73,12 +74,23 @@ class ClickablePieChart @JvmOverloads constructor(
             context.theme.obtainStyledAttributes(attrs, R.styleable.ClickablePieChart, 0, 0)
 
         try {
+            // Popup text
             popupText = typedArray.getString(R.styleable.ClickablePieChart_popupText) ?: ""
+
+            // Show percentage
             showPercentage = typedArray.getBoolean(R.styleable.ClickablePieChart_showPercentage, false)
+
+            // Animation duration
+            animationDuration = typedArray.getInt(R.styleable.ClickablePieChart_animationDuration, 0)
+            if (animationDuration < 0) animationDuration = 0
+
+            // CenterPaint color
             centerPaint.color = typedArray.getColor(
                 R.styleable.ClickablePieChart_centerColor,
                 ContextCompat.getColor(context, android.R.color.white)
             )
+
+            // Show popup
             showPopup = typedArray.getBoolean(R.styleable.ClickablePieChart_showPopup, true)
         } finally {
             typedArray.recycle()
@@ -92,7 +104,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
diff --git a/lib/src/main/res/values/attrs.xml b/lib/src/main/res/values/attrs.xml
index 4539812..d845644 100644
--- a/lib/src/main/res/values/attrs.xml
+++ b/lib/src/main/res/values/attrs.xml
@@ -5,5 +5,6 @@
         <attr name="centerColor" format="color" />
         <attr name="showPopup" format="boolean" />
         <attr name="showPercentage" format="boolean" />
+        <attr name="animationDuration" format="integer" />
     </declare-styleable>
 </resources>
\ No newline at end of file

From c6da9b5d61af97703bae3fe4c173bf6b6a45ab91 Mon Sep 17 00:00:00 2001
From: goksut <turkergoksu@gmail.com>
Date: Sat, 26 Sep 2020 16:44:12 +0300
Subject: [PATCH 3/6] Code fix.

---
 app/src/main/res/layout/activity_main.xml      |  2 +-
 lib/src/main/java/com/faskn/lib/PieChartDsl.kt | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 77ada6f..55f3208 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -21,7 +21,7 @@
             app:centerColor="@color/white"
             app:popupText="Ziyaret"
             app:showPercentage="true"
-            app:animationDuration="5000"
+            app:animationDuration="2000"
             app:showPopup="true" />
 
         <FrameLayout
diff --git a/lib/src/main/java/com/faskn/lib/PieChartDsl.kt b/lib/src/main/java/com/faskn/lib/PieChartDsl.kt
index 6152d21..eacc20e 100644
--- a/lib/src/main/java/com/faskn/lib/PieChartDsl.kt
+++ b/lib/src/main/java/com/faskn/lib/PieChartDsl.kt
@@ -80,6 +80,7 @@ class PieChartBuilder {
 
     fun build(): PieChart {
         initScaledArcs()
+        initPercentages()
         return PieChart(slices, clickListener, sliceStartPoint, sliceWidth)
     }
 
@@ -98,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()
     }

From d53c174aa260c6898df042f0bfb4ed41244a7dff Mon Sep 17 00:00:00 2001
From: goksut <turkergoksu@gmail.com>
Date: Sat, 26 Sep 2020 17:26:28 +0300
Subject: [PATCH 4/6] Updated README.md

---
 README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/README.md b/README.md
index 6ad0c1e..44fb0b1 100644
--- a/README.md
+++ b/README.md
@@ -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>

From c366ffaac5a080f9415f4016cf0d73b6655249e8 Mon Sep 17 00:00:00 2001
From: goksut <turkergoksu@gmail.com>
Date: Sun, 27 Sep 2020 16:22:58 +0300
Subject: [PATCH 5/6] Fixed popup dismiss bug on API 21.

---
 lib/src/main/java/com/faskn/lib/ClickablePieChart.kt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/src/main/java/com/faskn/lib/ClickablePieChart.kt b/lib/src/main/java/com/faskn/lib/ClickablePieChart.kt
index 049f30e..35069b0 100644
--- a/lib/src/main/java/com/faskn/lib/ClickablePieChart.kt
+++ b/lib/src/main/java/com/faskn/lib/ClickablePieChart.kt
@@ -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
@@ -256,6 +257,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,

From 104c6e0215538b589868f804dac9cd8155e6e869 Mon Sep 17 00:00:00 2001
From: goksut <turkergoksu@gmail.com>
Date: Wed, 30 Sep 2020 18:06:13 +0300
Subject: [PATCH 6/6] Fixed requested changes.

---
 .../main/java/com/faskn/lib/ClickablePieChart.kt    | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/src/main/java/com/faskn/lib/ClickablePieChart.kt b/lib/src/main/java/com/faskn/lib/ClickablePieChart.kt
index 35069b0..dc0d697 100644
--- a/lib/src/main/java/com/faskn/lib/ClickablePieChart.kt
+++ b/lib/src/main/java/com/faskn/lib/ClickablePieChart.kt
@@ -24,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
@@ -75,23 +76,19 @@ class ClickablePieChart @JvmOverloads constructor(
             context.theme.obtainStyledAttributes(attrs, R.styleable.ClickablePieChart, 0, 0)
 
         try {
-            // Popup text
             popupText = typedArray.getString(R.styleable.ClickablePieChart_popupText) ?: ""
 
-            // Show percentage
-            showPercentage = typedArray.getBoolean(R.styleable.ClickablePieChart_showPercentage, false)
+            showPercentage =
+                typedArray.getBoolean(R.styleable.ClickablePieChart_showPercentage, false)
 
-            // Animation duration
-            animationDuration = typedArray.getInt(R.styleable.ClickablePieChart_animationDuration, 0)
-            if (animationDuration < 0) animationDuration = 0
+            animationDuration =
+                abs(typedArray.getInt(R.styleable.ClickablePieChart_animationDuration, 0))
 
-            // CenterPaint color
             centerPaint.color = typedArray.getColor(
                 R.styleable.ClickablePieChart_centerColor,
                 ContextCompat.getColor(context, android.R.color.white)
             )
 
-            // Show popup
             showPopup = typedArray.getBoolean(R.styleable.ClickablePieChart_showPopup, true)
         } finally {
             typedArray.recycle()