Bar Renderer in Kotlin

Author: hannesa2

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

@@ -88,11 +88,11 @@ open class BarChartRenderer(
     private val barShadowRectBuffer = RectF()
 
     init {
-        highlightPaint = Paint(Paint.ANTI_ALIAS_FLAG)
-        highlightPaint.style = Paint.Style.FILL
-        highlightPaint.color = Color.rgb(0, 0, 0)
+        paintHighlight = Paint(Paint.ANTI_ALIAS_FLAG)
+        paintHighlight.style = Paint.Style.FILL
+        paintHighlight.color = Color.rgb(0, 0, 0)
         // set alpha after color
-        highlightPaint.alpha = 120
+        paintHighlight.alpha = 120
 
         shadowPaint = Paint(Paint.ANTI_ALIAS_FLAG)
         shadowPaint.style = Paint.Style.FILL
@@ -170,7 +170,7 @@ open class BarChartRenderer(
         val isInverted = chart.isInverted(dataSet.axisDependency)
 
         if (isSingleColor) {
-            renderPaint.color = dataSet.color
+            paintRender.color = dataSet.color
         }
 
         var j = 0
@@ -189,13 +189,13 @@ open class BarChartRenderer(
             if (!isSingleColor) {
                 // Set the color for the currently drawn value. If the index
                 // is out of bounds, reuse colors.
-                renderPaint.color = dataSet.getColor(pos)
+                paintRender.color = dataSet.getColor(pos)
             }
 
             if (isCustomFill) {
                 dataSet.getFill(pos)
                     .fillRect(
-                        c, renderPaint,
+                        c, paintRender,
                         buffer.buffer[j],
                         buffer.buffer[j + 1],
                         buffer.buffer[j + 2],
@@ -209,12 +209,12 @@ open class BarChartRenderer(
                         RectF(
                             buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
                             buffer.buffer[j + 3]
-                        ), roundedBarRadius, roundedBarRadius, renderPaint
+                        ), roundedBarRadius, roundedBarRadius, paintRender
                     )
                 } else {
                     c.drawRect(
                         buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
-                        buffer.buffer[j + 3], renderPaint
+                        buffer.buffer[j + 3], paintRender
                     )
                 }
             }
@@ -277,7 +277,7 @@ open class BarChartRenderer(
 
                 // calculate the correct offset depending on the draw position of
                 // the value
-                val valueTextHeight = Utils.calcTextHeight(mValuePaint, "8").toFloat()
+                val valueTextHeight = Utils.calcTextHeight(paintValues, "8").toFloat()
                 posOffset = (if (drawValueAboveBar) -valueOffsetPlus else valueTextHeight + valueOffsetPlus)
                 negOffset = (if (drawValueAboveBar) valueTextHeight + valueOffsetPlus else -valueOffsetPlus)
 
@@ -512,8 +512,8 @@ open class BarChartRenderer(
 
             val trans = chart.getTransformer(set.axisDependency)
 
-            highlightPaint.color = set.highLightColor
-            highlightPaint.alpha = set.highLightAlpha
+            paintHighlight.color = set.highLightColor
+            paintHighlight.alpha = set.highLightAlpha
 
             val isStack = if (high.stackIndex >= 0 && e.isStacked) true else false
 
@@ -540,9 +540,9 @@ open class BarChartRenderer(
             setHighlightDrawPos(high, barRect)
 
             if (drawRoundedBars) {
-                c.drawRoundRect(RectF(barRect), roundedBarRadius, roundedBarRadius, highlightPaint)
+                c.drawRoundRect(RectF(barRect), roundedBarRadius, roundedBarRadius, paintHighlight)
             } else {
-                c.drawRect(barRect, highlightPaint)
+                c.drawRect(barRect, paintHighlight)
             }
         }
     }

MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarLineScatterCandleBubbleRenderer.java

@@ -8,9 +8,6 @@
 import com.github.mikephil.charting.interfaces.datasets.IDataSet;
 import com.github.mikephil.charting.utils.ViewPortHandler;
 
-/**
- * Created by Philipp Jahoda on 09/06/16.
- */
 public abstract class BarLineScatterCandleBubbleRenderer extends DataRenderer {
 
     /**

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

@@ -81,8 +81,8 @@ open class BubbleChartRenderer(
 
             val color = dataSet.getColor(j)
 
-            renderPaint.color = color
-            c.drawCircle(pointBuffer[0], pointBuffer[1], shapeHalf, renderPaint)
+            paintRender.color = color
+            c.drawCircle(pointBuffer[0], pointBuffer[1], shapeHalf, paintRender)
         }
     }
 
@@ -93,7 +93,7 @@ open class BubbleChartRenderer(
         if (isDrawingValuesAllowed(chart)) {
             val dataSets = bubbleData.dataSets
 
-            val lineHeight = Utils.calcTextHeight(mValuePaint, "1").toFloat()
+            val lineHeight = Utils.calcTextHeight(paintValues, "1").toFloat()
 
             for (i in dataSets.indices) {
                 val dataSet = dataSets[i]
@@ -178,10 +178,10 @@ open class BubbleChartRenderer(
     private val _hsvBuffer = FloatArray(3)
 
     init {
-        renderPaint.style = Paint.Style.FILL
+        paintRender.style = Paint.Style.FILL
 
-        highlightPaint.style = Paint.Style.STROKE
-        highlightPaint.strokeWidth = Utils.convertDpToPixel(1.5f)
+        paintHighlight.style = Paint.Style.STROKE
+        paintHighlight.strokeWidth = Utils.convertDpToPixel(1.5f)
     }
 
     override fun drawHighlighted(c: Canvas, indices: Array<Highlight>) {
@@ -246,9 +246,9 @@ open class BubbleChartRenderer(
             _hsvBuffer[2] *= 0.5f
             val color = Color.HSVToColor(Color.alpha(originalColor), _hsvBuffer)
 
-            highlightPaint.color = color
-            highlightPaint.strokeWidth = set.highlightCircleWidth
-            c.drawCircle(pointBuffer[0], pointBuffer[1], shapeHalf, highlightPaint)
+            paintHighlight.color = color
+            paintHighlight.strokeWidth = set.highlightCircleWidth
+            c.drawCircle(pointBuffer[0], pointBuffer[1], shapeHalf, paintHighlight)
         }
     }
 }

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

@@ -41,7 +41,7 @@ open class CandleStickChartRenderer(
 
         xBounds[chart] = dataSet
 
-        renderPaint.strokeWidth = dataSet.shadowWidth
+        paintRender.strokeWidth = dataSet.shadowWidth
 
         // draw the body
         for (j in xBounds.min..xBounds.range + xBounds.min) {
@@ -84,18 +84,18 @@ open class CandleStickChartRenderer(
 
                 // draw the shadows
                 if (dataSet.shadowColorSameAsCandle) {
-                    if (open > close) renderPaint.color =
+                    if (open > close) paintRender.color =
                         if (dataSet.decreasingColor == ColorTemplate.COLOR_NONE) dataSet.getColor(j) else dataSet.decreasingColor
-                    else if (open < close) renderPaint.color =
+                    else if (open < close) paintRender.color =
                         if (dataSet.increasingColor == ColorTemplate.COLOR_NONE) dataSet.getColor(j) else dataSet.increasingColor
-                    else renderPaint.color = if (dataSet.neutralColor == ColorTemplate.COLOR_NONE) dataSet.getColor(j) else dataSet.neutralColor
+                    else paintRender.color = if (dataSet.neutralColor == ColorTemplate.COLOR_NONE) dataSet.getColor(j) else dataSet.neutralColor
                 } else {
-                    renderPaint.color = if (dataSet.shadowColor == ColorTemplate.COLOR_NONE) dataSet.getColor(j) else dataSet.shadowColor
+                    paintRender.color = if (dataSet.shadowColor == ColorTemplate.COLOR_NONE) dataSet.getColor(j) else dataSet.shadowColor
                 }
 
-                renderPaint.style = Paint.Style.STROKE
+                paintRender.style = Paint.Style.STROKE
 
-                c.drawLines(shadowBuffers, renderPaint)
+                c.drawLines(shadowBuffers, paintRender)
 
                 // calculate the body
                 bodyBuffers[0] = xPos - 0.5f + barSpace
@@ -109,44 +109,44 @@ open class CandleStickChartRenderer(
                 if (open > close) { // decreasing
 
                     if (dataSet.decreasingColor == ColorTemplate.COLOR_NONE) {
-                        renderPaint.color = dataSet.getColor(j)
+                        paintRender.color = dataSet.getColor(j)
                     } else {
-                        renderPaint.color = dataSet.decreasingColor
+                        paintRender.color = dataSet.decreasingColor
                     }
 
-                    renderPaint.style = dataSet.decreasingPaintStyle
+                    paintRender.style = dataSet.decreasingPaintStyle
 
                     c.drawRect(
                         bodyBuffers[0], bodyBuffers[3],
                         bodyBuffers[2], bodyBuffers[1],
-                        renderPaint
+                        paintRender
                     )
                 } else if (open < close) {
                     if (dataSet.increasingColor == ColorTemplate.COLOR_NONE) {
-                        renderPaint.color = dataSet.getColor(j)
+                        paintRender.color = dataSet.getColor(j)
                     } else {
-                        renderPaint.color = dataSet.increasingColor
+                        paintRender.color = dataSet.increasingColor
                     }
 
-                    renderPaint.style = dataSet.increasingPaintStyle
+                    paintRender.style = dataSet.increasingPaintStyle
 
                     c.drawRect(
                         bodyBuffers[0], bodyBuffers[1],
                         bodyBuffers[2], bodyBuffers[3],
-                        renderPaint
+                        paintRender
                     )
                 } else { // equal values
 
                     if (dataSet.neutralColor == ColorTemplate.COLOR_NONE) {
-                        renderPaint.color = dataSet.getColor(j)
+                        paintRender.color = dataSet.getColor(j)
                     } else {
-                        renderPaint.color = dataSet.neutralColor
+                        paintRender.color = dataSet.neutralColor
                     }
 
                     c.drawLine(
                         bodyBuffers[0], bodyBuffers[1],
                         bodyBuffers[2], bodyBuffers[3],
-                        renderPaint
+                        paintRender
                     )
                 }
             } else {
@@ -183,21 +183,21 @@ open class CandleStickChartRenderer(
                 else
                     dataSet.neutralColor
 
-                renderPaint.color = barColor
+                paintRender.color = barColor
                 c.drawLine(
                     rangeBuffers[0], rangeBuffers[1],
                     rangeBuffers[2], rangeBuffers[3],
-                    renderPaint
+                    paintRender
                 )
                 c.drawLine(
                     openBuffers[0], openBuffers[1],
                     openBuffers[2], openBuffers[3],
-                    renderPaint
+                    paintRender
                 )
                 c.drawLine(
                     closeBuffers[0], closeBuffers[1],
                     closeBuffers[2], closeBuffers[3],
-                    renderPaint
+                    paintRender
                 )
             }
         }

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

@@ -14,50 +14,51 @@ import java.lang.ref.WeakReference
 /**
  * Renderer class that is responsible for rendering multiple different data-types.
  */
-class CombinedChartRenderer(chart: CombinedChart, animator: ChartAnimator?, viewPortHandler: ViewPortHandler?) : DataRenderer(animator, viewPortHandler) {
+@Suppress("MemberVisibilityCanBePrivate")
+open class CombinedChartRenderer(chart: CombinedChart, animator: ChartAnimator, viewPortHandler: ViewPortHandler) : DataRenderer(animator, viewPortHandler) {
     /**
      * all rederers for the different kinds of data this combined-renderer can draw
      */
-    protected var mRenderers: MutableList<DataRenderer> = ArrayList(5)
+    protected var dataRenderers: MutableList<DataRenderer> = ArrayList(5)
 
-    protected var mChart: WeakReference<Chart<*>> = WeakReference(chart)
+    protected var weakChart: WeakReference<Chart<*>> = WeakReference(chart)
 
     /**
      * Creates the renderers needed for this combined-renderer in the required order. Also takes the DrawOrder into
      * consideration.
      */
     fun createRenderers() {
-        mRenderers.clear()
+        dataRenderers.clear()
 
-        val chart = mChart.get() as CombinedChart? ?: return
+        val chart = weakChart.get() as CombinedChart? ?: return
 
         val orders = chart.drawOrder
 
         for (order in orders) {
             when (order) {
-                DrawOrder.BAR -> if (chart.barData != null) mRenderers.add(BarChartRenderer(chart, animator, viewPortHandler))
-                DrawOrder.BUBBLE -> if (chart.bubbleData != null) mRenderers.add(BubbleChartRenderer(chart, animator, viewPortHandler))
-                DrawOrder.LINE -> mRenderers.add(LineChartRenderer(chart, animator, viewPortHandler))
-                DrawOrder.CANDLE -> if (chart.candleData != null) mRenderers.add(CandleStickChartRenderer(chart, animator, viewPortHandler))
-                DrawOrder.SCATTER -> if (chart.scatterData != null) mRenderers.add(ScatterChartRenderer(chart, animator, viewPortHandler))
+                DrawOrder.BAR -> if (chart.barData != null) dataRenderers.add(BarChartRenderer(chart, animator, viewPortHandler))
+                DrawOrder.BUBBLE -> if (chart.bubbleData != null) dataRenderers.add(BubbleChartRenderer(chart, animator, viewPortHandler))
+                DrawOrder.LINE -> dataRenderers.add(LineChartRenderer(chart, animator, viewPortHandler))
+                DrawOrder.CANDLE -> if (chart.candleData != null) dataRenderers.add(CandleStickChartRenderer(chart, animator, viewPortHandler))
+                DrawOrder.SCATTER -> if (chart.scatterData != null) dataRenderers.add(ScatterChartRenderer(chart, animator, viewPortHandler))
             }
         }
     }
 
     override fun initBuffers() {
-        for (renderer in mRenderers) renderer.initBuffers()
+        for (renderer in dataRenderers) renderer.initBuffers()
     }
 
     override fun drawData(c: Canvas) {
-        for (renderer in mRenderers) renderer.drawData(c)
+        for (renderer in dataRenderers) renderer.drawData(c)
     }
 
     override fun drawValues(c: Canvas) {
-        for (renderer in mRenderers) renderer.drawValues(c)
+        for (renderer in dataRenderers) renderer.drawValues(c)
     }
 
     override fun drawExtras(c: Canvas) {
-        for (renderer in mRenderers) renderer.drawExtras(c)
+        for (renderer in dataRenderers) renderer.drawExtras(c)
     }
 
     protected var mHighlightBuffer: MutableList<Highlight> = ArrayList()
@@ -67,9 +68,9 @@ class CombinedChartRenderer(chart: CombinedChart, animator: ChartAnimator?, view
     }
 
     override fun drawHighlighted(c: Canvas, indices: Array<Highlight>) {
-        val chart = mChart.get() ?: return
+        val chart = weakChart.get() ?: return
 
-        for (renderer in mRenderers) {
+        for (renderer in dataRenderers) {
             var data: ChartData<*>? = null
 
             if (renderer is BarChartRenderer) data = renderer.chart.barData
@@ -100,8 +101,8 @@ class CombinedChartRenderer(chart: CombinedChart, animator: ChartAnimator?, view
      * @return
      */
     fun getSubRenderer(index: Int): DataRenderer? {
-        return if (index >= mRenderers.size || index < 0) null
-        else mRenderers[index]
+        return if (index >= dataRenderers.size || index < 0) null
+        else dataRenderers[index]
     }
 
     val subRenderers: List<DataRenderer>
@@ -110,9 +111,9 @@ class CombinedChartRenderer(chart: CombinedChart, animator: ChartAnimator?, view
          *
          * @return
          */
-        get() = mRenderers
+        get() = dataRenderers
 
     fun setSubRenderers(renderers: MutableList<DataRenderer>) {
-        this.mRenderers = renderers
+        this.dataRenderers = renderers
     }
 }