Merge pull request #336 from AppDevNext/SomeRendererKotlin

Some renderer in Kotlin

Author: hannesa2

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

@@ -9,7 +9,6 @@
 import com.github.mikephil.charting.data.ChartData;
 import com.github.mikephil.charting.data.CombinedData;
 import com.github.mikephil.charting.highlight.Highlight;
-import com.github.mikephil.charting.interfaces.dataprovider.BarLineScatterCandleBubbleDataProvider;
 import com.github.mikephil.charting.utils.ViewPortHandler;
 
 import java.lang.ref.WeakReference;
@@ -115,9 +114,9 @@ public void drawHighlighted(Canvas c, Highlight[] indices) {
             ChartData data = null;
 
             if (renderer instanceof BarChartRenderer)
-                data = ((BarChartRenderer)renderer).mChart.getBarData();
+                data = ((BarChartRenderer)renderer).chart.getBarData();
             else if (renderer instanceof LineChartRenderer)
-                data = ((LineChartRenderer)renderer).mChart.getLineData();
+                data = ((LineChartRenderer)renderer).chart.getLineData();
             else if (renderer instanceof CandleStickChartRenderer)
                 data = ((CandleStickChartRenderer)renderer).mChart.getCandleData();
             else if (renderer instanceof ScatterChartRenderer)

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

@@ -41,12 +41,12 @@ public HorizontalBarChartRenderer(BarDataProvider chart, ChartAnimator animator,
 	@Override
 	public void initBuffers() {
 
-		BarData barData = mChart.getBarData();
-		mBarBuffers = new HorizontalBarBuffer[barData.getDataSetCount()];
+		BarData barData = chart.getBarData();
+		barBuffers = new HorizontalBarBuffer[barData.getDataSetCount()];
 
-		for (int i = 0; i < mBarBuffers.length; i++) {
+		for (int i = 0; i < barBuffers.length; i++) {
 			IBarDataSet set = barData.getDataSetByIndex(i);
-			mBarBuffers[i] = new HorizontalBarBuffer(set.getEntryCount() * 4 * (set.isStacked() ? set.getStackSize() : 1),
+			barBuffers[i] = new HorizontalBarBuffer(set.getEntryCount() * 4 * (set.isStacked() ? set.getStackSize() : 1),
 					barData.getDataSetCount(), set.isStacked());
 		}
 	}
@@ -56,21 +56,21 @@ public void initBuffers() {
 	@Override
 	protected void drawDataSet(Canvas c, IBarDataSet dataSet, int index) {
 
-		Transformer trans = mChart.getTransformer(dataSet.getAxisDependency());
+		Transformer trans = chart.getTransformer(dataSet.getAxisDependency());
 
-		mBarBorderPaint.setColor(dataSet.getBarBorderColor());
-		mBarBorderPaint.setStrokeWidth(Utils.convertDpToPixel(dataSet.getBarBorderWidth()));
+		barBorderPaint.setColor(dataSet.getBarBorderColor());
+		barBorderPaint.setStrokeWidth(Utils.convertDpToPixel(dataSet.getBarBorderWidth()));
 
 		final boolean drawBorder = dataSet.getBarBorderWidth() > 0.f;
 
 		float phaseX = mAnimator.getPhaseX();
 		float phaseY = mAnimator.getPhaseY();
 
 		// draw the bar shadow before the values
-		if (mChart.isDrawBarShadowEnabled()) {
-			mShadowPaint.setColor(dataSet.getBarShadowColor());
+		if (chart.isDrawBarShadowEnabled()) {
+			shadowPaint.setColor(dataSet.getBarShadowColor());
 
-			BarData barData = mChart.getBarData();
+			BarData barData = chart.getBarData();
 
 			final float barWidth = barData.getBarWidth();
 			final float barWidthHalf = barWidth / 2.0f;
@@ -100,24 +100,24 @@ protected void drawDataSet(Canvas c, IBarDataSet dataSet, int index) {
 				mBarShadowRectBuffer.left = mViewPortHandler.contentLeft();
 				mBarShadowRectBuffer.right = mViewPortHandler.contentRight();
 
-				c.drawRect(mBarShadowRectBuffer, mShadowPaint);
+				c.drawRect(mBarShadowRectBuffer, shadowPaint);
 			}
 		}
 
 		// initialize the buffer
-		BarBuffer buffer = mBarBuffers[index];
+		BarBuffer buffer = barBuffers[index];
 		buffer.setPhases(phaseX, phaseY);
 		buffer.setDataSet(index);
-		buffer.setInverted(mChart.isInverted(dataSet.getAxisDependency()));
-		buffer.setBarWidth(mChart.getBarData().getBarWidth());
+		buffer.setInverted(chart.isInverted(dataSet.getAxisDependency()));
+		buffer.setBarWidth(chart.getBarData().getBarWidth());
 
 		buffer.feed(dataSet);
 
 		trans.pointValuesToPixel(buffer.buffer);
 
 		final boolean isCustomFill = dataSet.getFills() != null && !dataSet.getFills().isEmpty();
 		final boolean isSingleColor = dataSet.getColors().size() == 1;
-		final boolean isInverted = mChart.isInverted(dataSet.getAxisDependency());
+		final boolean isInverted = chart.isInverted(dataSet.getAxisDependency());
 
 		if (isSingleColor) {
 			mRenderPaint.setColor(dataSet.getColor());
@@ -156,24 +156,24 @@ protected void drawDataSet(Canvas c, IBarDataSet dataSet, int index) {
 
 			if (drawBorder) {
 				c.drawRect(buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
-						buffer.buffer[j + 3], mBarBorderPaint);
+						buffer.buffer[j + 3], barBorderPaint);
 			}
 		}
 	}
 
 	@Override
 	public void drawValues(Canvas c) {
 		// if values are drawn
-		if (isDrawingValuesAllowed(mChart)) {
+		if (isDrawingValuesAllowed(chart)) {
 
-			List<IBarDataSet> dataSets = mChart.getBarData().getDataSets();
+			List<IBarDataSet> dataSets = chart.getBarData().getDataSets();
 
 			final float valueOffsetPlus = Utils.convertDpToPixel(5f);
 			float posOffset = 0f;
 			float negOffset = 0f;
-			final boolean drawValueAboveBar = mChart.isDrawValueAboveBarEnabled();
+			final boolean drawValueAboveBar = chart.isDrawValueAboveBarEnabled();
 
-			for (int i = 0; i < mChart.getBarData().getDataSetCount(); i++) {
+			for (int i = 0; i < chart.getBarData().getDataSetCount(); i++) {
 
 				IBarDataSet dataSet = dataSets.get(i);
 				if (dataSet.getEntryCount() == 0) {
@@ -183,7 +183,7 @@ public void drawValues(Canvas c) {
 					continue;
 				}
 
-				boolean isInverted = mChart.isInverted(dataSet.getAxisDependency());
+				boolean isInverted = chart.isInverted(dataSet.getAxisDependency());
 
 				// apply the text-styling defined by the DataSet
 				applyValueTextStyle(dataSet);
@@ -192,7 +192,7 @@ public void drawValues(Canvas c) {
 				IValueFormatter formatter = dataSet.getValueFormatter();
 
 				// get the buffer
-				BarBuffer buffer = mBarBuffers[i];
+				BarBuffer buffer = barBuffers[i];
 
 				final float phaseY = mAnimator.getPhaseY();
 
@@ -265,7 +265,7 @@ public void drawValues(Canvas c) {
 					// if each value of a potential stack should be drawn
 				} else {
 
-					Transformer trans = mChart.getTransformer(dataSet.getAxisDependency());
+					Transformer trans = chart.getTransformer(dataSet.getAxisDependency());
 
 					int bufferIndex = 0;
 					int index = 0;
@@ -441,9 +441,9 @@ protected void prepareBarHighlight(float x, float y1, float y2, float barWidthHa
 		float left = y1;
 		float right = y2;
 
-		mBarRect.set(left, top, right, bottom);
+		barRect.set(left, top, right, bottom);
 
-		trans.rectToPixelPhaseHorizontal(mBarRect, mAnimator.getPhaseY());
+		trans.rectToPixelPhaseHorizontal(barRect, mAnimator.getPhaseY());
 	}
 
 	@Override