Merge pull request #350 from AppDevNext/RenderersKotlin

Renderers in Kotlin

Author: hannesa2

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

@@ -16,7 +16,7 @@ public abstract class BarLineScatterCandleBubbleRenderer extends DataRenderer {
     /**
      * buffer for storing the current minimum and maximum visible x
      */
-    protected XBounds mXBounds = new XBounds();
+    protected XBounds xBounds = new XBounds();
 
     public BarLineScatterCandleBubbleRenderer(ChartAnimator animator, ViewPortHandler viewPortHandler) {
         super(animator, viewPortHandler);

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

@@ -74,7 +74,7 @@ protected void drawDataSet(Canvas c, IBubbleDataSet dataSet) {
 
         float phaseY = animator.getPhaseY();
 
-        mXBounds.set(mChart, dataSet);
+        xBounds.set(mChart, dataSet);
 
         sizeBuffer[0] = 0f;
         sizeBuffer[2] = 1f;
@@ -88,7 +88,7 @@ protected void drawDataSet(Canvas c, IBubbleDataSet dataSet) {
         final float maxBubbleHeight = Math.abs(viewPortHandler.contentBottom() - viewPortHandler.contentTop());
         final float referenceSize = Math.min(maxBubbleHeight, maxBubbleWidth);
 
-        for (int j = mXBounds.min; j <= mXBounds.range + mXBounds.min; j++) {
+        for (int j = xBounds.min; j <= xBounds.range + xBounds.min; j++) {
 
             final BubbleEntry entry = dataSet.getEntryForIndex(j);
 
@@ -146,10 +146,10 @@ public void drawValues(Canvas c) {
                 final float phaseX = Math.max(0.f, Math.min(1.f, animator.getPhaseX()));
                 final float phaseY = animator.getPhaseY();
 
-                mXBounds.set(mChart, dataSet);
+                xBounds.set(mChart, dataSet);
 
                 final float[] positions = mChart.getTransformer(dataSet.getAxisDependency())
-                        .generateTransformedValuesBubble(dataSet, phaseY, mXBounds.min, mXBounds.max);
+                        .generateTransformedValuesBubble(dataSet, phaseY, xBounds.min, xBounds.max);
 
                 final float alpha = phaseX == 1 ? phaseY : phaseX;
 
@@ -159,7 +159,7 @@ public void drawValues(Canvas c) {
 
                 for (int j = 0; j < positions.length; j += 2) {
 
-                    int valueTextColor = dataSet.getValueTextColor(j / 2 + mXBounds.min);
+                    int valueTextColor = dataSet.getValueTextColor(j / 2 + xBounds.min);
                     valueTextColor = Color.argb(Math.round(255.f * alpha), Color.red(valueTextColor),
                             Color.green(valueTextColor), Color.blue(valueTextColor));
 
@@ -172,7 +172,7 @@ public void drawValues(Canvas c) {
                     if ((!viewPortHandler.isInBoundsLeft(x) || !viewPortHandler.isInBoundsY(y)))
                         continue;
 
-                    BubbleEntry entry = dataSet.getEntryForIndex(j / 2 + mXBounds.min);
+                    BubbleEntry entry = dataSet.getEntryForIndex(j / 2 + xBounds.min);
 
                     if (dataSet.isDrawValuesEnabled()) {
                         drawValue(c, dataSet.getValueFormatter(), entry.getSize(), entry, i, x,

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

@@ -62,12 +62,12 @@ protected void drawDataSet(Canvas c, ICandleDataSet dataSet) {
         float barSpace = dataSet.getBarSpace();
         boolean showCandleBar = dataSet.getShowCandleBar();
 
-        mXBounds.set(mChart, dataSet);
+        xBounds.set(mChart, dataSet);
 
         renderPaint.setStrokeWidth(dataSet.getShadowWidth());
 
         // draw the body
-        for (int j = mXBounds.min; j <= mXBounds.range + mXBounds.min; j++) {
+        for (int j = xBounds.min; j <= xBounds.range + xBounds.min; j++) {
 
             // get the entry
             CandleEntry e = dataSet.getEntryForIndex(j);
@@ -275,10 +275,10 @@ public void drawValues(Canvas c) {
 
                 Transformer trans = mChart.getTransformer(dataSet.getAxisDependency());
 
-                mXBounds.set(mChart, dataSet);
+                xBounds.set(mChart, dataSet);
 
                 float[] positions = trans.generateTransformedValuesCandle(
-                        dataSet, animator.getPhaseX(), animator.getPhaseY(), mXBounds.min, mXBounds.max);
+                        dataSet, animator.getPhaseX(), animator.getPhaseY(), xBounds.min, xBounds.max);
 
                 float yOffset = Utils.convertDpToPixel(5f);
 
@@ -297,7 +297,7 @@ public void drawValues(Canvas c) {
                     if (!viewPortHandler.isInBoundsLeft(x) || !viewPortHandler.isInBoundsY(y))
                         continue;
 
-                    CandleEntry entry = dataSet.getEntryForIndex(j / 2 + mXBounds.min);
+                    CandleEntry entry = dataSet.getEntryForIndex(j / 2 + xBounds.min);
 
                     if (dataSet.isDrawValuesEnabled()) {
                         drawValue(c,

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

@@ -120,7 +120,7 @@ else if (renderer instanceof LineChartRenderer)
             else if (renderer instanceof CandleStickChartRenderer)
                 data = ((CandleStickChartRenderer)renderer).mChart.getCandleData();
             else if (renderer instanceof ScatterChartRenderer)
-                data = ((ScatterChartRenderer)renderer).mChart.getScatterData();
+                data = ((ScatterChartRenderer)renderer).chart.getScatterData();
             else if (renderer instanceof BubbleChartRenderer)
                 data = ((BubbleChartRenderer)renderer).mChart.getBubbleData();