Kotlin calcTextHeight

hannesa2 · hannesa2 · commit 333ca582571f · 2025-12-18T14:59:44.000+01:00
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/Legend.java b/MPChartLib/src/main/java/com/github/mikephil/charting/components/Legend.java
@@ -222,7 +222,7 @@ public float getMaximumEntryHeight(Paint p) {
             String label = entry.label;
             if (label == null) continue;
 
-            float length = (float) Utils.calcTextHeight(p, label);
+            float length = (float) CanvasUtilsKt.calcTextHeight(p, label);
 
             if (length > max)
                 max = length;
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.java b/MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.java
@@ -4,7 +4,6 @@
 import android.graphics.Paint;
 
 import com.github.mikephil.charting.utils.CanvasUtilsKt;
-import com.github.mikephil.charting.utils.Utils;
 import com.github.mikephil.charting.utils.UtilsKtKt;
 
 /**
@@ -334,7 +333,7 @@ public float getRequiredHeightSpace(Paint p) {
         p.setTextSize(mTextSize);
 
         String label = getLongestLabel(p);
-        return (float) Utils.calcTextHeight(p, label) + getYOffset() * 2f;
+        return (float) CanvasUtilsKt.calcTextHeight(p, label) + getYOffset() * 2f;
     }
 
     /**
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt
@@ -14,6 +14,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.calcTextHeight
 import com.github.mikephil.charting.utils.convertDpToPixel
 import kotlin.math.ceil
 import kotlin.math.min
@@ -277,7 +278,7 @@ open class BarChartRenderer(
 
                 // calculate the correct offset depending on the draw position of
                 // the value
-                val valueTextHeight = Utils.calcTextHeight(paintValues, "8").toFloat()
+                val valueTextHeight = paintValues.calcTextHeight("8").toFloat()
                 posOffset = (if (drawValueAboveBar) -valueOffsetPlus else valueTextHeight + valueOffsetPlus)
                 negOffset = (if (drawValueAboveBar) valueTextHeight + valueOffsetPlus else -valueOffsetPlus)
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt
@@ -10,6 +10,7 @@ import com.github.mikephil.charting.interfaces.datasets.IBubbleDataSet
 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.calcTextHeight
 import com.github.mikephil.charting.utils.convertDpToPixel
 import kotlin.math.abs
 import kotlin.math.max
@@ -96,7 +97,7 @@ open class BubbleChartRenderer(
         if (isDrawingValuesAllowed(dataProvider)) {
             val dataSets = bubbleData.dataSets
 
-            val lineHeight = Utils.calcTextHeight(paintValues, "1").toFloat()
+            val lineHeight = paintValues.calcTextHeight("1").toFloat()
 
             for (i in dataSets.indices) {
                 val dataSet = dataSets[i]
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
@@ -14,6 +14,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.calcTextHeight
 import com.github.mikephil.charting.utils.calcTextWidth
 import com.github.mikephil.charting.utils.convertDpToPixel
 import kotlin.math.ceil
@@ -188,7 +189,7 @@ open class HorizontalBarChartRenderer(
 
                 // apply the text-styling defined by the DataSet
                 applyValueTextStyle(dataSet)
-                val halfTextHeight = Utils.calcTextHeight(paintValues, "10") / 2f
+                val halfTextHeight = paintValues.calcTextHeight("10") / 2f
 
                 val formatter = dataSet.valueFormatter
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LegendRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LegendRenderer.kt
@@ -19,6 +19,7 @@ import com.github.mikephil.charting.interfaces.datasets.IPieDataSet
 import com.github.mikephil.charting.utils.ColorTemplate
 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.calcTextWidth
 import com.github.mikephil.charting.utils.convertDpToPixel
 import java.util.Collections
@@ -211,7 +212,7 @@ open class LegendRenderer(
         val labelLineHeight = Utils.getLineHeight(labelPaint, legendFontMetrics)
         val labelLineSpacing = (Utils.getLineSpacing(labelPaint, legendFontMetrics)
                 + legend.yEntrySpace.convertDpToPixel())
-        val formYOffset = labelLineHeight - Utils.calcTextHeight(labelPaint, "ABC") / 2f
+        val formYOffset = labelLineHeight - labelPaint.calcTextHeight("ABC") / 2f
 
         val entries = legend.entries
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.kt
@@ -21,6 +21,7 @@ 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.ViewPortHandler
+import com.github.mikephil.charting.utils.calcTextHeight
 import com.github.mikephil.charting.utils.convertDpToPixel
 import java.lang.ref.WeakReference
 import kotlin.math.abs
@@ -406,8 +407,7 @@ open class PieChartRenderer(
                 // apply the text-styling defined by the DataSet
                 applyValueTextStyle(dataSet)
 
-                val lineHeight = (Utils.calcTextHeight(paintValues, "Q")
-                        + 4f.convertDpToPixel())
+                val lineHeight = paintValues.calcTextHeight("Q") + 4f.convertDpToPixel()
 
                 val formatter = dataSet.valueFormatter
 
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
@@ -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.calcTextHeight
 import com.github.mikephil.charting.utils.calcTextWidth
 import com.github.mikephil.charting.utils.convertDpToPixel
 import com.github.mikephil.charting.utils.drawXAxisValue
@@ -75,7 +76,7 @@ open class XAxisRenderer(
         val labelSize = Utils.calcTextSize(paintAxisLabels, longest)
 
         val labelWidth = labelSize.width
-        val labelHeight = Utils.calcTextHeight(paintAxisLabels, "Q").toFloat()
+        val labelHeight = paintAxisLabels.calcTextHeight("Q").toFloat()
 
         val labelRotatedSize = Utils.getSizeOfRotatedRectangleByDegrees(
             labelWidth,
@@ -388,7 +389,7 @@ open class XAxisRenderer(
 
             when (labelPosition) {
                 LimitLabelPosition.RIGHT_TOP -> {
-                    val labelLineHeight = Utils.calcTextHeight(limitLinePaint, label).toFloat()
+                    val labelLineHeight = limitLinePaint.calcTextHeight(label).toFloat()
                     limitLinePaint.textAlign = Align.LEFT
                     canvas.drawText(
                         label, position[0] + xOffset, viewPortHandler.contentTop() + yOffset + labelLineHeight,
@@ -401,7 +402,7 @@ open class XAxisRenderer(
                 }
                 LimitLabelPosition.LEFT_TOP -> {
                     limitLinePaint.textAlign = Align.RIGHT
-                    val labelLineHeight = Utils.calcTextHeight(limitLinePaint, label).toFloat()
+                    val labelLineHeight = limitLinePaint.calcTextHeight(label).toFloat()
                     canvas.drawText(
                         label, position[0] - xOffset, viewPortHandler.contentTop() + yOffset + labelLineHeight,
                         limitLinePaint
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
@@ -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.calcTextHeight
 import com.github.mikephil.charting.utils.convertDpToPixel
 import kotlin.math.roundToInt
 
@@ -250,7 +251,7 @@ open class XAxisRendererHorizontalBarChart(
                     limitLinePaint.strokeWidth = 0.5f
                     limitLinePaint.textSize = limitLine.textSize
 
-                    val labelLineHeight = Utils.calcTextHeight(limitLinePaint, label).toFloat()
+                    val labelLineHeight = limitLinePaint.calcTextHeight(label).toFloat()
                     val xOffset = 4f.convertDpToPixel() + limitLine.xOffset
                     val yOffset = limitLine.lineWidth + labelLineHeight + limitLine.yOffset
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.kt
@@ -11,10 +11,10 @@ import com.github.mikephil.charting.components.YAxis
 import com.github.mikephil.charting.components.YAxis.AxisDependency
 import com.github.mikephil.charting.components.YAxis.YAxisLabelPosition
 import com.github.mikephil.charting.utils.Transformer
-import com.github.mikephil.charting.utils.Utils
 import com.github.mikephil.charting.utils.ViewPortHandler
 import androidx.core.graphics.withSave
 import androidx.core.graphics.withClip
+import com.github.mikephil.charting.utils.calcTextHeight
 import com.github.mikephil.charting.utils.convertDpToPixel
 
 open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected var yAxis: YAxis, trans: Transformer?) :
@@ -61,7 +61,7 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
         paintAxisLabels.textSize = yAxis.textSize
         paintAxisLabels.color = yAxis.textColor
 
-        val yOffset = Utils.calcTextHeight(paintAxisLabels, "A") / 2.5f + yAxis.yOffset
+        val yOffset = paintAxisLabels.calcTextHeight("A") / 2.5f + yAxis.yOffset
 
         val dependency = yAxis.axisDependency
         val labelPosition = yAxis.labelPosition
@@ -314,7 +314,7 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
                         limitLinePaint.strokeWidth = 0.5f
                         limitLinePaint.textSize = limitLine.textSize
 
-                        val labelLineHeight = Utils.calcTextHeight(limitLinePaint, label).toFloat()
+                        val labelLineHeight = limitLinePaint.calcTextHeight(label).toFloat()
                         val xOffset = 4f.convertDpToPixel() + limitLine.xOffset
                         val yOffset = limitLine.lineWidth + labelLineHeight + limitLine.yOffset
 
@@ -433,7 +433,7 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
                     limitRangePaint.strokeWidth = 0.5f
                     limitRangePaint.textSize = limitRange.textSize
 
-                    val labelLineHeight = Utils.calcTextHeight(limitRangePaint, label).toFloat()
+                    val labelLineHeight = limitRangePaint.calcTextHeight(label).toFloat()
                     val xOffset = 4f.convertDpToPixel() + limitRange.xOffset
                     val yOffset = limitRange.lineWidth + labelLineHeight + limitRange.yOffset
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererHorizontalBarChart.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererHorizontalBarChart.kt
@@ -11,9 +11,9 @@ import com.github.mikephil.charting.components.YAxis.AxisDependency
 import com.github.mikephil.charting.components.YAxis.YAxisLabelPosition
 import com.github.mikephil.charting.utils.MPPointD
 import com.github.mikephil.charting.utils.Transformer
-import com.github.mikephil.charting.utils.Utils
 import com.github.mikephil.charting.utils.ViewPortHandler
 import androidx.core.graphics.withSave
+import com.github.mikephil.charting.utils.calcTextHeight
 import com.github.mikephil.charting.utils.convertDpToPixel
 
 @Suppress("MemberVisibilityCanBePrivate")
@@ -75,7 +75,7 @@ open class YAxisRendererHorizontalBarChart(
         paintAxisLabels.textAlign = Align.CENTER
 
         val baseYOffset = 2.5f.convertDpToPixel()
-        val textHeight = Utils.calcTextHeight(paintAxisLabels, "Q").toFloat()
+        val textHeight = paintAxisLabels.calcTextHeight("Q").toFloat()
 
         val dependency = yAxis.axisDependency
         val labelPosition = yAxis.labelPosition
@@ -280,7 +280,7 @@ open class YAxisRendererHorizontalBarChart(
 
                     when (position) {
                         LimitLabelPosition.RIGHT_TOP -> {
-                            val labelLineHeight = Utils.calcTextHeight(limitLinePaint, label).toFloat()
+                            val labelLineHeight = limitLinePaint.calcTextHeight(label).toFloat()
                             limitLinePaint.textAlign = Align.LEFT
                             canvas.drawText(label, pts[0] + xOffset, viewPortHandler.contentTop() + yOffset + labelLineHeight, limitLinePaint)
                         }
@@ -290,7 +290,7 @@ open class YAxisRendererHorizontalBarChart(
                         }
                         LimitLabelPosition.LEFT_TOP -> {
                             limitLinePaint.textAlign = Align.RIGHT
-                            val labelLineHeight = Utils.calcTextHeight(limitLinePaint, label).toFloat()
+                            val labelLineHeight = limitLinePaint.calcTextHeight(label).toFloat()
                             canvas.drawText(label, pts[0] - xOffset, viewPortHandler.contentTop() + yOffset + labelLineHeight, limitLinePaint)
                         }
                         else -> {
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
@@ -21,6 +21,17 @@ val FDEG2RAD: Float = (Math.PI.toFloat() / 180f)
  */
 fun Paint.calcTextWidth(demoText: String?) = this.measureText(demoText).toInt()
 
+/**
+ * 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
  * calling Utils.init(...) before usage. Inside the Chart.init() method, this is
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/Utils.java b/MPChartLib/src/main/java/com/github/mikephil/charting/utils/Utils.java
@@ -47,24 +47,6 @@ public static void init(@NonNull Context context) {
 		maximumFlingVelocity = viewConfiguration.getScaledMaximumFlingVelocity();
 	}
 
-	private static final Rect mCalcTextHeightRect = new Rect();
-
-	/**
-	 * calculates the approximate height of a text, depending on a demo text
-	 * avoid repeated calls (e.g. inside drawing methods)
-	 *
-	 * @param paint
-	 * @param demoText
-	 * @return
-	 */
-	public static int calcTextHeight(Paint paint, String demoText) {
-
-		Rect r = mCalcTextHeightRect;
-		r.set(0, 0, 0, 0);
-		paint.getTextBounds(demoText, 0, demoText.length(), r);
-		return r.height();
-	}
-
 	private static final Paint.FontMetrics mFontMetrics = new Paint.FontMetrics();
 
 	public static float getLineHeight(Paint paint) {
