Restructure isDrawFilledEnabled

hannesa2 · hannesa2 · commit 586f652d07a9 · 2025-12-23T09:11:34.000+01:00
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/LineRadarDataSet.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/data/LineRadarDataSet.kt
@@ -66,10 +66,6 @@ abstract class LineRadarDataSet<T : Entry>(yVals: MutableList<T>?, label: String
             mLineWidth = width.convertDpToPixel()
         }
 
-    override fun setDrawFilled(enabled: Boolean) {
-        this.isDrawFilledEnabled = enabled
-    }
-
     protected fun copy(lineRadarDataSet: LineRadarDataSet<*>) {
         super.copy((lineRadarDataSet as BaseDataSet<*>?)!!)
         lineRadarDataSet.isDrawFilledEnabled = this.isDrawFilledEnabled
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineRadarDataSet.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineRadarDataSet.kt
@@ -28,14 +28,6 @@ interface ILineRadarDataSet<T : Entry> : ILineScatterCandleRadarDataSet<T> {
     /**
      * Returns true if filled drawing is enabled, false if not
      */
-    val isDrawFilledEnabled: Boolean
+    var isDrawFilledEnabled: Boolean
 
-    /**
-     * Set to true if the DataSet should be drawn filled (surface), and not just
-     * as a line, disabling this will give great performance boost. Please note that this method
-     * uses the canvas.clipPath(...) method for drawing the filled area.
-     * For devices with API level < 18 (Android 4.3), hardware acceleration of the chart should
-     * be turned off. Default: false
-     */
-    fun setDrawFilled(enabled: Boolean)
 }
diff --git a/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt
@@ -106,7 +106,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
 
             set1.lineMode = LineDataSet.Mode.CUBIC_BEZIER
             set1.cubicIntensity = 0.2f
-            set1.setDrawFilled(true)
+            set1.isDrawFilledEnabled = true
             set1.isDrawCirclesEnabled = false
             set1.lineWidth = 1.8f
             set1.circleRadius = 4f
@@ -163,10 +163,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
             R.id.actionToggleFilled -> {
                 binding.chart1.data?.dataSets?.forEach { set ->
                     set.let {
-                        if (set.isDrawFilledEnabled)
-                            set.setDrawFilled(false)
-                        else
-                            set.setDrawFilled(true)
+                        set.isDrawFilledEnabled = !set.isDrawFilledEnabled
                     }
                 }
                 binding.chart1.invalidate()
diff --git a/app/src/main/kotlin/info/appdev/chartexample/DataTools.kt b/app/src/main/kotlin/info/appdev/chartexample/DataTools.kt
@@ -204,7 +204,7 @@ class DataTools {
             lineDataSet01.enableDashedHighlightLine(10f, 5f, 0f)
 
             // set the filled area
-            lineDataSet01.setDrawFilled(true)
+            lineDataSet01.isDrawFilledEnabled = true
             lineDataSet01.fillFormatter = object : IFillFormatter {
                 override fun getFillLinePosition(dataSet: ILineDataSet?, dataProvider: LineDataProvider): Float {
                     return lineChart.axisLeft.axisMinimum
diff --git a/app/src/main/kotlin/info/appdev/chartexample/FilledLineActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/FilledLineActivity.kt
@@ -105,7 +105,7 @@ class FilledLineActivity : DemoBase() {
             set1.lineWidth = 2f
             set1.circleRadius = 3f
             set1.fillAlpha = 255
-            set1.setDrawFilled(true)
+            set1.isDrawFilledEnabled = true
             set1.fillColor = Color.WHITE
             set1.highLightColor = Color.rgb(244, 117, 117)
             set1.isDrawCircleHoleEnabled = false
@@ -125,7 +125,7 @@ class FilledLineActivity : DemoBase() {
             set2.lineWidth = 2f
             set2.circleRadius = 3f
             set2.fillAlpha = 255
-            set2.setDrawFilled(true)
+            set2.isDrawFilledEnabled = true
             set2.fillColor = Color.WHITE
             set2.isDrawCircleHoleEnabled = false
             set2.highLightColor = Color.rgb(244, 117, 117)
diff --git a/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt
@@ -148,7 +148,7 @@ class InvertedLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa
 
             R.id.actionToggleFilled -> {
                 binding.chart1.data?.dataSets?.forEach { set ->
-                    set.setDrawFilled(!set.isDrawFilledEnabled)
+                    set.isDrawFilledEnabled = !set.isDrawFilledEnabled
                 }
                 binding.chart1.invalidate()
             }
diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt
@@ -177,7 +177,7 @@ class LineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelec
 
             R.id.actionToggleFilled -> {
                 binding.chart1.data?.dataSets?.forEach { set ->
-                    set.setDrawFilled(!set.isDrawFilledEnabled)
+                    set.isDrawFilledEnabled = !set.isDrawFilledEnabled
                     binding.chart1.invalidate()
                 }
             }
diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt
@@ -232,7 +232,7 @@ class LineChartDualAxisActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa
 
             R.id.actionToggleFilled -> {
                 binding.chart1.data?.dataSets?.forEach { set ->
-                    set.setDrawFilled(!set.isDrawFilledEnabled)
+                    set.isDrawFilledEnabled = !set.isDrawFilledEnabled
                 }
                 binding.chart1.invalidate()
             }
diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt
@@ -173,12 +173,7 @@ class LineChartTimeActivity : DemoBase(), OnSeekBarChangeListener {
 
             R.id.actionToggleFilled -> {
                 binding.chart1.data?.dataSets?.forEach { set ->
-                    set.let {
-                        if (set.isDrawFilledEnabled)
-                            set.setDrawFilled(false)
-                        else
-                            set.setDrawFilled(true)
-                    }
+                    set.isDrawFilledEnabled = !set.isDrawFilledEnabled
                 }
                 binding.chart1.invalidate()
             }
diff --git a/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt
@@ -156,13 +156,8 @@ class MultiLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartGestu
             }
 
             R.id.actionToggleFilled -> {
-                binding.chart1.data!!.dataSets.forEach { set ->
-                    set?.let {
-                        if (set.isDrawFilledEnabled)
-                            set.setDrawFilled(false)
-                        else
-                            set.setDrawFilled(true)
-                    }
+                binding.chart1.data?.dataSets?.forEach { set ->
+                    set.isDrawFilledEnabled = !set.isDrawFilledEnabled
                 }
                 binding.chart1.invalidate()
             }
diff --git a/app/src/main/kotlin/info/appdev/chartexample/PerformanceLineChart.kt b/app/src/main/kotlin/info/appdev/chartexample/PerformanceLineChart.kt
@@ -7,13 +7,13 @@ import android.view.Menu
 import android.view.MenuItem
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
+import androidx.core.net.toUri
 import com.github.mikephil.charting.data.Entry
 import com.github.mikephil.charting.data.LineData
 import com.github.mikephil.charting.data.LineDataSet
 import info.appdev.chartexample.DataTools.Companion.getMuchValues
-import info.appdev.chartexample.notimportant.DemoBase
-import androidx.core.net.toUri
 import info.appdev.chartexample.databinding.ActivityPerformanceLinechartBinding
+import info.appdev.chartexample.notimportant.DemoBase
 
 class PerformanceLineChart : DemoBase(), OnSeekBarChangeListener {
 
@@ -69,7 +69,7 @@ class PerformanceLineChart : DemoBase(), OnSeekBarChangeListener {
         set1.isDrawValues = false
         set1.isDrawCirclesEnabled = false
         set1.lineMode = LineDataSet.Mode.LINEAR
-        set1.setDrawFilled(false)
+        set1.isDrawFilledEnabled = false
 
         // create a data object with the data sets
         val data = LineData(set1)
diff --git a/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt
@@ -106,7 +106,7 @@ class RadarChartActivity : DemoBase() {
         val set1 = RadarDataSet(entries1, "Last Week")
         set1.color = Color.rgb(103, 110, 129)
         set1.fillColor = Color.rgb(103, 110, 129)
-        set1.setDrawFilled(true)
+        set1.isDrawFilledEnabled = true
         set1.fillAlpha = 180
         set1.lineWidth = 2f
         set1.isDrawHighlightCircleEnabled = true
@@ -115,7 +115,7 @@ class RadarChartActivity : DemoBase() {
         val set2 = RadarDataSet(entries2, "This Week")
         set2.color = Color.rgb(121, 162, 175)
         set2.fillColor = Color.rgb(121, 162, 175)
-        set2.setDrawFilled(true)
+        set2.isDrawFilledEnabled = true
         set2.fillAlpha = 180
         set2.lineWidth = 2f
         set2.isDrawHighlightCircleEnabled = true
@@ -176,7 +176,7 @@ class RadarChartActivity : DemoBase() {
 
             R.id.actionToggleFilled -> {
                 binding.chart1.data?.dataSets?.forEach { set ->
-                    set.setDrawFilled(!set.isDrawFilledEnabled)
+                    set.isDrawFilledEnabled = !set.isDrawFilledEnabled
                 }
                 binding.chart1.invalidate()
             }
diff --git a/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt
@@ -143,9 +143,8 @@ class SpecificPositionsLineChartActivity : DemoBase(), OnSeekBarChangeListener,
             }
 
             R.id.actionToggleFilled -> {
-                binding.chart1.data?.dataSets?.forEach {
-                    val set = it as LineDataSet
-                    set.setDrawFilled(!set.isDrawFilledEnabled)
+                binding.chart1.data?.dataSets?.forEach { set ->
+                    set.isDrawFilledEnabled = !set.isDrawFilledEnabled
                 }
                 binding.chart1.invalidate()
             }
@@ -259,7 +258,7 @@ class SpecificPositionsLineChartActivity : DemoBase(), OnSeekBarChangeListener,
         set11.circleRadius = 3f
         set11.isDrawCircleHoleEnabled = false
         set11.valueTextSize = 9f
-        set11.setDrawFilled(true)
+        set11.isDrawFilledEnabled = true
         set11.formLineWidth = 1f
         set11.formLineDashEffect = DashPathEffect(floatArrayOf(10f, 5f), 0f)
         set11.formSize = 15f

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ class InvertedLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa`
`148`	`148`
`149`	`149`	`R.id.actionToggleFilled -> {`
`150`	`150`	`binding.chart1.data?.dataSets?.forEach { set ->`
`151`		`- set.setDrawFilled(!set.isDrawFilledEnabled)`
	`151`	`+ set.isDrawFilledEnabled = !set.isDrawFilledEnabled`
`152`	`152`	`}`
`153`	`153`	`binding.chart1.invalidate()`
`154`	`154`	`}`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ class LineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelec`
`177`	`177`
`178`	`178`	`R.id.actionToggleFilled -> {`
`179`	`179`	`binding.chart1.data?.dataSets?.forEach { set ->`
`180`		`- set.setDrawFilled(!set.isDrawFilledEnabled)`
	`180`	`+ set.isDrawFilledEnabled = !set.isDrawFilledEnabled`
`181`	`181`	`binding.chart1.invalidate()`
`182`	`182`	`}`
`183`	`183`	`}`
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ class LineChartDualAxisActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa`
`232`	`232`
`233`	`233`	`R.id.actionToggleFilled -> {`
`234`	`234`	`binding.chart1.data?.dataSets?.forEach { set ->`
`235`		`- set.setDrawFilled(!set.isDrawFilledEnabled)`
	`235`	`+ set.isDrawFilledEnabled = !set.isDrawFilledEnabled`
`236`	`236`	`}`
`237`	`237`	`binding.chart1.invalidate()`
`238`	`238`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,12 +173,7 @@ class LineChartTimeActivity : DemoBase(), OnSeekBarChangeListener {`
`173`	`173`
`174`	`174`	`R.id.actionToggleFilled -> {`
`175`	`175`	`binding.chart1.data?.dataSets?.forEach { set ->`
`176`		`- set.let {`
`177`		`- if (set.isDrawFilledEnabled)`
`178`		`- set.setDrawFilled(false)`
`179`		`- else`
`180`		`- set.setDrawFilled(true)`
`181`		`- }`
	`176`	`+ set.isDrawFilledEnabled = !set.isDrawFilledEnabled`
`182`	`177`	`}`
`183`	`178`	`binding.chart1.invalidate()`
`184`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,13 +156,8 @@ class MultiLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartGestu`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`R.id.actionToggleFilled -> {`
`159`		`- binding.chart1.data!!.dataSets.forEach { set ->`
`160`		`- set?.let {`
`161`		`- if (set.isDrawFilledEnabled)`
`162`		`- set.setDrawFilled(false)`
`163`		`- else`
`164`		`- set.setDrawFilled(true)`
`165`		`- }`
	`159`	`+ binding.chart1.data?.dataSets?.forEach { set ->`
	`160`	`+ set.isDrawFilledEnabled = !set.isDrawFilledEnabled`
`166`	`161`	`}`
`167`	`162`	`binding.chart1.invalidate()`
`168`	`163`	`}`