From 734e8c100d823af3cf4f057d9848c50fddf3deec Mon Sep 17 00:00:00 2001
From: Hannes Achleitner <hannes.software@gmx.at>
Date: Sun, 4 Jan 2026 10:57:11 +0100
Subject: [PATCH] Hide AxisBase variables

---
 .../charting/charts/BarLineChartBase.kt       | 26 +++++++++----------
 .../info/appdev/charting/charts/Chart.kt      |  4 +--
 .../charting/charts/HorizontalBarChart.kt     | 12 ++++-----
 .../info/appdev/charting/charts/RadarChart.kt | 10 +++----
 .../appdev/charting/components/AxisBase.kt    | 18 +++++--------
 .../info/appdev/charting/components/YAxis.kt  |  6 ++---
 .../renderer/YAxisRendererRadarChart.kt       |  8 +++---
 7 files changed, 39 insertions(+), 45 deletions(-)

diff --git a/chartLib/src/main/kotlin/info/appdev/charting/charts/BarLineChartBase.kt b/chartLib/src/main/kotlin/info/appdev/charting/charts/BarLineChartBase.kt
index 3a40afb1d..4592a4e37 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/charts/BarLineChartBase.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/charts/BarLineChartBase.kt
@@ -224,15 +224,15 @@ abstract class BarLineChartBase<T : BarLineScatterCandleBubbleData<IBarLineScatt
         }
 
         if (mAxisLeft.isEnabled) {
-            axisRendererLeft.computeAxis(mAxisLeft.mAxisMinimum, mAxisLeft.mAxisMaximum, mAxisLeft.isInverted)
+            axisRendererLeft.computeAxis(mAxisLeft.axisMinimum, mAxisLeft.axisMaximum, mAxisLeft.isInverted)
         }
 
         if (mAxisRight.isEnabled) {
-            axisRendererRight.computeAxis(mAxisRight.mAxisMinimum, mAxisRight.mAxisMaximum, mAxisRight.isInverted)
+            axisRendererRight.computeAxis(mAxisRight.axisMinimum, mAxisRight.axisMaximum, mAxisRight.isInverted)
         }
 
         if (mXAxis.isEnabled) {
-            xAxisRenderer.computeAxis(mXAxis.mAxisMinimum, mXAxis.mAxisMaximum, false)
+            xAxisRenderer.computeAxis(mXAxis.axisMinimum, mXAxis.axisMaximum, false)
         }
 
         // Y-axis labels could have changed in size affecting the offsets
@@ -352,11 +352,11 @@ abstract class BarLineChartBase<T : BarLineScatterCandleBubbleData<IBarLineScatt
 
     protected open fun prepareValuePxMatrix() {
         if (isLogEnabled) {
-            Timber.i("Preparing Value-Px Matrix, xMin: ${mXAxis.mAxisMinimum}, xMax: ${mXAxis.mAxisMaximum}, xDelta: ${mXAxis.axisRange}")
+            Timber.i("Preparing Value-Px Matrix, xMin: ${mXAxis.axisMinimum}, xMax: ${mXAxis.axisMaximum}, xDelta: ${mXAxis.axisRange}")
         }
 
-        mRightAxisTransformer.prepareMatrixValuePx(mXAxis.mAxisMinimum, mXAxis.axisRange, mAxisRight.axisRange, this.mAxisRight.mAxisMinimum)
-        mLeftAxisTransformer.prepareMatrixValuePx(mXAxis.mAxisMinimum, mXAxis.axisRange, mAxisLeft.axisRange, mAxisLeft.mAxisMinimum)
+        mRightAxisTransformer.prepareMatrixValuePx(mXAxis.axisMinimum, mXAxis.axisRange, mAxisRight.axisRange, this.mAxisRight.axisMinimum)
+        mLeftAxisTransformer.prepareMatrixValuePx(mXAxis.axisMinimum, mXAxis.axisRange, mAxisLeft.axisRange, mAxisLeft.axisMinimum)
     }
 
     protected fun prepareOffsetMatrix() {
@@ -380,9 +380,9 @@ abstract class BarLineChartBase<T : BarLineScatterCandleBubbleData<IBarLineScatt
 
         calcMinMax()
 
-        axisRendererLeft.computeAxis(mAxisLeft.mAxisMinimum, mAxisLeft.mAxisMaximum, mAxisLeft.isInverted)
-        axisRendererRight.computeAxis(mAxisRight.mAxisMinimum, mAxisRight.mAxisMaximum, mAxisRight.isInverted)
-        xAxisRenderer.computeAxis(mXAxis.mAxisMinimum, mXAxis.mAxisMaximum, false)
+        axisRendererLeft.computeAxis(mAxisLeft.axisMinimum, mAxisLeft.axisMaximum, mAxisLeft.isInverted)
+        axisRendererRight.computeAxis(mAxisRight.axisMinimum, mAxisRight.axisMaximum, mAxisRight.isInverted)
+        xAxisRenderer.computeAxis(mXAxis.axisMinimum, mXAxis.axisMaximum, false)
 
         legendRenderer?.computeLegend(data!!)
 
@@ -1110,7 +1110,7 @@ abstract class BarLineChartBase<T : BarLineScatterCandleBubbleData<IBarLineScatt
          */
         get() {
             getTransformer(AxisDependency.LEFT).getValuesByTouchPoint(viewPortHandler.contentLeft(), viewPortHandler.contentBottom(), posForGetLowestVisibleX)
-            return max(mXAxis.mAxisMinimum.toDouble(), posForGetLowestVisibleX.x).toFloat()
+            return max(mXAxis.axisMinimum.toDouble(), posForGetLowestVisibleX.x).toFloat()
         }
 
     /**
@@ -1129,7 +1129,7 @@ abstract class BarLineChartBase<T : BarLineScatterCandleBubbleData<IBarLineScatt
                 viewPortHandler.contentBottom(),
                 posForGetHighestVisibleX
             )
-            return min(mXAxis.mAxisMaximum.toDouble(), posForGetHighestVisibleX.x).toFloat()
+            return min(mXAxis.axisMaximum.toDouble(), posForGetHighestVisibleX.x).toFloat()
         }
 
     val visibleXRange: Float
@@ -1241,10 +1241,10 @@ abstract class BarLineChartBase<T : BarLineScatterCandleBubbleData<IBarLineScatt
         }
 
     override val yChartMax: Float
-        get() = max(mAxisLeft.mAxisMaximum, mAxisRight.mAxisMaximum)
+        get() = max(mAxisLeft.axisMaximum, mAxisRight.axisMaximum)
 
     override val yChartMin: Float
-        get() = min(mAxisLeft.mAxisMinimum, mAxisRight.mAxisMinimum)
+        get() = min(mAxisLeft.axisMinimum, mAxisRight.axisMinimum)
 
     val isAnyAxisInverted: Boolean
         /**
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/charts/Chart.kt b/chartLib/src/main/kotlin/info/appdev/charting/charts/Chart.kt
index 96759f2c0..a43a63615 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/charts/Chart.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/charts/Chart.kt
@@ -815,10 +815,10 @@ abstract class Chart<T : ChartData<out IDataSet<out Entry>>> : ViewGroup, IBaseP
         get() = mData!!.yMax
 
     override val xChartMax: Float
-        get() = mXAxis.mAxisMaximum
+        get() = mXAxis.axisMaximum
 
     override val xChartMin: Float
-        get() = mXAxis.mAxisMinimum
+        get() = mXAxis.axisMinimum
 
     override val xRange: Float
         get() = mXAxis.axisRange
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/charts/HorizontalBarChart.kt b/chartLib/src/main/kotlin/info/appdev/charting/charts/HorizontalBarChart.kt
index 227b9871f..364c2f11f 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/charts/HorizontalBarChart.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/charts/HorizontalBarChart.kt
@@ -193,12 +193,12 @@ open class HorizontalBarChart : BarChart {
 
     override fun prepareValuePxMatrix() {
         mRightAxisTransformer.prepareMatrixValuePx(
-            mAxisRight.mAxisMinimum, mAxisRight.axisRange, mXAxis.axisRange,
-            mXAxis.mAxisMinimum
+            mAxisRight.axisMinimum, mAxisRight.axisRange, mXAxis.axisRange,
+            mXAxis.axisMinimum
         )
         mLeftAxisTransformer.prepareMatrixValuePx(
-            mAxisLeft.mAxisMinimum, mAxisLeft.axisRange, mXAxis.axisRange,
-            mXAxis.mAxisMinimum
+            mAxisLeft.axisMinimum, mAxisLeft.axisRange, mXAxis.axisRange,
+            mXAxis.axisMinimum
         )
     }
 
@@ -266,7 +266,7 @@ open class HorizontalBarChart : BarChart {
                 viewPortHandler.contentLeft(),
                 viewPortHandler.contentBottom(), posForGetLowestVisibleX
             )
-            return max(mXAxis.mAxisMinimum.toDouble(), posForGetLowestVisibleX.y).toFloat()
+            return max(mXAxis.axisMinimum.toDouble(), posForGetLowestVisibleX.y).toFloat()
         }
 
     override val highestVisibleX: Float
@@ -275,7 +275,7 @@ open class HorizontalBarChart : BarChart {
                 viewPortHandler.contentLeft(),
                 viewPortHandler.contentTop(), posForGetHighestVisibleX
             )
-            return min(mXAxis.mAxisMaximum.toDouble(), posForGetHighestVisibleX.y).toFloat()
+            return min(mXAxis.axisMaximum.toDouble(), posForGetHighestVisibleX.y).toFloat()
         }
 
     /**
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/charts/RadarChart.kt b/chartLib/src/main/kotlin/info/appdev/charting/charts/RadarChart.kt
index 53389c865..b6ba8df2d 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/charts/RadarChart.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/charts/RadarChart.kt
@@ -122,8 +122,8 @@ open class RadarChart : PieRadarChartBase<RadarData> {
         mData?.let { data ->
             calcMinMax()
 
-            mYAxisRenderer!!.computeAxis(mYAxis!!.mAxisMinimum, mYAxis!!.mAxisMaximum, mYAxis!!.isInverted)
-            mXAxisRenderer!!.computeAxis(mXAxis.mAxisMinimum, mXAxis.mAxisMaximum, false)
+            mYAxisRenderer!!.computeAxis(mYAxis!!.axisMinimum, mYAxis!!.axisMaximum, mYAxis!!.isInverted)
+            mXAxisRenderer!!.computeAxis(mXAxis.axisMinimum, mXAxis.axisMaximum, false)
 
             if (!legend.isLegendCustom)
                 legendRenderer?.computeLegend(data)
@@ -140,7 +140,7 @@ open class RadarChart : PieRadarChartBase<RadarData> {
 
         //        if (mYAxis.isEnabled())
 //            mYAxisRenderer.computeAxis(mYAxis.mAxisMinimum, mYAxis.mAxisMaximum, mYAxis.isInverted());
-        if (mXAxis.isEnabled) mXAxisRenderer!!.computeAxis(mXAxis.mAxisMinimum, mXAxis.mAxisMaximum, false)
+        if (mXAxis.isEnabled) mXAxisRenderer!!.computeAxis(mXAxis.axisMinimum, mXAxis.axisMaximum, false)
 
         mXAxisRenderer!!.renderAxisLabels(canvas)
 
@@ -286,7 +286,7 @@ open class RadarChart : PieRadarChartBase<RadarData> {
      * Returns the maximum value this chart can display on it's y-axis.
      */
     override val yChartMax: Float
-        get() = mYAxis!!.mAxisMaximum
+        get() = mYAxis!!.axisMaximum
 
     override val accessibilityDescription: String
         get() = "This is a Radar chart"
@@ -295,7 +295,7 @@ open class RadarChart : PieRadarChartBase<RadarData> {
      * Returns the minimum value this chart can display on it's y-axis.
      */
     override val yChartMin: Float
-        get() = mYAxis!!.mAxisMinimum
+        get() = mYAxis!!.axisMinimum
 
     /**
      * Range of y-values this chart can display.
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/components/AxisBase.kt b/chartLib/src/main/kotlin/info/appdev/charting/components/AxisBase.kt
index a8cdc0a95..72b9f1b06 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/components/AxisBase.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/components/AxisBase.kt
@@ -158,15 +158,9 @@ abstract class AxisBase : ComponentBase() {
     var isAxisMaxCustom: Boolean = false
         protected set
 
-    /**
-     * don't touch this direclty, use setter
-     */
-    var mAxisMaximum: Float = 0f
+    private var mAxisMaximum: Float = 0f
 
-    /**
-     * don't touch this directly, use setter
-     */
-    var mAxisMinimum: Float = 0f
+    private var mAxisMinimum: Float = 0f
 
     /**
      * the total range of values this axis covers
@@ -586,8 +580,8 @@ abstract class AxisBase : ComponentBase() {
     open fun calculate(dataMin: Float, dataMax: Float) {
         // if custom, use value as is, else use data value
 
-        var min = if (this.isAxisMinCustom) mAxisMinimum else (dataMin - this.spaceMin)
-        var max = if (this.isAxisMaxCustom) mAxisMaximum else (dataMax + this.spaceMax)
+        var min = if (this.isAxisMinCustom) axisMinimum else (dataMin - this.spaceMin)
+        var max = if (this.isAxisMaxCustom) axisMaximum else (dataMax + this.spaceMax)
 
         // temporary range (before calculations)
         val range = abs(max - min)
@@ -598,8 +592,8 @@ abstract class AxisBase : ComponentBase() {
             min -= 1f
         }
 
-        this.mAxisMinimum = min
-        this.mAxisMaximum = max
+        this.axisMinimum = min
+        this.axisMaximum = max
 
         // actual range
         this.axisRange = abs(max - min)
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/components/YAxis.kt b/chartLib/src/main/kotlin/info/appdev/charting/components/YAxis.kt
index f2b6b2403..1d2e2c6df 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/components/YAxis.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/components/YAxis.kt
@@ -209,9 +209,9 @@ open class YAxis : AxisBase {
         range = abs(max - min)
 
         // calc extra spacing
-        this.mAxisMinimum = if (isAxisMinCustom) this.mAxisMinimum else min - (range / 100f) * this.spaceBottom
-        this.mAxisMaximum = if (isAxisMaxCustom) this.mAxisMaximum else max + (range / 100f) * this.spaceTop
+        this.axisMinimum = if (isAxisMinCustom) this.axisMinimum else min - (range / 100f) * this.spaceBottom
+        this.axisMaximum = if (isAxisMaxCustom) this.axisMaximum else max + (range / 100f) * this.spaceTop
 
-        this.axisRange = abs(this.mAxisMinimum - this.mAxisMaximum)
+        this.axisRange = abs(this.axisMinimum - this.axisMaximum)
     }
 }
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/renderer/YAxisRendererRadarChart.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/YAxisRendererRadarChart.kt
index fbdbc11d1..f6be508eb 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/renderer/YAxisRendererRadarChart.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/YAxisRendererRadarChart.kt
@@ -135,9 +135,9 @@ class YAxisRendererRadarChart(
             }
         }
 
-        axis.mAxisMinimum = axis.entries[0]
-        axis.mAxisMaximum = axis.entries[n - 1]
-        axis.axisRange = abs((axis.mAxisMaximum - axis.mAxisMinimum).toDouble()).toFloat()
+        axis.axisMinimum = axis.entries[0]
+        axis.axisMaximum = axis.entries[n - 1]
+        axis.axisRange = abs((axis.axisMaximum - axis.axisMinimum).toDouble()).toFloat()
     }
 
     override fun renderAxisLabels(canvas: Canvas) {
@@ -161,7 +161,7 @@ class YAxisRendererRadarChart(
         val xOffset = yAxis.labelXOffset
 
         for (j in from..<to) {
-            val r = (yAxis.entries[j] - yAxis.mAxisMinimum) * factor
+            val r = (yAxis.entries[j] - yAxis.axisMinimum) * factor
 
             pOut = center.getPosition(r, chart.rotationAngle)