Merge pull request #579 from AppDevNext/KotlinBarLineChartBase

hannesa2 · web-flow · commit e796e99db809 · 2025-12-26T17:15:53.000+01:00
Kotlin BarLineChartBase
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarLineChartBase.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarLineChartBase.java
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarLineChartBase.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarLineChartBase.kt
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.kt
@@ -157,7 +157,6 @@ abstract class Chart<T : ChartData<out IDataSet<out Entry>>?> : ViewGroup, IBase
      */
     protected var mSelectionListener: OnChartValueSelectedListener? = null
 
-    @JvmField
     protected var chartTouchListener: ChartTouchListener<*>? = null
 
     /**
@@ -242,10 +241,8 @@ abstract class Chart<T : ChartData<out IDataSet<out Entry>>?> : ViewGroup, IBase
         init()
     }
 
-    /**
-     * initialize all paints and stuff
-     */
-    protected open fun init() {
+    init {
+        mXAxis = XAxis()
         setWillNotDraw(false)
 
         // setLayerType(View.LAYER_TYPE_HARDWARE, null);
@@ -257,15 +254,10 @@ abstract class Chart<T : ChartData<out IDataSet<out Entry>>?> : ViewGroup, IBase
         // initialize the utils
         Utils.init(context)
         context.initUtils()
-        mMaxHighlightDistance = 500f.convertDpToPixel()
 
         this.description = Description()
         this.legend = Legend()
 
-        this.legendRenderer = LegendRenderer(this.viewPortHandler, this.legend!!)
-
-        mXAxis = XAxis()
-
         mDescPaint = Paint(Paint.ANTI_ALIAS_FLAG)
 
         mInfoPaint = Paint(Paint.ANTI_ALIAS_FLAG)
@@ -281,6 +273,14 @@ abstract class Chart<T : ChartData<out IDataSet<out Entry>>?> : ViewGroup, IBase
         }
     }
 
+    /**
+     * initialize all paints and stuff
+     */
+    protected open fun init() {
+        mMaxHighlightDistance = 500f.convertDpToPixel()
+        this.legendRenderer = LegendRenderer(this.viewPortHandler, this.legend!!)
+    }
+
     // public void initWithDummyData() {
     // ColorTemplate template = new ColorTemplate();
     // template.addColorsForDataSets(ColorTemplate.COLORFUL_COLORS,
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/HorizontalBarChart.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/HorizontalBarChart.kt
@@ -35,7 +35,7 @@ open class HorizontalBarChart : BarChart {
 
     constructor(context: Context?, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle)
 
-    override fun init() {
+    init {
         viewPortHandler = HorizontalViewPortHandler()
 
         super.init()
@@ -46,9 +46,9 @@ open class HorizontalBarChart : BarChart {
         mRenderer = HorizontalBarChartRenderer(this, mAnimator, viewPortHandler)
         setHighlighter(HorizontalBarHighlighter(this))
 
-        mAxisRendererLeft = YAxisRendererHorizontalBarChart(viewPortHandler, mAxisLeft, mLeftAxisTransformer)
-        mAxisRendererRight = YAxisRendererHorizontalBarChart(viewPortHandler, mAxisRight, mRightAxisTransformer)
-        mXAxisRenderer = XAxisRendererHorizontalBarChart(viewPortHandler, mXAxis, mLeftAxisTransformer)
+        axisRendererLeft = YAxisRendererHorizontalBarChart(viewPortHandler, mAxisLeft, mLeftAxisTransformer)
+        axisRendererRight = YAxisRendererHorizontalBarChart(viewPortHandler, mAxisRight, mRightAxisTransformer)
+        xAxisRenderer = XAxisRendererHorizontalBarChart(viewPortHandler, mXAxis, mLeftAxisTransformer)
     }
 
     private val mOffsetsBuffer = RectF()
@@ -99,7 +99,7 @@ open class HorizontalBarChart : BarChart {
 
                         if (mAxisLeft.isEnabled && mAxisLeft.isDrawLabelsEnabled) {
                             offsets.top += mAxisLeft.getRequiredHeightSpace(
-                                mAxisRendererLeft.paintAxisLabels
+                                axisRendererLeft.paintAxisLabels
                             )
                         }
                     }
@@ -112,7 +112,7 @@ open class HorizontalBarChart : BarChart {
 
                         if (mAxisRight.isEnabled && mAxisRight.isDrawLabelsEnabled) {
                             offsets.bottom += mAxisRight.getRequiredHeightSpace(
-                                mAxisRendererRight.paintAxisLabels
+                                axisRendererRight.paintAxisLabels
                             )
                         }
                     }
@@ -138,11 +138,11 @@ open class HorizontalBarChart : BarChart {
 
         // offsets for y-labels
         if (mAxisLeft.needsOffset()) {
-            offsetTop += mAxisLeft.getRequiredHeightSpace(mAxisRendererLeft.paintAxisLabels)
+            offsetTop += mAxisLeft.getRequiredHeightSpace(axisRendererLeft.paintAxisLabels)
         }
 
         if (mAxisRight.needsOffset()) {
-            offsetBottom += mAxisRight.getRequiredHeightSpace(mAxisRendererRight.paintAxisLabels)
+            offsetBottom += mAxisRight.getRequiredHeightSpace(axisRendererRight.paintAxisLabels)
         }
 
         val xLabelWidth = mXAxis.mLabelWidth.toFloat()
@@ -175,7 +175,7 @@ open class HorizontalBarChart : BarChart {
         offsetBottom += extraBottomOffset
         offsetLeft += extraLeftOffset
 
-        val minOffset = mMinOffset.convertDpToPixel()
+        val minOffset = minOffset.convertDpToPixel()
 
         viewPortHandler.restrainViewPort(
             max(minOffset, offsetLeft),
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
@@ -23,7 +23,7 @@ import kotlin.math.roundToInt
 
 open class XAxisRenderer(
     viewPortHandler: ViewPortHandler,
-    @JvmField protected var xAxis: XAxis,
+    protected var xAxis: XAxis,
     transformer: Transformer?
 ) : AxisRenderer(viewPortHandler, transformer, xAxis) {
     protected fun setupGridPaint() {
diff --git a/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt
@@ -45,7 +45,7 @@ class BubbleChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSel
         binding.chart1.setTouchEnabled(true)
 
         // enable scaling and dragging
-        binding.chart1.setDragEnabled(true)
+        binding.chart1.isDragEnabled = true
         binding.chart1.setScaleEnabled(true)
 
         binding.chart1.setMaxVisibleValueCount(200)
diff --git a/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt
@@ -42,7 +42,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
         binding.chart1.setTouchEnabled(true)
 
         // enable scaling and dragging
-        binding.chart1.setDragEnabled(true)
+        binding.chart1.isDragEnabled = true
         binding.chart1.setScaleEnabled(true)
 
         // if disabled, scaling can be done on x- and y-axis separately
diff --git a/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt
@@ -46,7 +46,7 @@ class InvertedLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa
         binding.chart1.setTouchEnabled(true)
 
         // enable scaling and dragging
-        binding.chart1.setDragEnabled(true)
+        binding.chart1.isDragEnabled = true
         binding.chart1.setScaleEnabled(true)
 
         // if disabled, scaling can be done on x- and y-axis separately
diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartActivityColored.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartActivityColored.kt
@@ -61,7 +61,7 @@ class LineChartActivityColored : DemoBase() {
         chart.setTouchEnabled(true)
 
         // enable scaling and dragging
-        chart.setDragEnabled(true)
+        chart.isDragEnabled = true
         chart.setScaleEnabled(true)
 
         // if disabled, scaling can be done on x- and y-axis separately
diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt
@@ -55,7 +55,7 @@ class LineChartDualAxisActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa
         binding.chart1.dragDecelerationFrictionCoef = 0.9f
 
         // enable scaling and dragging
-        binding.chart1.setDragEnabled(true)
+        binding.chart1.isDragEnabled = true
         binding.chart1.setScaleEnabled(true)
         binding.chart1.setDrawGridBackground(false)
         binding.chart1.isHighlightPerDragEnabled = true
diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt
@@ -49,7 +49,7 @@ class LineChartTimeActivity : DemoBase(), OnSeekBarChangeListener {
         binding.chart1.dragDecelerationFrictionCoef = 0.9f
 
         // enable scaling and dragging
-        binding.chart1.setDragEnabled(true)
+        binding.chart1.isDragEnabled = true
         binding.chart1.setScaleEnabled(true)
         binding.chart1.setDrawGridBackground(false)
         binding.chart1.isHighlightPerDragEnabled = true
diff --git a/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt
@@ -52,7 +52,7 @@ class MultiLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartGestu
         binding.chart1.setTouchEnabled(true)
 
         // enable scaling and dragging
-        binding.chart1.setDragEnabled(true)
+        binding.chart1.isDragEnabled = true
         binding.chart1.setScaleEnabled(true)
 
         // if disabled, scaling can be done on x- and y-axis separately
diff --git a/app/src/main/kotlin/info/appdev/chartexample/PerformanceLineChart.kt b/app/src/main/kotlin/info/appdev/chartexample/PerformanceLineChart.kt
@@ -35,7 +35,7 @@ class PerformanceLineChart : DemoBase(), OnSeekBarChangeListener {
         binding.chart1.setTouchEnabled(true)
 
         // enable scaling and dragging
-        binding.chart1.setDragEnabled(true)
+        binding.chart1.isDragEnabled = true
         binding.chart1.setScaleEnabled(true)
 
         // if disabled, scaling can be done on x- and y-axis separately
diff --git a/app/src/main/kotlin/info/appdev/chartexample/RealtimeLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/RealtimeLineChartActivity.kt
@@ -40,7 +40,7 @@ class RealtimeLineChartActivity : DemoBase(), OnChartValueSelectedListener {
         binding.chart1.setTouchEnabled(true)
 
         // enable scaling and dragging
-        binding.chart1.setDragEnabled(true)
+        binding.chart1.isDragEnabled = true
         binding.chart1.setScaleEnabled(true)
         binding.chart1.setDrawGridBackground(false)
 
diff --git a/app/src/main/kotlin/info/appdev/chartexample/ScatterChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/ScatterChartActivity.kt
@@ -44,7 +44,7 @@ class ScatterChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSe
         binding.chart1.maxHighlightDistance = 50f
 
         // enable scaling and dragging
-        binding.chart1.setDragEnabled(true)
+        binding.chart1.isDragEnabled = true
         binding.chart1.setScaleEnabled(true)
 
         binding.chart1.setMaxVisibleValueCount(200)

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ open class HorizontalBarChart : BarChart {`
`35`	`35`
`36`	`36`	`constructor(context: Context?, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle)`
`37`	`37`
`38`		`- override fun init() {`
	`38`	`+ init {`
`39`	`39`	`viewPortHandler = HorizontalViewPortHandler()`
`40`	`40`
`41`	`41`	`super.init()`
`@@ -46,9 +46,9 @@ open class HorizontalBarChart : BarChart {`
`46`	`46`	`mRenderer = HorizontalBarChartRenderer(this, mAnimator, viewPortHandler)`
`47`	`47`	`setHighlighter(HorizontalBarHighlighter(this))`
`48`	`48`
`49`		`- mAxisRendererLeft = YAxisRendererHorizontalBarChart(viewPortHandler, mAxisLeft, mLeftAxisTransformer)`
`50`		`- mAxisRendererRight = YAxisRendererHorizontalBarChart(viewPortHandler, mAxisRight, mRightAxisTransformer)`
`51`		`- mXAxisRenderer = XAxisRendererHorizontalBarChart(viewPortHandler, mXAxis, mLeftAxisTransformer)`
	`49`	`+ axisRendererLeft = YAxisRendererHorizontalBarChart(viewPortHandler, mAxisLeft, mLeftAxisTransformer)`
	`50`	`+ axisRendererRight = YAxisRendererHorizontalBarChart(viewPortHandler, mAxisRight, mRightAxisTransformer)`
	`51`	`+ xAxisRenderer = XAxisRendererHorizontalBarChart(viewPortHandler, mXAxis, mLeftAxisTransformer)`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`private val mOffsetsBuffer = RectF()`
`@@ -99,7 +99,7 @@ open class HorizontalBarChart : BarChart {`
`99`	`99`
`100`	`100`	`if (mAxisLeft.isEnabled && mAxisLeft.isDrawLabelsEnabled) {`
`101`	`101`	`offsets.top += mAxisLeft.getRequiredHeightSpace(`
`102`		`- mAxisRendererLeft.paintAxisLabels`
	`102`	`+ axisRendererLeft.paintAxisLabels`
`103`	`103`	`)`
`104`	`104`	`}`
`105`	`105`	`}`
`@@ -112,7 +112,7 @@ open class HorizontalBarChart : BarChart {`
`112`	`112`
`113`	`113`	`if (mAxisRight.isEnabled && mAxisRight.isDrawLabelsEnabled) {`
`114`	`114`	`offsets.bottom += mAxisRight.getRequiredHeightSpace(`
`115`		`- mAxisRendererRight.paintAxisLabels`
	`115`	`+ axisRendererRight.paintAxisLabels`
`116`	`116`	`)`
`117`	`117`	`}`
`118`	`118`	`}`
`@@ -138,11 +138,11 @@ open class HorizontalBarChart : BarChart {`
`138`	`138`
`139`	`139`	`// offsets for y-labels`
`140`	`140`	`if (mAxisLeft.needsOffset()) {`
`141`		`- offsetTop += mAxisLeft.getRequiredHeightSpace(mAxisRendererLeft.paintAxisLabels)`
	`141`	`+ offsetTop += mAxisLeft.getRequiredHeightSpace(axisRendererLeft.paintAxisLabels)`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`if (mAxisRight.needsOffset()) {`
`145`		`- offsetBottom += mAxisRight.getRequiredHeightSpace(mAxisRendererRight.paintAxisLabels)`
	`145`	`+ offsetBottom += mAxisRight.getRequiredHeightSpace(axisRendererRight.paintAxisLabels)`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`val xLabelWidth = mXAxis.mLabelWidth.toFloat()`
`@@ -175,7 +175,7 @@ open class HorizontalBarChart : BarChart {`
`175`	`175`	`offsetBottom += extraBottomOffset`
`176`	`176`	`offsetLeft += extraLeftOffset`
`177`	`177`
`178`		`- val minOffset = mMinOffset.convertDpToPixel()`
	`178`	`+ val minOffset = minOffset.convertDpToPixel()`
`179`	`179`
`180`	`180`	`viewPortHandler.restrainViewPort(`
`181`	`181`	`max(minOffset, offsetLeft),`