Skip to content

Commit 7a9d178

Browse files
committed
More Kotlin conversions
1 parent 5ef55da commit 7a9d178

File tree

7 files changed

+36
-36
lines changed

7 files changed

+36
-36
lines changed

MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@
5353
import java.io.OutputStream;
5454
import java.util.ArrayList;
5555

56+
import androidx.annotation.NonNull;
57+
5658
/**
5759
* Baseclass of all Chart-Views.
5860
*
@@ -1311,6 +1313,7 @@ public void setDrawMarkers(boolean enabled) {
13111313
/**
13121314
* Returns the ChartData object that has been set for the chart.
13131315
*/
1316+
@NonNull
13141317
public T getData() {
13151318
return mData;
13161319
}

MPChartLib/src/main/java/com/github/mikephil/charting/charts/LineChart.kt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@ class LineChart : BarLineChartBase<LineData?>, LineDataProvider {
1818
mRenderer = LineChartRenderer(this, mAnimator, mViewPortHandler)
1919
}
2020

21-
override fun getLineData(): LineData {
22-
mData?.let {
23-
return it
24-
} ?: run {
25-
return LineData()
21+
override val lineData: LineData
22+
get() {
23+
mData?.let {
24+
return it
25+
} ?: run {
26+
return LineData()
27+
}
2628
}
27-
}
2829

2930
public override fun onDetachedFromWindow() {
3031
// releases the bitmap in the renderer to avoid oom error

MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/BarLineScatterCandleBubbleDataProvider.java

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.github.mikephil.charting.interfaces.dataprovider
2+
3+
import com.github.mikephil.charting.components.YAxis.AxisDependency
4+
import com.github.mikephil.charting.data.BarLineScatterCandleBubbleData
5+
import com.github.mikephil.charting.utils.Transformer
6+
7+
interface BarLineScatterCandleBubbleDataProvider : ChartInterface {
8+
fun getTransformer(axis: AxisDependency?): Transformer?
9+
fun isInverted(axis: AxisDependency?): Boolean
10+
val lowestVisibleX: Float
11+
val highestVisibleX: Float
12+
override fun getData(): BarLineScatterCandleBubbleData<*>
13+
}

MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/LineDataProvider.java

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package com.github.mikephil.charting.interfaces.dataprovider
2+
3+
import com.github.mikephil.charting.components.YAxis
4+
import com.github.mikephil.charting.components.YAxis.AxisDependency
5+
import com.github.mikephil.charting.data.LineData
6+
7+
interface LineDataProvider : BarLineScatterCandleBubbleDataProvider {
8+
val lineData: LineData
9+
fun getAxis(dependency: AxisDependency): YAxis?
10+
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -629,12 +629,12 @@ public void drawExtras(Canvas c) {
629629
/**
630630
* cache for the circle bitmaps of all datasets
631631
*/
632-
private HashMap<IDataSet, DataSetImageCache> mImageCaches = new HashMap<>();
632+
private final HashMap<IDataSet, DataSetImageCache> mImageCaches = new HashMap<>();
633633

634634
/**
635635
* buffer for drawing the circles
636636
*/
637-
private float[] mCirclesBuffer = new float[2];
637+
private final float[] mCirclesBuffer = new float[2];
638638

639639
protected void drawCircles(Canvas c) {
640640

@@ -782,7 +782,7 @@ public void releaseBitmap() {
782782

783783
private class DataSetImageCache {
784784

785-
private Path mCirclePathBuffer = new Path();
785+
private final Path mCirclePathBuffer = new Path();
786786

787787
private Bitmap[] circleBitmaps;
788788

0 commit comments

Comments
 (0)