From 8b3401f62c8cf4437013c2128cf9766ded3c1aff Mon Sep 17 00:00:00 2001
From: Hannes Achleitner <hannes.software@gmx.at>
Date: Mon, 22 Dec 2025 17:14:28 +0100
Subject: [PATCH 1/2] Kotlin getNormalizedAngle

---
 .../mikephil/charting/components/Legend.kt    |   3 +-
 .../mikephil/charting/data/BaseDataSet.kt     |   4 +-
 .../charting/highlight/RadarHighlighter.kt    |  10 +-
 .../renderer/HorizontalBarChartRenderer.kt    |   3 +-
 .../charting/renderer/RadarChartRenderer.kt   |  11 +-
 .../charting/renderer/XAxisRenderer.kt        |   3 +-
 .../XAxisRendererHorizontalBarChart.kt        |   3 +-
 .../renderer/XAxisRendererRadarChart.kt       |   8 +-
 .../renderer/YAxisRendererRadarChart.kt       |  10 +-
 .../mikephil/charting/utils/CanvasUtils.kt    | 226 +++---------------
 .../github/mikephil/charting/utils/UtilsKt.kt |  26 +-
 11 files changed, 91 insertions(+), 216 deletions(-)

diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/Legend.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/components/Legend.kt
index 4b0d4b9f5f..066c92832f 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/components/Legend.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/components/Legend.kt
@@ -6,6 +6,7 @@ import com.github.mikephil.charting.utils.ColorTemplate
 import com.github.mikephil.charting.utils.FSize
 import com.github.mikephil.charting.utils.Utils
 import com.github.mikephil.charting.utils.ViewPortHandler
+import com.github.mikephil.charting.utils.calcTextSize
 import com.github.mikephil.charting.utils.convertDpToPixel
 import java.lang.Float
 import kotlin.Array
@@ -463,7 +464,7 @@ class Legend() : ComponentBase() {
 
                     // grouped forms have null labels
                     if (label != null) {
-                        calculatedLabelSizes.add(Utils.calcTextSize(labelpaint, label))
+                        calculatedLabelSizes.add(labelpaint.calcTextSize(label))
                         requiredWidth += if (drawingForm) formToTextSpace + formSize else 0f
                         requiredWidth += calculatedLabelSizes.get(i)!!.width
                     } else {
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt
index b8e8812bcb..b26607898e 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt
+++ b/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
@@ -255,7 +255,7 @@ abstract class BaseDataSet<T : Entry>() : IDataSet<T> {
 
     override var valueFormatter: IValueFormatter
         get() = if (needsFormatter())
-            Utils.getDefaultValueFormatter()
+            getDefaultValueFormatter()
         else
             mValueFormatter!!
         set(value) {
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/RadarHighlighter.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/RadarHighlighter.kt
index 4f6c60b71d..ed7eedb69a 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/RadarHighlighter.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/RadarHighlighter.kt
@@ -3,7 +3,7 @@ package com.github.mikephil.charting.highlight
 import com.github.mikephil.charting.charts.RadarChart
 import com.github.mikephil.charting.data.Entry
 import com.github.mikephil.charting.utils.MPPointF
-import com.github.mikephil.charting.utils.Utils
+import com.github.mikephil.charting.utils.getPosition
 import kotlin.math.abs
 
 open class RadarHighlighter(chart: RadarChart) : PieRadarHighlighter<RadarChart>(chart) {
@@ -42,7 +42,7 @@ open class RadarHighlighter(chart: RadarChart) : PieRadarHighlighter<RadarChart>
         val sliceAngle = chartPieRadar.sliceAngle
         val factor = chartPieRadar.factor
 
-        val pOut = MPPointF.getInstance(0f, 0f)
+        var pOut: MPPointF
         for (i in 0..<chartPieRadar.getData()!!.dataSetCount) {
             val dataSet = chartPieRadar.getData()!!.getDataSetByIndex(i)
 
@@ -50,9 +50,9 @@ open class RadarHighlighter(chart: RadarChart) : PieRadarHighlighter<RadarChart>
 
             val y = (entry!!.y - chartPieRadar.yChartMin)
 
-            Utils.getPosition(
-                chartPieRadar.centerOffsets, y * factor * phaseY,
-                sliceAngle * index * phaseX + chartPieRadar.rotationAngle, pOut
+            pOut = chartPieRadar.centerOffsets.getPosition(
+                y * factor * phaseY,
+                sliceAngle * index * phaseX + chartPieRadar.rotationAngle
             )
 
             mHighlightBuffer.add(Highlight(index.toFloat(), entry.y, pOut.x, pOut.y, i, dataSet.axisDependency))
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt
index 5c38011efc..feb215b9e8 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt
@@ -69,8 +69,7 @@ open class HorizontalBarChartRenderer(
                 var i = 0
                 val count = min((ceil(((dataSet.entryCount).toFloat() * phaseX).toDouble())).toInt().toDouble(), dataSet.entryCount.toDouble()).toInt()
                 while (i < count) {
-                    val barEntry = dataSet.getEntryForIndex(i)
-                    barEntry?.let {
+                    dataSet.getEntryForIndex(i)?.let {
                         x = it.x
 
                         mBarShadowRectBuffer.top = x - barWidthHalf
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt
index de5becd1aa..3db3111d02 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt
@@ -14,6 +14,7 @@ import com.github.mikephil.charting.utils.MPPointF
 import com.github.mikephil.charting.utils.Utils
 import com.github.mikephil.charting.utils.ViewPortHandler
 import com.github.mikephil.charting.utils.convertDpToPixel
+import com.github.mikephil.charting.utils.getPosition
 
 open class RadarChartRenderer(
     protected var chart: RadarChart, animator: ChartAnimator,
@@ -123,7 +124,7 @@ open class RadarChartRenderer(
         val factor = chart.factor
 
         val center = chart.centerOffsets
-        val pOut = MPPointF.getInstance(0f, 0f)
+        var pOut = MPPointF.getInstance(0f, 0f)
         val pIcon = MPPointF.getInstance(0f, 0f)
 
         val yOffset = 5f.convertDpToPixel()
@@ -149,12 +150,10 @@ open class RadarChartRenderer(
                 for (j in 0..<dataSet.entryCount) {
                     dataSet.getEntryForIndex(j)?.let { entry ->
 
-                        Utils.getPosition(
-                            center,
+                        pOut = center.getPosition(
                             (entry.y - chart.yChartMin) * factor * phaseY,
-                            sliceAngle * j * phaseX + chart.rotationAngle,
-                            pOut
-                        )
+                            sliceAngle * j * phaseX + chart.rotationAngle
+                    )
 
                         if (dataSet.isDrawValues) {
                             drawValue(
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRenderer.kt
index d662da7522..c046e43960 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRenderer.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRenderer.kt
@@ -18,6 +18,7 @@ import com.github.mikephil.charting.utils.MPPointF
 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.calcTextSize
 import com.github.mikephil.charting.utils.convertDpToPixel
 import kotlin.math.roundToInt
 
@@ -69,7 +70,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 = Utils.calcTextHeight(paintAxisLabels, "Q").toFloat()
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererHorizontalBarChart.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererHorizontalBarChart.kt
index cd29bcee04..1a2a5c0ef6 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererHorizontalBarChart.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererHorizontalBarChart.kt
@@ -15,6 +15,7 @@ import com.github.mikephil.charting.utils.MPPointF
 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.calcTextSize
 import com.github.mikephil.charting.utils.convertDpToPixel
 import kotlin.math.roundToInt
 
@@ -57,7 +58,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
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererRadarChart.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererRadarChart.kt
index 2760b91483..21f2781eba 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererRadarChart.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererRadarChart.kt
@@ -4,8 +4,8 @@ import android.graphics.Canvas
 import com.github.mikephil.charting.charts.RadarChart
 import com.github.mikephil.charting.components.XAxis
 import com.github.mikephil.charting.utils.MPPointF
-import com.github.mikephil.charting.utils.Utils
 import com.github.mikephil.charting.utils.ViewPortHandler
+import com.github.mikephil.charting.utils.getPosition
 
 class XAxisRendererRadarChart(viewPortHandler: ViewPortHandler, xAxis: XAxis, private val chart: RadarChart) : XAxisRenderer(viewPortHandler, xAxis, null) {
     override fun renderAxisLabels(canvas: Canvas) {
@@ -26,15 +26,15 @@ class XAxisRendererRadarChart(viewPortHandler: ViewPortHandler, xAxis: XAxis, pr
         val factor = chart.factor
 
         val center = chart.centerOffsets
-        val pOut = MPPointF.getInstance(0f, 0f)
+        var pOut = MPPointF.getInstance(0f, 0f)
         chart.getData()!!.maxEntryCountSet?.let { maxEntryCountSet ->
             for (i in 0..<maxEntryCountSet.entryCount) {
                 val label = xAxis.valueFormatter?.getFormattedValue(i.toFloat(), xAxis)
 
                 val angle = (sliceAngle * i + chart.rotationAngle) % 360f
 
-                Utils.getPosition(
-                    center, chart.yRange * factor + xAxis.mLabelWidth / 2f, angle, pOut
+                pOut = center.getPosition(
+                    chart.yRange * factor + xAxis.mLabelWidth / 2f, angle
                 )
 
                 drawLabel(
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererRadarChart.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererRadarChart.kt
index ae33e1f258..d718a8d0dc 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererRadarChart.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererRadarChart.kt
@@ -5,8 +5,8 @@ import android.graphics.Path
 import com.github.mikephil.charting.charts.RadarChart
 import com.github.mikephil.charting.components.YAxis
 import com.github.mikephil.charting.utils.MPPointF
-import com.github.mikephil.charting.utils.Utils
 import com.github.mikephil.charting.utils.ViewPortHandler
+import com.github.mikephil.charting.utils.getPosition
 import com.github.mikephil.charting.utils.roundToNextSignificant
 import kotlin.math.abs
 import kotlin.math.ceil
@@ -144,7 +144,7 @@ class YAxisRendererRadarChart(viewPortHandler: ViewPortHandler, yAxis: YAxis, pr
         paintAxisLabels.color = yAxis.textColor
 
         val center = chart.centerOffsets
-        val pOut = MPPointF.getInstance(0f, 0f)
+        var pOut = MPPointF.getInstance(0f, 0f)
         val factor = chart.factor
 
         val from = if (yAxis.isDrawBottomYLabelEntryEnabled) 0 else 1
@@ -158,7 +158,7 @@ class YAxisRendererRadarChart(viewPortHandler: ViewPortHandler, yAxis: YAxis, pr
         for (j in from..<to) {
             val r = (yAxis.mEntries[j] - yAxis.mAxisMinimum) * factor
 
-            Utils.getPosition(center, r, chart.rotationAngle, pOut)
+            pOut = center.getPosition(r, chart.rotationAngle)
 
             val label = yAxis.getFormattedLabel(j)
 
@@ -178,7 +178,7 @@ class YAxisRendererRadarChart(viewPortHandler: ViewPortHandler, yAxis: YAxis, pr
         val factor = chart.factor
 
         val center = chart.centerOffsets
-        val pOut = MPPointF.getInstance(0f, 0f)
+        var pOut = MPPointF.getInstance(0f, 0f)
         for (i in limitLines.indices) {
             val limitLine = limitLines[i]
 
@@ -195,7 +195,7 @@ class YAxisRendererRadarChart(viewPortHandler: ViewPortHandler, yAxis: YAxis, pr
 
             chart.getData()!!.maxEntryCountSet?.let { maxEntryCountSet ->
                 for (j in 0..<maxEntryCountSet.entryCount) {
-                    Utils.getPosition(center, r, sliceAngle * j + chart.rotationAngle, pOut)
+                    pOut = center.getPosition(r, sliceAngle * j + chart.rotationAngle)
 
                     if (j == 0)
                         limitPath.moveTo(pOut.x, pOut.y)
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/CanvasUtils.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/utils/CanvasUtils.kt
index 982c806c3c..8526ea996e 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/CanvasUtils.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/utils/CanvasUtils.kt
@@ -2,19 +2,49 @@ package com.github.mikephil.charting.utils
 
 import android.graphics.Canvas
 import android.graphics.Paint
-import android.graphics.Paint.Align
 import android.graphics.Rect
 import android.graphics.drawable.Drawable
-import android.text.StaticLayout
-import android.text.TextPaint
-import com.github.mikephil.charting.utils.Utils.FDEG2RAD
-import kotlin.math.abs
-import kotlin.math.cos
-import kotlin.math.sin
 
 private val mDrawableBoundsCache = Rect()
-val DEG2RAD: Double = (Math.PI / 180.0)
-val FDEG2RAD: Float = (Math.PI.toFloat() / 180f)
+
+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 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)
+ */
+fun Paint.calcTextHeight(demoText: String): Int {
+    val rect = Rect()
+    rect.set(0, 0, 0, 0)
+    this.getTextBounds(demoText, 0, demoText.length, rect)
+    return rect.height()
+}
 
 /**
  * Utilities class that has some helper methods. Needs to be initialized by
@@ -46,181 +76,3 @@ fun Canvas.drawImage(
     drawable.draw(this)
     this.restoreToCount(saveId)
 }
-
-private val mDrawTextRectBuffer = Rect()
-private val mFontMetricsBuffer = Paint.FontMetrics()
-
-fun Canvas.drawXAxisValue(
-    text: String?, x: Float, y: Float,
-    paint: Paint,
-    anchor: MPPointF, angleDegrees: Float
-) {
-    var drawOffsetX = 0f
-    var drawOffsetY = 0f
-
-    val lineHeight = paint.getFontMetrics(mFontMetricsBuffer)
-    text?.let { paint.getTextBounds(text, 0, it.length, mDrawTextRectBuffer) }
-
-    // Android sometimes has pre-padding
-    drawOffsetX -= mDrawTextRectBuffer.left.toFloat()
-
-    // Android does not snap the bounds to line boundaries,
-    //  and draws from bottom to top.
-    // And we want to normalize it.
-    drawOffsetY -= mFontMetricsBuffer.ascent
-
-    // To have a consistent point of reference, we always draw left-aligned
-    val originalTextAlign = paint.textAlign
-    paint.textAlign = Align.LEFT
-
-    if (angleDegrees != 0f) {
-        // Move the text drawing rect in a way that it always rotates around its center
-
-        drawOffsetX -= mDrawTextRectBuffer.width() * 0.5f
-        drawOffsetY -= lineHeight * 0.5f
-
-        var translateX = x
-        var translateY = y
-
-        // Move the "outer" rect relative to the anchor, assuming its centered
-        if (anchor.x != 0.5f || anchor.y != 0.5f) {
-            val rotatedSize = getSizeOfRotatedRectangleByDegrees(
-                mDrawTextRectBuffer.width().toFloat(),
-                lineHeight,
-                angleDegrees
-            )
-
-            translateX -= rotatedSize.width * (anchor.x - 0.5f)
-            translateY -= rotatedSize.height * (anchor.y - 0.5f)
-            FSize.recycleInstance(rotatedSize)
-        }
-
-        this.save()
-        this.translate(translateX, translateY)
-        this.rotate(angleDegrees)
-
-        text?.let { this.drawText(it, drawOffsetX, drawOffsetY, paint) }
-
-        this.restore()
-    } else {
-        if (anchor.x != 0f || anchor.y != 0f) {
-            drawOffsetX -= mDrawTextRectBuffer.width() * anchor.x
-            drawOffsetY -= lineHeight * anchor.y
-        }
-
-        drawOffsetX += x
-        drawOffsetY += y
-
-        text?.let { this.drawText(it, drawOffsetX, drawOffsetY, paint) }
-    }
-
-    paint.textAlign = originalTextAlign
-}
-
-fun Canvas.drawMultilineText(
-    textLayout: StaticLayout,
-    x: Float, y: Float,
-    paint: TextPaint,
-    anchor: MPPointF, angleDegrees: Float
-) {
-    var drawOffsetX = 0f
-    var drawOffsetY = 0f
-    val drawWidth: Float
-    val drawHeight: Float
-
-    val lineHeight = paint.getFontMetrics(mFontMetricsBuffer)
-
-    drawWidth = textLayout.width.toFloat()
-    drawHeight = textLayout.lineCount * lineHeight
-
-    // Android sometimes has pre-padding
-    drawOffsetX -= mDrawTextRectBuffer.left.toFloat()
-
-    // Android does not snap the bounds to line boundaries,
-    //  and draws from bottom to top.
-    // And we want to normalize it.
-    drawOffsetY += drawHeight
-
-    // To have a consistent point of reference, we always draw left-aligned
-    val originalTextAlign = paint.textAlign
-    paint.textAlign = Align.LEFT
-
-    if (angleDegrees != 0f) {
-        // Move the text drawing rect in a way that it always rotates around its center
-
-        drawOffsetX -= drawWidth * 0.5f
-        drawOffsetY -= drawHeight * 0.5f
-
-        var translateX = x
-        var translateY = y
-
-        // Move the "outer" rect relative to the anchor, assuming its centered
-        if (anchor.x != 0.5f || anchor.y != 0.5f) {
-            val rotatedSize = getSizeOfRotatedRectangleByDegrees(
-                drawWidth,
-                drawHeight,
-                angleDegrees
-            )
-
-            translateX -= rotatedSize.width * (anchor.x - 0.5f)
-            translateY -= rotatedSize.height * (anchor.y - 0.5f)
-            FSize.recycleInstance(rotatedSize)
-        }
-
-        this.save()
-        this.translate(translateX, translateY)
-        this.rotate(angleDegrees)
-
-        this.translate(drawOffsetX, drawOffsetY)
-        textLayout.draw(this)
-
-        this.restore()
-    } else {
-        if (anchor.x != 0f || anchor.y != 0f) {
-            drawOffsetX -= drawWidth * anchor.x
-            drawOffsetY -= drawHeight * anchor.y
-        }
-
-        drawOffsetX += x
-        drawOffsetY += y
-
-        this.save()
-
-        this.translate(drawOffsetX, drawOffsetY)
-        textLayout.draw(this)
-
-        this.restore()
-    }
-
-    paint.textAlign = originalTextAlign
-}
-
-/**
- * Returns a recyclable FSize instance.
- * Represents size of a rotated rectangle by degrees.
- *
- * @param rectangleWidth
- * @param rectangleHeight
- * @param degrees
- * @return A Recyclable FSize instance
- */
-fun getSizeOfRotatedRectangleByDegrees(rectangleWidth: Float, rectangleHeight: Float, degrees: Float): FSize {
-    val radians = degrees * FDEG2RAD
-    return getSizeOfRotatedRectangleByRadians(rectangleWidth, rectangleHeight, radians)
-}
-
-/**
- * Returns a recyclable FSize instance.
- * Represents size of a rotated rectangle by radians.
- *
- * @param rectangleWidth
- * @param rectangleHeight
- * @param radians
- * @return A Recyclable FSize instance
- */
-fun getSizeOfRotatedRectangleByRadians(rectangleWidth: Float, rectangleHeight: Float, radians: Float): FSize {
-    return FSize.getInstance(
-        abs(rectangleWidth * cos(radians.toDouble()).toFloat()) + abs(rectangleHeight * sin(radians.toDouble()).toFloat()),
-        abs(rectangleWidth * sin(radians.toDouble()).toFloat()) + abs(rectangleHeight * cos(radians.toDouble()).toFloat())
-    )
-}
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/UtilsKt.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/utils/UtilsKt.kt
index 98af308d62..9998d2758f 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/UtilsKt.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/utils/UtilsKt.kt
@@ -4,8 +4,8 @@ import android.content.Context
 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
@@ -13,12 +13,14 @@ 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.time.times
+import kotlin.math.sin
 
 var metrics: DisplayMetrics? = null
 var minimumFlingVelocity = 0
@@ -86,6 +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

From 9128faa6ee785e938b6813638eae85c358fa8197 Mon Sep 17 00:00:00 2001
From: Hannes Achleitner <hannes.software@gmx.at>
Date: Fri, 26 Dec 2025 10:52:45 +0100
Subject: [PATCH 2/2] Fix

---
 .../github/mikephil/charting/highlight/RadarHighlighter.kt    | 2 +-
 .../github/mikephil/charting/renderer/RadarChartRenderer.kt   | 2 +-
 .../mikephil/charting/renderer/XAxisRendererRadarChart.kt     | 2 +-
 .../mikephil/charting/renderer/YAxisRendererRadarChart.kt     | 4 ++--
 .../main/java/com/github/mikephil/charting/utils/UtilsKt.kt   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/RadarHighlighter.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/RadarHighlighter.kt
index ed7eedb69a..e60ceb5b7c 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/RadarHighlighter.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/RadarHighlighter.kt
@@ -50,7 +50,7 @@ open class RadarHighlighter(chart: RadarChart) : PieRadarHighlighter<RadarChart>
 
             val y = (entry!!.y - chartPieRadar.yChartMin)
 
-            pOut = chartPieRadar.centerOffsets.getPosition(
+            pOut = getPosition(
                 y * factor * phaseY,
                 sliceAngle * index * phaseX + chartPieRadar.rotationAngle
             )
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt
index 3db3111d02..d5ca27d66e 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt
@@ -150,7 +150,7 @@ open class RadarChartRenderer(
                 for (j in 0..<dataSet.entryCount) {
                     dataSet.getEntryForIndex(j)?.let { entry ->
 
-                        pOut = center.getPosition(
+                        pOut = getPosition(
                             (entry.y - chart.yChartMin) * factor * phaseY,
                             sliceAngle * j * phaseX + chart.rotationAngle
                     )
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererRadarChart.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererRadarChart.kt
index 21f2781eba..63e751142c 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererRadarChart.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererRadarChart.kt
@@ -33,7 +33,7 @@ class XAxisRendererRadarChart(viewPortHandler: ViewPortHandler, xAxis: XAxis, pr
 
                 val angle = (sliceAngle * i + chart.rotationAngle) % 360f
 
-                pOut = center.getPosition(
+                pOut = getPosition(
                     chart.yRange * factor + xAxis.mLabelWidth / 2f, angle
                 )
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererRadarChart.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererRadarChart.kt
index d718a8d0dc..ee5fa88e81 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererRadarChart.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererRadarChart.kt
@@ -158,7 +158,7 @@ class YAxisRendererRadarChart(viewPortHandler: ViewPortHandler, yAxis: YAxis, pr
         for (j in from..<to) {
             val r = (yAxis.mEntries[j] - yAxis.mAxisMinimum) * factor
 
-            pOut = center.getPosition(r, chart.rotationAngle)
+            pOut = getPosition(r, chart.rotationAngle)
 
             val label = yAxis.getFormattedLabel(j)
 
@@ -195,7 +195,7 @@ class YAxisRendererRadarChart(viewPortHandler: ViewPortHandler, yAxis: YAxis, pr
 
             chart.getData()!!.maxEntryCountSet?.let { maxEntryCountSet ->
                 for (j in 0..<maxEntryCountSet.entryCount) {
-                    pOut = center.getPosition(r, sliceAngle * j + chart.rotationAngle)
+                    pOut = getPosition(r, sliceAngle * j + chart.rotationAngle)
 
                     if (j == 0)
                         limitPath.moveTo(pOut.x, pOut.y)
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/UtilsKt.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/utils/UtilsKt.kt
index 9998d2758f..3d9a1e2287 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/UtilsKt.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/utils/UtilsKt.kt
@@ -90,7 +90,7 @@ fun Context.convertDpToPixel(dp: Float) = dp * this.resources.displayMetrics.den
 
 fun getDefaultValueFormatter() = DefaultValueFormatter(1)
 
-fun MPPointF.getPosition(dist: Float, angle: Float) :MPPointF {
+fun 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()