Skip to content

Restructure isDrawFilledEnabled #562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hannesa2 merged 1 commit into from
Dec 23, 2025
Merged

Restructure isDrawFilledEnabled #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions MPChartLib/src/main/java/com/github/mikephil/charting/data/LineRadarDataSet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 1 addition & 9 deletions ...rtLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineRadarDataSet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
7 changes: 2 additions & 5 deletions app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/DataTools.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/kotlin/info/appdev/chartexample/FilledLineActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
7 changes: 1 addition & 6 deletions app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
9 changes: 2 additions & 7 deletions app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/kotlin/info/appdev/chartexample/PerformanceLineChart.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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()
}
Expand Down
7 changes: 3 additions & 4 deletions app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down Expand Up @@ -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
Expand Down
Loading