Move calc text height

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.calcTextHeight
 import com.github.mikephil.charting.utils.convertDpToPixel
 import java.lang.Float
 import kotlin.Array
@@ -224,7 +225,7 @@ class Legend() : ComponentBase() {
             val label = entry.label
             if (label == null) continue
 
-            val length = Utils.calcTextHeight(p, label).toFloat()
+            val length = p.calcTextHeight(label).toFloat()
 
             if (length > max) max = length
         }

MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.kt

@@ -3,6 +3,7 @@ package com.github.mikephil.charting.components
 import android.graphics.Color
 import android.graphics.Paint
 import com.github.mikephil.charting.utils.Utils
+import com.github.mikephil.charting.utils.calcTextHeight
 import com.github.mikephil.charting.utils.convertDpToPixel
 import kotlin.math.abs
 import kotlin.math.max
@@ -169,7 +170,7 @@ class YAxis : AxisBase {
      * use Inifinity for disabling the maximum
      * default: Float.POSITIVE_INFINITY (no maximum specified)
      */
-    var maxWidth: Float = Float.Companion.POSITIVE_INFINITY
+    var maxWidth: Float = Float.POSITIVE_INFINITY
 
     /**
      * Enum that specifies the axis a DataSet should be plotted against, either LEFT or RIGHT.
@@ -236,7 +237,7 @@ class YAxis : AxisBase {
      * This is for normal (not horizontal) charts horizontal spacing.
      */
     fun getRequiredWidthSpace(p: Paint): Float {
-        p.setTextSize(mTextSize)
+        p.textSize = mTextSize
 
         val label = getLongestLabel(p)
         var width = Utils.calcTextWidth(p, label).toFloat() + xOffset * 2f
@@ -246,7 +247,7 @@ class YAxis : AxisBase {
 
         if (minWidth > 0f) minWidth = minWidth.convertDpToPixel()
 
-        if (maxWidth > 0f && maxWidth != Float.Companion.POSITIVE_INFINITY) maxWidth = maxWidth.convertDpToPixel()
+        if (maxWidth > 0f && maxWidth != Float.POSITIVE_INFINITY) maxWidth = maxWidth.convertDpToPixel()
 
         width = max(minWidth, min(width, if (maxWidth > 0.0) maxWidth else width))
 
@@ -257,24 +258,20 @@ class YAxis : AxisBase {
      * This is for HorizontalBarChart vertical spacing.
      */
     fun getRequiredHeightSpace(p: Paint): Float {
-        p.setTextSize(mTextSize)
+        p.textSize = mTextSize
 
         val label = getLongestLabel(p)
-        return Utils.calcTextHeight(p, label).toFloat() + yOffset * 2f
+        return p.calcTextHeight(label).toFloat() + yOffset * 2f
     }
 
     /**
      * Returns true if this axis needs horizontal offset, false if no offset is needed.
      */
     fun needsOffset(): Boolean {
-        return if (isEnabled && isDrawLabelsEnabled && this.labelPosition == YAxisLabelPosition.OUTSIDE_CHART)
-            true
-        else
-            false
+        return isEnabled && isDrawLabelsEnabled && this.labelPosition == YAxisLabelPosition.OUTSIDE_CHART
     }
 
-
-    public override fun calculate(dataMin: Float, dataMax: Float) {
+    override fun calculate(dataMin: Float, dataMax: Float) {
         var min = dataMin
         var max = dataMax
 

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
@@ -278,7 +279,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)
 

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
@@ -98,7 +99,7 @@ open class BubbleChartRenderer(
         if (isDrawingValuesAllowed(dataProvider)) {
             val dataSets = bubbleData.dataSets
 
-            val lineHeight = Utils.calcTextHeight(paintValues, "1").toFloat()
+            val lineHeight = paintValues.calcTextHeight("1").toFloat()
 
             dataSets?.let {
                 for (i in it.indices) {

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.convertDpToPixel
 import kotlin.math.ceil
 import kotlin.math.min
@@ -186,7 +187,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
 

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.convertDpToPixel
 import java.util.Collections
 import kotlin.math.min
@@ -209,7 +210,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
 

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
@@ -405,7 +406,7 @@ open class PieChartRenderer(
                     // apply the text-styling defined by the DataSet
                     applyValueTextStyle(dataSet)
 
-                    val lineHeight = (Utils.calcTextHeight(paintValues, "Q")
+                    val lineHeight = (paintValues.calcTextHeight("Q")
                             + 4f.convertDpToPixel())
 
                     val formatter = dataSet.valueFormatter

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

@@ -18,7 +18,9 @@ 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 com.github.mikephil.charting.utils.drawXAxisValue
 import kotlin.math.roundToInt
 
 open class XAxisRenderer(
@@ -72,7 +74,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,
@@ -102,21 +104,25 @@ open class XAxisRenderer(
                 pointF.y = 1.0f
                 drawLabels(canvas, viewPortHandler.contentTop() - yOffset, pointF)
             }
+
             XAxisPosition.TOP_INSIDE -> {
                 pointF.x = 0.5f
                 pointF.y = 1.0f
                 drawLabels(canvas, viewPortHandler.contentTop() + yOffset + xAxis.mLabelHeight, pointF)
             }
+
             XAxisPosition.BOTTOM -> {
                 pointF.x = 0.5f
                 pointF.y = 0.0f
                 drawLabels(canvas, viewPortHandler.contentBottom() + yOffset, pointF)
             }
+
             XAxisPosition.BOTTOM_INSIDE -> {
                 pointF.x = 0.5f
                 pointF.y = 0.0f
                 drawLabels(canvas, viewPortHandler.contentBottom() - yOffset - xAxis.mLabelHeight, pointF)
             }
+
             else -> { // BOTH SIDED
                 pointF.x = 0.5f
                 pointF.y = 1.0f
@@ -222,7 +228,7 @@ open class XAxisRenderer(
     }
 
     protected fun drawLabel(canvas: Canvas, formattedLabel: String?, x: Float, y: Float, anchor: MPPointF, angleDegrees: Float) {
-        formattedLabel?.let { Utils.drawXAxisValue(canvas, it, x, y, paintAxisLabels, anchor, angleDegrees) }
+        formattedLabel?.let { canvas.drawXAxisValue(it, x, y, paintAxisLabels, anchor, angleDegrees) }
     }
 
     protected open var renderGridLinesPath: Path = Path()
@@ -384,7 +390,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,
@@ -399,7 +405,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

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
 
@@ -253,7 +254,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
 

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 axisDependency = yAxis.axisDependency
         val labelPosition = yAxis.labelPosition
@@ -317,7 +317,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
 
@@ -436,7 +436,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
 

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

@@ -12,8 +12,8 @@ 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 com.github.mikephil.charting.utils.calcTextHeight
 import com.github.mikephil.charting.utils.convertDpToPixel
 
 @Suppress("MemberVisibilityCanBePrivate")
@@ -76,7 +76,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
@@ -283,7 +283,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)
                         }
@@ -293,7 +293,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 -> {