AbstractBuffer buffer as MutableList

Author: hannesa2

MPChartLib/src/main/java/com/github/mikephil/charting/buffer/AbstractBuffer.kt

@@ -5,14 +5,14 @@ package com.github.mikephil.charting.buffer
  *
  * @param <T> The data the buffer accepts to be fed with.
 </T> */
-abstract class AbstractBuffer<T>(size: Int) {
+abstract class AbstractBuffer<T> {
     /** index in the buffer  */
     @JvmField
     protected var index: Int = 0
 
     /** float-buffer that holds the data points to draw, order: x,y,x,y,...  */
     @JvmField
-    val buffer: FloatArray
+    val buffer: MutableList<Float> = mutableListOf()
 
     /** animation phase x-axis  */
     @JvmField
@@ -30,7 +30,6 @@ abstract class AbstractBuffer<T>(size: Int) {
 
     init {
         index = 0
-        buffer = FloatArray(size)
     }
 
     /** limits the drawing on the x-axis  */

MPChartLib/src/main/java/com/github/mikephil/charting/buffer/BarBuffer.kt

@@ -3,7 +3,7 @@ package com.github.mikephil.charting.buffer
 import com.github.mikephil.charting.interfaces.datasets.IBarDataSet
 import kotlin.math.abs
 
-open class BarBuffer(size: Int, dataSetCount: Int, containsStacks: Boolean) : AbstractBuffer<IBarDataSet?>(size) {
+open class BarBuffer(dataSetCount: Int, containsStacks: Boolean) : AbstractBuffer<IBarDataSet?>() {
     protected var dataSetIndex: Int = 0
     protected var dataSetCount: Int = 1
 
@@ -48,7 +48,7 @@ open class BarBuffer(size: Int, dataSetCount: Int, containsStacks: Boolean) : Ab
                 ", containsStacks=" + containsStacks +
                 ", inverted=" + inverted +
                 ", barWidth=" + barWidth +
-                ", buffer=" + buffer.contentToString() +
+                ", buffer=" + buffer +
                 ", index=" + index +
                 '}'
     }

MPChartLib/src/main/java/com/github/mikephil/charting/buffer/HorizontalBarBuffer.kt

@@ -3,7 +3,7 @@ package com.github.mikephil.charting.buffer
 import com.github.mikephil.charting.interfaces.datasets.IBarDataSet
 import kotlin.math.abs
 
-class HorizontalBarBuffer(size: Int, dataSetCount: Int, containsStacks: Boolean) : BarBuffer(size, dataSetCount, containsStacks) {
+class HorizontalBarBuffer(size: Int, dataSetCount: Int, containsStacks: Boolean) : BarBuffer(dataSetCount, containsStacks) {
     override fun feed(data: IBarDataSet?) {
         val size = (data?.entryCount ?: 0) * phaseX
         val barWidthHalf = barWidth / 2f

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

@@ -64,7 +64,6 @@ open class BarChartRenderer(
             Timber.d("$i ${barBuffers!!.size}")
             barBuffers.add(
                 BarBuffer(
-                    it.entryCount * 4 * (if (it.isStacked) it.stackSize else 1),
                     barData.dataSetCount, it.isStacked
                 )
             )
@@ -167,7 +166,7 @@ open class BarChartRenderer(
             setBarWidth(chart.barData.barWidth)
             feed(dataSet)
         }
-        trans!!.pointValuesToPixel(buffer.buffer)
+        trans!!.pointValuesToPixel(buffer.buffer.toFloatArray())
 
         val isCustomFill = dataSet.fills != null && dataSet.fills.isNotEmpty()
         val isSingleColor = dataSet.colors.size == 1

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

@@ -104,9 +104,9 @@ open class HorizontalBarChartRenderer(
 
         buffer.feed(dataSet)
 
-        trans!!.pointValuesToPixel(buffer.buffer)
+        trans!!.pointValuesToPixel(buffer.buffer.toFloatArray())
 
-        val isCustomFill = dataSet.fills != null && dataSet.fills.isNotEmpty()
+        val isCustomFill = dataSet.fills != null && !dataSet.fills.isEmpty()
         val isSingleColor = dataSet.colors.size == 1
         val isInverted = chart.isInverted(dataSet.axisDependency)
 

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

@@ -79,13 +79,13 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator?,
             }
         }
 
-        val buffer = barBuffers!![index]!!
+        val buffer = barBuffers[index]!!
         buffer.setPhases(phaseX, phaseY)
         buffer.setDataSet(index)
         buffer.setInverted(chart.isInverted(dataSet.axisDependency))
         buffer.setBarWidth(chart.barData.barWidth)
         buffer.feed(dataSet)
-        trans!!.pointValuesToPixel(buffer.buffer)
+        trans!!.pointValuesToPixel(buffer.buffer.toFloatArray())
 
         // if multiple colors has been assigned to Bar Chart
         if (dataSet.colors.size > 1) {

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

@@ -86,7 +86,7 @@ class RoundedHorizontalBarChartRenderer(chart: BarDataProvider, animator: ChartA
         buffer.setInverted(chart.isInverted(dataSet.axisDependency))
         buffer.setBarWidth(chart.barData.barWidth)
         buffer.feed(dataSet)
-        trans!!.pointValuesToPixel(buffer.buffer)
+        trans!!.pointValuesToPixel(buffer.buffer.toFloatArray())
 
         // if multiple colors has been assigned to Bar Chart
         if (dataSet.colors.size > 1) {