Kotlin BarLineScatterCandleBubbleDataSet

Author: hannesa2

MPChartLib/src/main/java/com/github/mikephil/charting/data/BarDataSet.kt

@@ -11,7 +11,7 @@ import kotlin.Int
 import kotlin.String
 import kotlin.arrayOf
 
-open class BarDataSet(yVals: MutableList<BarEntry?>, label: String?) : BarLineScatterCandleBubbleDataSet<BarEntry?>(yVals, label), IBarDataSet {
+open class BarDataSet(yVals: MutableList<BarEntry?>, label: String?) : BarLineScatterCandleBubbleDataSet<BarEntry>(yVals, label), IBarDataSet {
     /**
      * the maximum number of bars that are stacked upon each other, this value
      * is calculated from the Entries that are added to the DataSet
@@ -55,13 +55,13 @@ open class BarDataSet(yVals: MutableList<BarEntry?>, label: String?) : BarLineSc
         protected set
 
     init {
-        mHighLightColor = Color.rgb(0, 0, 0)
+        highLightColor = Color.rgb(0, 0, 0)
 
         calcStackSize(yVals)
         calcEntryCountIncludingStacks(yVals)
     }
 
-    override fun copy(): DataSet<BarEntry?> {
+    override fun copy(): BarDataSet {
         val entries: MutableList<BarEntry?> = ArrayList()
         for (i in mEntries.indices) {
             entries.add(mEntries[i]!!.copy())
@@ -85,14 +85,10 @@ open class BarDataSet(yVals: MutableList<BarEntry?>, label: String?) : BarLineSc
     }
 
     override fun getFill(index: Int): Fill? {
-        return gradients!!.get(index % gradients!!.size)
+        return gradients!![index % gradients!!.size]
     }
 
-    /**
-     * This method is deprecated.
-     * Use getFill(...) instead.
-     */
-    @Deprecated("")
+    @Deprecated("Use getFill(...) instead")
     fun getGradient(index: Int): Fill? {
         return getFill(index)
     }
@@ -105,11 +101,7 @@ open class BarDataSet(yVals: MutableList<BarEntry?>, label: String?) : BarLineSc
         gradients!!.add(Fill(startColor, endColor))
     }
 
-    /**
-     * This method is deprecated.
-     * Use setFills(...) instead.
-     */
-    @Deprecated("")
+    @Deprecated("Use setFills(...) instead")
     fun setGradientColors(gradientColors: MutableList<Fill?>?) {
         this.gradients = gradientColors
     }
@@ -137,7 +129,7 @@ open class BarDataSet(yVals: MutableList<BarEntry?>, label: String?) : BarLineSc
     }
 
     /**
-     * calculates the maximum stacksize that occurs in the Entries array of this
+     * calculates the maximum stackSize that occurs in the Entries array of this
      * DataSet
      */
     private fun calcStackSize(yVals: MutableList<BarEntry?>) {
@@ -238,7 +230,7 @@ open class BarDataSet(yVals: MutableList<BarEntry?>, label: String?) : BarLineSc
         return mStackLabels
     }
 
-    override fun getEntryIndex(entry: BarEntry?): Int {
+    override fun getEntryIndex(entry: BarEntry): Int {
         return this.getEntryIndex(entry)
     }
 }

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

@@ -0,0 +1,22 @@
+package com.github.mikephil.charting.data
+
+import android.graphics.Color
+import com.github.mikephil.charting.interfaces.datasets.IBarLineScatterCandleBubbleDataSet
+
+/**
+ * Baseclass of all DataSets for Bar-, Line-, Scatter- and CandleStickChart.
+ */
+abstract class BarLineScatterCandleBubbleDataSet<T : Entry>(yVals: MutableList<T?>?, label: String?) :
+    DataSet<T>(yVals, label), IBarLineScatterCandleBubbleDataSet<T> {
+    /**
+     * Sets the color that is used for drawing the highlight indicators. Dont
+     * forget to resolve the color using getResources().getColor(...) or
+     * Color.rgb(...).
+     */
+    override var highLightColor: Int = Color.rgb(255, 187, 115)
+
+    protected fun copy(barLineScatterCandleBubbleDataSet: BarLineScatterCandleBubbleDataSet<*>) {
+        super.copy((barLineScatterCandleBubbleDataSet as BaseDataSet<*>?)!!)
+        barLineScatterCandleBubbleDataSet.highLightColor = this.highLightColor
+    }
+}

MPChartLib/src/main/java/com/github/mikephil/charting/data/BarLineScatterCandleBubbleDataSet.kt

@@ -94,7 +94,7 @@ protected void copy(CandleDataSet candleDataSet) {
         candleDataSet.mShowCandleBar = mShowCandleBar;
         candleDataSet.mBarSpace = mBarSpace;
         candleDataSet.mShadowColorSameAsCandle = mShadowColorSameAsCandle;
-        candleDataSet.mHighLightColor = mHighLightColor;
+        candleDataSet.highLightColor = highLightColor;
         candleDataSet.mIncreasingPaintStyle = mIncreasingPaintStyle;
         candleDataSet.mDecreasingPaintStyle = mDecreasingPaintStyle;
         candleDataSet.mNeutralColor = mNeutralColor;

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

@@ -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(e: T): Int
+    fun getEntryIndex(entry: T): Int
 
     /**
      * This method returns the actual