Kotlin getNormalizedAngle

Author: hannesa2

MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieChart.java

@@ -17,7 +17,6 @@
 import com.github.mikephil.charting.interfaces.datasets.IPieDataSet;
 import com.github.mikephil.charting.renderer.PieChartRenderer;
 import com.github.mikephil.charting.utils.MPPointF;
-import com.github.mikephil.charting.utils.Utils;
 import com.github.mikephil.charting.utils.UtilsKtKt;
 
 import java.util.List;
@@ -344,7 +343,7 @@ public XAxis getXAxis() {
     public int getIndexForAngle(float angle) {
 
         // take the current angle of the chart into consideration
-        float a = Utils.getNormalizedAngle(angle - getRotationAngle());
+        float a = UtilsKtKt.getNormalizedAngle(angle - getRotationAngle());
 
         for (int i = 0; i < mAbsoluteAngles.length; i++) {
             if (mAbsoluteAngles[i] > a)

MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieRadarChartBase.java

@@ -19,7 +19,6 @@
 import com.github.mikephil.charting.interfaces.datasets.IDataSet;
 import com.github.mikephil.charting.listener.PieRadarChartTouchListener;
 import com.github.mikephil.charting.utils.MPPointF;
-import com.github.mikephil.charting.utils.Utils;
 import com.github.mikephil.charting.utils.UtilsKtKt;
 
 /**
@@ -341,7 +340,7 @@ public float distanceToCenter(float x, float y) {
      */
     public void setRotationAngle(float angle) {
         mRawRotationAngle = angle;
-        mRotationAngle = Utils.getNormalizedAngle(mRawRotationAngle);
+        mRotationAngle = UtilsKtKt.getNormalizedAngle(mRawRotationAngle);
     }
 
     /**

MPChartLib/src/main/java/com/github/mikephil/charting/charts/RadarChart.java

@@ -14,7 +14,6 @@
 import com.github.mikephil.charting.renderer.RadarChartRenderer;
 import com.github.mikephil.charting.renderer.XAxisRendererRadarChart;
 import com.github.mikephil.charting.renderer.YAxisRendererRadarChart;
-import com.github.mikephil.charting.utils.Utils;
 import com.github.mikephil.charting.utils.UtilsKtKt;
 
 import java.util.List;
@@ -207,7 +206,7 @@ public List<Integer> getLayerColorList() {
     public int getIndexForAngle(float angle) {
 
         // take the current angle of the chart into consideration
-        float a = Utils.getNormalizedAngle(angle - getRotationAngle());
+        float a = UtilsKtKt.getNormalizedAngle(angle - getRotationAngle());
 
         float sliceangle = getSliceAngle();
 

MPChartLib/src/main/java/com/github/mikephil/charting/components/Legend.java

@@ -694,7 +694,7 @@ else if (wasStacked) {
                     // grouped forms have null labels
                     if (label != null) {
 
-                        mCalculatedLabelSizes.add(Utils.calcTextSize(labelpaint, label));
+                        mCalculatedLabelSizes.add(CanvasUtilsKt.calcTextSize(labelpaint, label));
                         requiredWidth += drawingForm ? formToTextSpace + formSize : 0.f;
                         requiredWidth += mCalculatedLabelSizes.get(i).width;
                     } else {

MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt

@@ -11,8 +11,8 @@ import com.github.mikephil.charting.formatter.IValueFormatter
 import com.github.mikephil.charting.interfaces.datasets.IDataSet
 import com.github.mikephil.charting.utils.ColorTemplate
 import com.github.mikephil.charting.utils.MPPointF
-import com.github.mikephil.charting.utils.Utils
 import com.github.mikephil.charting.utils.convertDpToPixel
+import com.github.mikephil.charting.utils.getDefaultValueFormatter
 
 /**
  * This is the base dataset of all DataSets. It's purpose is to implement critical methods
@@ -237,13 +237,17 @@ abstract class BaseDataSet<T : Entry>() : IDataSet<T> {
     }
 
     override fun setValueFormatter(f: IValueFormatter?) {
-        if (f == null) return
-        else mValueFormatter = f
+        if (f == null)
+            return
+        else
+            mValueFormatter = f
     }
 
     override fun getValueFormatter(): IValueFormatter {
-        if (needsFormatter()) return Utils.getDefaultValueFormatter()
-        return mValueFormatter!!
+        return if (needsFormatter())
+            getDefaultValueFormatter()
+        else
+            mValueFormatter!!
     }
 
     override fun needsFormatter(): Boolean {

MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRenderer.kt

@@ -19,6 +19,7 @@ import com.github.mikephil.charting.utils.Transformer
 import com.github.mikephil.charting.utils.Utils
 import com.github.mikephil.charting.utils.ViewPortHandler
 import com.github.mikephil.charting.utils.calcTextHeight
+import com.github.mikephil.charting.utils.calcTextSize
 import com.github.mikephil.charting.utils.calcTextWidth
 import com.github.mikephil.charting.utils.convertDpToPixel
 import com.github.mikephil.charting.utils.drawXAxisValue
@@ -73,7 +74,7 @@ open class XAxisRenderer(
         paintAxisLabels.typeface = xAxis.typeface
         paintAxisLabels.textSize = xAxis.textSize
 
-        val labelSize = Utils.calcTextSize(paintAxisLabels, longest)
+        val labelSize = paintAxisLabels.calcTextSize(longest)
 
         val labelWidth = labelSize.width
         val labelHeight = paintAxisLabels.calcTextHeight("Q").toFloat()

MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererHorizontalBarChart.kt

@@ -16,6 +16,7 @@ import com.github.mikephil.charting.utils.Transformer
 import com.github.mikephil.charting.utils.Utils
 import com.github.mikephil.charting.utils.ViewPortHandler
 import com.github.mikephil.charting.utils.calcTextHeight
+import com.github.mikephil.charting.utils.calcTextSize
 import com.github.mikephil.charting.utils.convertDpToPixel
 import kotlin.math.roundToInt
 
@@ -58,7 +59,7 @@ open class XAxisRendererHorizontalBarChart(
 
         val longest = xAxis.longestLabel
 
-        val labelSize = Utils.calcTextSize(paintAxisLabels, longest)
+        val labelSize = paintAxisLabels.calcTextSize(longest)
 
         val labelWidth = (labelSize.width + xAxis.xOffset * 3.5f).toInt().toFloat()
         val labelHeight = labelSize.height

MPChartLib/src/main/java/com/github/mikephil/charting/utils/CanvasUtils.kt

@@ -21,6 +21,36 @@ val FDEG2RAD: Float = (Math.PI.toFloat() / 180f)
  */
 fun Paint.calcTextWidth(demoText: String?) = this.measureText(demoText).toInt()
 
+private val calcTextSizeRect = Rect()
+
+/**
+ * calculates the approximate size of a text, depending on a demo text
+ * avoid repeated calls (e.g. inside drawing methods)
+ *
+ * @param paint
+ * @param demoText
+ * @param outputFSize An output variable, modified by the function.
+ */
+fun Paint.calcTextSize(demoText: String, outputFSize: FSize) {
+    val r = calcTextSizeRect
+    r.set(0, 0, 0, 0)
+    this.getTextBounds(demoText, 0, demoText.length, r)
+    outputFSize.width = r.width().toFloat()
+    outputFSize.height = r.height().toFloat()
+}
+
+/**
+ * Returns a recyclable FSize instance.
+ * calculates the approximate size of a text, depending on a demo text
+ * avoid repeated calls (e.g. inside drawing methods)
+ * @return A Recyclable FSize instance
+ */
+fun Paint.calcTextSize(demoText: String): FSize {
+    val result = FSize.getInstance(0f, 0f)
+    this.calcTextSize(demoText, result)
+    return result
+}
+
 /**
  * calculates the approximate height of a text, depending on a demo text
  * avoid repeated calls (e.g. inside drawing methods)

MPChartLib/src/main/java/com/github/mikephil/charting/utils/Utils.java

@@ -67,42 +67,6 @@ public static float getLineSpacing(Paint paint, Paint.FontMetrics fontMetrics) {
 		return fontMetrics.ascent - fontMetrics.top + fontMetrics.bottom;
 	}
 
-	/**
-	 * Returns a recyclable FSize instance.
-	 * calculates the approximate size of a text, depending on a demo text
-	 * avoid repeated calls (e.g. inside drawing methods)
-	 *
-	 * @param paint
-	 * @param demoText
-	 * @return A Recyclable FSize instance
-	 */
-	public static FSize calcTextSize(Paint paint, String demoText) {
-
-		FSize result = FSize.getInstance(0, 0);
-		calcTextSize(paint, demoText, result);
-		return result;
-	}
-
-	private static final Rect mCalcTextSizeRect = new Rect();
-
-	/**
-	 * calculates the approximate size of a text, depending on a demo text
-	 * avoid repeated calls (e.g. inside drawing methods)
-	 *
-	 * @param paint
-	 * @param demoText
-	 * @param outputFSize An output variable, modified by the function.
-	 */
-	public static void calcTextSize(Paint paint, String demoText, FSize outputFSize) {
-
-		Rect r = mCalcTextSizeRect;
-		r.set(0, 0, 0, 0);
-		paint.getTextBounds(demoText, 0, demoText.length(), r);
-		outputFSize.width = r.width();
-		outputFSize.height = r.height();
-
-	}
-
 	/**
 	 * Math.pow(...) is very expensive, so avoid calling it and create it
 	 * yourself.
@@ -111,38 +75,6 @@ public static void calcTextSize(Paint paint, String demoText, FSize outputFSize)
 			1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000
 	};
 
-	private static final IValueFormatter mDefaultValueFormatter = generateDefaultValueFormatter();
-
-	private static IValueFormatter generateDefaultValueFormatter() {
-		return new DefaultValueFormatter(1);
-	}
-
-	/// - returns: The default value formatter used for all chart components that needs a default
-	public static IValueFormatter getDefaultValueFormatter() {
-		return mDefaultValueFormatter;
-	}
-
-	/**
-	 * Returns a recyclable MPPointF instance.
-	 * Calculates the position around a center point, depending on the distance
-	 * from the center, and the angle of the position around the center.
-	 *
-	 * @param center
-	 * @param dist
-	 * @param angle  in degrees, converted to radians internally
-	 * @return
-	 */
-	public static MPPointF getPosition(MPPointF center, float dist, float angle) {
-		MPPointF p = MPPointF.getInstance(0, 0);
-		getPosition(center, dist, angle, p);
-		return p;
-	}
-
-	public static void getPosition(MPPointF center, float dist, float angle, MPPointF outputPoint) {
-		outputPoint.x = (float) (center.x + dist * Math.cos(Math.toRadians(angle)));
-		outputPoint.y = (float) (center.y + dist * Math.sin(Math.toRadians(angle)));
-	}
-
 	public static void velocityTrackerPointerUpCleanUpIfNecessary(MotionEvent ev, VelocityTracker tracker) {
 
 		// Check the dot product of current velocities.
@@ -169,17 +101,6 @@ public static void velocityTrackerPointerUpCleanUpIfNecessary(MotionEvent ev, Ve
 		}
 	}
 
-	/**
-	 * returns an angle between 0.f < 360.f (not less than zero, less than 360)
-	 */
-	public static float getNormalizedAngle(float angle) {
-		while (angle < 0.f) {
-			angle += 360.f;
-		}
-
-		return angle % 360.f;
-	}
-
 	private static final Rect mDrawableBoundsCache = new Rect();
 
 	public static void drawImage(Canvas canvas, Drawable drawable, int x, int y) {

MPChartLib/src/main/java/com/github/mikephil/charting/utils/UtilsKt.kt

@@ -1,27 +1,26 @@
 package com.github.mikephil.charting.utils
 
 import android.content.Context
-import android.graphics.Paint
 import android.os.Build
 import android.util.DisplayMetrics
 import android.util.Log
-import android.util.Log.i
 import android.view.ViewConfiguration
+import com.github.mikephil.charting.formatter.DefaultValueFormatter
 import java.lang.Double
 import kotlin.Boolean
 import kotlin.Char
 import kotlin.CharArray
 import kotlin.Float
 import kotlin.Int
 import kotlin.String
+import kotlin.apply
 import kotlin.code
 import kotlin.math.ceil
 import kotlin.math.cos
 import kotlin.math.log10
 import kotlin.math.pow
 import kotlin.math.roundToInt
 import kotlin.math.sin
-import kotlin.time.times
 
 var metrics: DisplayMetrics? = null
 var minimumFlingVelocity = 0
@@ -89,13 +88,26 @@ fun getSDKInt() = Build.VERSION.SDK_INT
 
 fun Context.convertDpToPixel(dp: Float) = dp * this.resources.displayMetrics.density
 
+fun getDefaultValueFormatter() = DefaultValueFormatter(1)
+
 fun MPPointF.getPosition(dist: Float, angle: Float) :MPPointF {
     return MPPointF().apply {
         x = (this.x + dist * cos(Math.toRadians(angle.toDouble()))).toFloat()
         y = (this.y + dist * sin(Math.toRadians(angle.toDouble()))).toFloat()
     }
 }
 
+/**
+ * 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
+}
+
 fun Float.formatNumber(digitCount: Int, separateThousands: Boolean, separateChar: Char = '.'): String {
     var number = this
     var digitCount = digitCount