Kotlin ILineRadarDataSet

Author: hannesa2

MPChartLib/src/main/java/com/github/mikephil/charting/data/DataSet.java

@@ -191,6 +191,7 @@ protected void copy(DataSet dataSet) {
 		super.copy(dataSet);
 	}
 
+	@NonNull
 	@Override
 	public String toString() {
 		StringBuilder buffer = new StringBuilder();
@@ -207,9 +208,11 @@ public String toString() {
 	 */
 
 	public String toSimpleString() {
-		return"DataSet, label: " + (getLabel() == null ? "" : getLabel()) + ", entries: " + mEntries.size() +
+		return "DataSet, label: " +
+				(getLabel() == null ? "" : getLabel()) +
+				", entries: " +
+				mEntries.size() +
 				"\n";
-
 	}
 
 	@Override
@@ -233,9 +236,9 @@ public float getXMax() {
 	}
 
 	@Override
-	public void addEntryOrdered(T entry) {
+	public void addEntryOrdered(@NonNull T entry) {
 
-        if (mEntries == null) {
+		if (mEntries == null) {
             mEntries = new ArrayList<>();
         }
 
@@ -269,9 +272,9 @@ public boolean addEntry(@NonNull T entry) {
 	}
 
 	@Override
-	public boolean removeEntry(T entry) {
+	public boolean removeEntry(@NonNull T entry) {
 
-        if (mEntries == null)
+		if (mEntries == null)
             return false;
 
 		// remove the entry
@@ -285,7 +288,7 @@ public boolean removeEntry(T entry) {
 	}
 
 	@Override
-	public int getEntryIndex(Entry entry) {
+	public int getEntryIndex(@NonNull Entry entry) {
 		return mEntries.indexOf(entry);
 	}
 

MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IDataSet.kt

@@ -32,7 +32,7 @@ interface IDataSet<T : Entry> {
 
     /**
      * Returns the number of y-values this DataSet represents -> the size of the y-values array
-     * -> yvals.size()
+     * -> yVals.size()
      */
     val entryCount: Int
 
@@ -107,7 +107,7 @@ interface IDataSet<T : Entry> {
      * Returns the position of the provided entry in the DataSets Entry array.
      * Returns -1 if doesn't exist.
      */
-    fun getEntryIndex(entry: T): Int
+    fun getEntryIndex(e: T): Int
 
     /**
      * This method returns the actual

MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineDataSet.java

@@ -13,16 +13,12 @@ public interface ILineDataSet extends ILineRadarDataSet<Entry> {
 
     /**
      * Returns the drawing mode for this line dataset
-     *
-     * @return
      */
     LineDataSet.Mode getMode();
 
     /**
      * Returns the intensity of the cubic lines (the effect intensity).
      * Max = 1f = very cubic, Min = 0.05f = low cubic effect, Default: 0.2f
-     *
-     * @return
      */
     float getCubicIntensity();
 
@@ -45,59 +41,42 @@ public interface ILineDataSet extends ILineRadarDataSet<Entry> {
     /**
      * Returns the color at the given index of the DataSet's circle-color array.
      * Performs a IndexOutOfBounds check by modulus.
-     *
-     * @param index
-     * @return
      */
     int getCircleColor(int index);
 
     /**
      * Returns the number of colors in this DataSet's circle-color array.
-     *
-     * @return
      */
     int getCircleColorCount();
 
     /**
      * Returns true if drawing circles for this DataSet is enabled, false if not
-     *
-     * @return
      */
     boolean isDrawCirclesEnabled();
 
     /**
      * Returns the color of the inner circle (the circle-hole).
-     *
-     * @return
      */
     int getCircleHoleColor();
 
     /**
      * Returns true if drawing the circle-holes is enabled, false if not.
-     *
-     * @return
      */
     boolean isDrawCircleHoleEnabled();
 
     /**
      * Returns the DashPathEffect that is used for drawing the lines.
-     *
-     * @return
      */
     DashPathEffect getDashPathEffect();
 
     /**
      * Returns true if the dashed-line effect is enabled, false if not.
      * If the DashPathEffect object is null, also return false here.
-     *
-     * @return
      */
     boolean isDashedLineEnabled();
 
     /**
      * Returns the IFillFormatter that is set for this DataSet.
-     *
-     * @return
      */
     IFillFormatter getFillFormatter();
 }

…terfaces/datasets/ILineRadarDataSet.java …interfaces/datasets/ILineRadarDataSet.ktMPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineRadarDataSet.java renamed to MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineRadarDataSet.kt MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineRadarDataSet.java renamed to MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineRadarDataSet.kt

@@ -1,39 +1,34 @@
-package com.github.mikephil.charting.interfaces.datasets;
+package com.github.mikephil.charting.interfaces.datasets
 
-import android.graphics.drawable.Drawable;
-
-import com.github.mikephil.charting.data.Entry;
-
-/**
- * Created by Philipp Jahoda on 21/10/15.
- */
-public interface ILineRadarDataSet<T extends Entry> extends ILineScatterCandleRadarDataSet<T> {
+import android.graphics.drawable.Drawable
+import com.github.mikephil.charting.data.Entry
 
+interface ILineRadarDataSet<T : Entry> : ILineScatterCandleRadarDataSet<T> {
     /**
      * Returns the color that is used for filling the line surface area.
      */
-    int getFillColor();
+    val fillColor: Int
 
     /**
      * Returns the drawable used for filling the area below the line.
      */
-    Drawable getFillDrawable();
+    val fillDrawable: Drawable?
 
     /**
      * Returns the alpha value that is used for filling the line surface,
      * default: 85
      */
-    int getFillAlpha();
+    val fillAlpha: Int
 
     /**
      * Returns the stroke-width of the drawn line
      */
-    float getLineWidth();
+    val lineWidth: Float
 
     /**
      * Returns true if filled drawing is enabled, false if not
      */
-    boolean isDrawFilledEnabled();
+    val isDrawFilledEnabled: Boolean
 
     /**
      * Set to true if the DataSet should be drawn filled (surface), and not just
@@ -42,5 +37,5 @@ public interface ILineRadarDataSet<T extends Entry> extends ILineScatterCandleRa
      * For devices with API level < 18 (Android 4.3), hardware acceleration of the chart should
      * be turned off. Default: false
      */
-    void setDrawFilled(boolean enabled);
+    fun setDrawFilled(enabled: Boolean)
 }

MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineScatterCandleRadarDataSet.kt

@@ -6,25 +6,21 @@ import com.github.mikephil.charting.data.Entry
 interface ILineScatterCandleRadarDataSet<T : Entry> : IBarLineScatterCandleBubbleDataSet<T> {
     /**
      * Returns true if vertical highlight indicator lines are enabled (drawn)
-     * @return
      */
     val isVerticalHighlightIndicatorEnabled: Boolean
 
     /**
      * Returns true if vertical highlight indicator lines are enabled (drawn)
-     * @return
      */
     val isHorizontalHighlightIndicatorEnabled: Boolean
 
     /**
      * Returns the line-width in which highlight lines are to be drawn.
-     * @return
      */
     val highlightLineWidth: Float
 
     /**
      * Returns the DashPathEffect that is used for highlighting.
-     * @return
      */
     val dashPathEffectHighlight: DashPathEffect?
 }

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

@@ -22,7 +22,7 @@ import java.lang.ref.WeakReference
 import kotlin.math.max
 import kotlin.math.min
 
-class LineChartRenderer(
+open class LineChartRenderer(
     @JvmField var chart: LineDataProvider, animator: ChartAnimator?,
     viewPortHandler: ViewPortHandler?
 ) : LineRadarRenderer(animator, viewPortHandler) {