Kotlin isDrawValues

Author: hannesa2

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

@@ -138,8 +138,11 @@ abstract class BaseDataSet<T : Entry>() : IDataSet<T> {
             mFormLineDashEffect = value
         }
 
-    override val isDrawValues: Boolean
+    override var isDrawValues: Boolean
         get() = mIsDrawValues
+        set(value) {
+            mIsDrawValues = value
+        }
 
     override var isDrawIcons: Boolean
         get() = mIsDrawIcons
@@ -309,10 +312,6 @@ abstract class BaseDataSet<T : Entry>() : IDataSet<T> {
             mIsVisible = value
         }
 
-    override fun setDrawValues(enabled: Boolean) {
-        this.mDrawValues = enabled
-    }
-
     override fun getIndexInEntries(xIndex: Int): Int {
         for (i in 0..<entryCount) {
             if (xIndex.toFloat() == getEntryForIndex(i)!!.x) return i

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

@@ -7,6 +7,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 /**
  * The DataSet class represents one group or type of entries (Entry) in the
  * Chart that belong together. It is designed to logically separate different
@@ -254,7 +256,7 @@ public void clear() {
 	}
 
 	@Override
-	public boolean addEntry(T entry) {
+	public boolean addEntry(@NonNull T entry) {
 		List<T> values = getEntries();
 		if (values == null) {
 			values = new ArrayList<>();

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

@@ -224,7 +224,7 @@ public void disableDashedLine() {
 
     @Override
     public boolean isDashedLineEnabled() {
-        return mDashPathEffect == null ? false : true;
+        return mDashPathEffect != null;
     }
 
     @Override

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

@@ -56,7 +56,7 @@ public interface ChartInterface {
     IValueFormatter getDefaultValueFormatter();
 
     @Nullable
-    ChartData getData();
+	ChartData getData();
 
     int getMaxVisibleCount();
 }

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

@@ -81,7 +81,7 @@ interface IDataSet<T : Entry> {
      * INFORMATION: This method does calculations at runtime. Do
      * not over-use in performance critical situations.
      */
-    fun getEntriesForXValue(xValue: Float): MutableList<T?>?
+    fun getEntriesForXValue(xValue: Float): MutableList<T>?
 
     /**
      * Returns the Entry object found at the given index (NOT xIndex) in the values array.
@@ -107,8 +107,7 @@ interface IDataSet<T : Entry> {
      * Returns the position of the provided entry in the DataSets Entry array.
      * Returns -1 if doesn't exist.
      */
-    int getEntryIndex(T entry);
-
+    fun getEntryIndex(entry: T): Int
 
     /**
      * This method returns the actual
@@ -126,7 +125,6 @@ interface IDataSet<T : Entry> {
      */
     fun addEntry(entry: T): Boolean
 
-
     /**
      * Adds an Entry to the DataSet dynamically.
      * Entries are added to their appropriate index in the values array respective to their x-position.
@@ -274,16 +272,11 @@ interface IDataSet<T : Entry> {
     val formLineDashEffect: DashPathEffect?
 
     /**
-     * set this to true to draw y-values on the chart.
+     * Returns true if y-value drawing is enabled, false if not
      * NOTE (for bar and line charts): if `maxVisibleCount` is reached, no values will be drawn even
      * if this is enabled
      */
-    fun setDrawValues(enabled: Boolean)
-
-    /**
-     * Returns true if y-value drawing is enabled, false if not
-     */
-    val isDrawValues: Boolean
+    var isDrawValues: Boolean
 
     /**
      * Returns true if y-icon drawing is enabled, false if not

app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt

@@ -98,7 +98,7 @@ class AnotherBarActivity : DemoBase(), OnSeekBarChangeListener {
         } else {
             set1 = BarDataSet(values, "Data Set")
             set1.setColors(*ColorTemplate.VORDIPLOM_COLORS)
-            set1.setDrawValues(false)
+            set1.isDrawValues = false
 
             val dataSets = ArrayList<IBarDataSet?>()
             dataSets.add(set1)
@@ -126,7 +126,8 @@ class AnotherBarActivity : DemoBase(), OnSeekBarChangeListener {
             }
 
             R.id.actionToggleValues -> {
-                for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValues)
+                for (set in chart?.data?.dataSets!!)
+                    set.isDrawValues = !set.isDrawValues
 
                 chart!!.invalidate()
             }

app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt

@@ -205,7 +205,7 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect
 
             R.id.actionToggleValues -> {
                 for (set in chart!!.data!!.dataSets)
-                    set.setDrawValues(!set.isDrawValues)
+                    set.isDrawValues = !set.isDrawValues
 
                 chart!!.invalidate()
             }

app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt

@@ -195,7 +195,7 @@ class BarChartActivityMultiDataset : DemoBase(), OnSeekBarChangeListener, OnChar
             }
 
             R.id.actionToggleValues -> {
-                for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValues)
+                for (set in chart!!.data!!.dataSets) set.isDrawValues = !set.isDrawValues
 
                 chart!!.invalidate()
             }

app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt

@@ -140,7 +140,7 @@ class BarChartActivitySinus : DemoBase(), OnSeekBarChangeListener {
             }
 
             R.id.actionToggleValues -> {
-                for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValues)
+                for (set in chart!!.data!!.dataSets) set.isDrawValues = !set.isDrawValues
 
                 chart!!.invalidate()
             }

app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt

@@ -126,17 +126,17 @@ class BubbleChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSel
         val set1 = BubbleDataSet(values1, "DS 1")
         set1.isDrawIcons = false
         set1.setColor(ColorTemplate.COLORFUL_COLORS[0], 130)
-        set1.setDrawValues(true)
+        set1.isDrawValues = true
 
         val set2 = BubbleDataSet(values2, "DS 2")
         set2.isDrawIcons = false
         set2.iconsOffset = MPPointF(0f, 15f)
         set2.setColor(ColorTemplate.COLORFUL_COLORS[1], 130)
-        set2.setDrawValues(true)
+        set2.isDrawValues = true
 
         val set3 = BubbleDataSet(values3, "DS 3")
         set3.setColor(ColorTemplate.COLORFUL_COLORS[2], 130)
-        set3.setDrawValues(true)
+        set3.isDrawValues = true
 
         val dataSets = ArrayList<IBubbleDataSet?>()
         dataSets.add(set1) // add the data sets
@@ -169,7 +169,7 @@ class BubbleChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSel
             }
 
             R.id.actionToggleValues -> {
-                for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValues)
+                for (set in chart!!.data!!.dataSets) set.isDrawValues = !set.isDrawValues
 
                 chart!!.invalidate()
             }