Merge pull request #598 from AppDevNext/MoveGetNormalizedAngle

Move getNormalizedAngle

Author: hannesa2

chartLib/src/main/kotlin/info/appdev/charting/charts/PieChart.kt

@@ -14,8 +14,8 @@ import info.appdev.charting.renderer.PieChartRenderer
 import info.appdev.charting.utils.PointF
 import info.appdev.charting.utils.PointF.Companion.getInstance
 import info.appdev.charting.utils.PointF.Companion.recycleInstance
-import info.appdev.charting.utils.Utils
 import info.appdev.charting.utils.convertDpToPixel
+import info.appdev.charting.utils.getNormalizedAngle
 import java.util.Locale
 import java.util.Objects
 import kotlin.math.abs
@@ -346,7 +346,7 @@ class PieChart : PieRadarChartBase<PieData> {
     override fun getIndexForAngle(angle: Float): Int {
         // take the current angle of the chart into consideration
 
-        val a = Utils.getNormalizedAngle(angle - rotationAngle)
+        val a = (angle - rotationAngle).getNormalizedAngle()
 
         for (i in absoluteAngles.indices) {
             if (this.absoluteAngles[i] > a)

chartLib/src/main/kotlin/info/appdev/charting/charts/PieRadarChartBase.kt

@@ -16,8 +16,8 @@ import info.appdev.charting.listener.PieRadarChartTouchListener
 import info.appdev.charting.utils.PointF
 import info.appdev.charting.utils.PointF.Companion.getInstance
 import info.appdev.charting.utils.PointF.Companion.recycleInstance
-import info.appdev.charting.utils.Utils
 import info.appdev.charting.utils.convertDpToPixel
+import info.appdev.charting.utils.getNormalizedAngle
 import timber.log.Timber
 import kotlin.math.acos
 import kotlin.math.cos
@@ -378,7 +378,7 @@ abstract class PieRadarChartBase<T : ChartData<out IDataSet<out Entry>>>
          */
         set(angle) {
             this.rawRotationAngle = angle
-            mRotationAngle = Utils.getNormalizedAngle(this.rawRotationAngle)
+            mRotationAngle = this.rawRotationAngle.getNormalizedAngle()
         }
 
     val diameter: Float

chartLib/src/main/kotlin/info/appdev/charting/charts/RadarChart.kt

@@ -11,8 +11,8 @@ import info.appdev.charting.highlight.RadarHighlighter
 import info.appdev.charting.renderer.RadarChartRenderer
 import info.appdev.charting.renderer.XAxisRendererRadarChart
 import info.appdev.charting.renderer.YAxisRendererRadarChart
-import info.appdev.charting.utils.Utils
 import info.appdev.charting.utils.convertDpToPixel
+import info.appdev.charting.utils.getNormalizedAngle
 import kotlin.math.max
 import kotlin.math.min
 
@@ -203,16 +203,16 @@ class RadarChart : PieRadarChartBase<RadarData> {
     override fun getIndexForAngle(angle: Float): Int {
         // take the current angle of the chart into consideration
 
-        val a = Utils.getNormalizedAngle(angle - rotationAngle)
+        val a = (angle - rotationAngle).getNormalizedAngle()
 
-        val sliceangle = this.sliceAngle
+        val sliceAngle = this.sliceAngle
 
         val max = mData?.maxEntryCountSet!!.entryCount
 
         var index = 0
 
         for (i in 0..<max) {
-            val referenceAngle = sliceangle * (i + 1) - sliceangle / 2f
+            val referenceAngle = sliceAngle * (i + 1) - sliceAngle / 2f
 
             if (referenceAngle > a) {
                 index = i

chartLib/src/main/kotlin/info/appdev/charting/utils/NumberUtils.kt

@@ -0,0 +1,13 @@
+package info.appdev.charting.utils
+
+/**
+ * returns an angle between 0.f < 360.f (not less than zero, less than 360)
+ */
+fun Float.getNormalizedAngle(): Float {
+    var angle = this
+    while (angle < 0f) {
+        angle += 360f
+    }
+
+    return angle % 360f
+}

chartLib/src/main/kotlin/info/appdev/charting/utils/Utils.kt

@@ -86,18 +86,6 @@ object Utils {
         }
     }
 
-    /**
-     * returns an angle between 0.f < 360.f (not less than zero, less than 360)
-     */
-    fun getNormalizedAngle(angle: Float): Float {
-        var angle = angle
-        while (angle < 0f) {
-            angle += 360f
-        }
-
-        return angle % 360f
-    }
-
     private val mDrawableBoundsCache = Rect()
 
     fun drawImage(canvas: Canvas, drawable: Drawable, x: Int, y: Int) {