From 6ecfb5403f1f633890bc04311bc0258b9e985345 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Wed, 17 Dec 2025 13:06:05 +0100 Subject: [PATCH 1/3] Interface change --- .../com/github/mikephil/charting/data/BaseDataSet.kt | 2 +- .../charting/interfaces/datasets/IDataSet.java | 2 +- .../mikephil/charting/renderer/BarChartRenderer.kt | 6 +++--- .../renderer/BarLineScatterCandleBubbleRenderer.kt | 2 +- .../charting/renderer/BubbleChartRenderer.kt | 2 +- .../charting/renderer/CandleStickChartRenderer.kt | 2 +- .../charting/renderer/HorizontalBarChartRenderer.kt | 6 +++--- .../mikephil/charting/renderer/LineChartRenderer.kt | 12 ++++++------ .../mikephil/charting/renderer/PieChartRenderer.kt | 2 +- .../mikephil/charting/renderer/RadarChartRenderer.kt | 2 +- .../charting/renderer/ScatterChartRenderer.kt | 2 +- .../info/appdev/chartexample/AnotherBarActivity.kt | 2 +- .../info/appdev/chartexample/BarChartActivity.kt | 2 +- .../chartexample/BarChartActivityMultiDataset.kt | 2 +- .../appdev/chartexample/BarChartActivitySinus.kt | 2 +- .../info/appdev/chartexample/BubbleChartActivity.kt | 2 +- .../appdev/chartexample/CandleStickChartActivity.kt | 2 +- .../appdev/chartexample/CombinedChartActivity.kt | 4 ++-- .../appdev/chartexample/CubicLineChartActivity.kt | 2 +- .../info/appdev/chartexample/DrawChartActivity.kt | 2 +- .../chartexample/HorizontalBarChartActivity.kt | 2 +- .../HorizontalBarNegativeChartActivity.kt | 2 +- .../appdev/chartexample/InvertedLineChartActivity.kt | 2 +- .../info/appdev/chartexample/LineChartActivity.kt | 2 +- .../appdev/chartexample/LineChartDualAxisActivity.kt | 2 +- .../appdev/chartexample/LineChartTimeActivity.kt | 2 +- .../appdev/chartexample/MultiLineChartActivity.kt | 2 +- .../info/appdev/chartexample/PieChartActivity.kt | 2 +- .../appdev/chartexample/PieChartRoundedActivity.kt | 2 +- .../appdev/chartexample/PiePolylineChartActivity.kt | 2 +- .../info/appdev/chartexample/RadarChartActivity.kt | 2 +- .../info/appdev/chartexample/ScatterChartActivity.kt | 2 +- .../SpecificPositionsLineChartActivity.kt | 2 +- .../info/appdev/chartexample/StackedBarActivity.kt | 2 +- .../chartexample/StackedBarActivityNegative.kt | 2 +- .../compose/HorizontalBarComposeActivity.kt | 3 +-- 36 files changed, 46 insertions(+), 47 deletions(-) diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt index 6829bfc2a..72193a4dc 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt @@ -319,7 +319,7 @@ abstract class BaseDataSet() : IDataSet { this.mDrawValues = enabled } - override fun isDrawValuesEnabled(): Boolean { + override fun isDrawValues(): Boolean { return mDrawValues } diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IDataSet.java b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IDataSet.java index 0c64ec455..482d92162 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IDataSet.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IDataSet.java @@ -330,7 +330,7 @@ public interface IDataSet { /** * Returns true if y-value drawing is enabled, false if not */ - boolean isDrawValuesEnabled(); + boolean isDrawValues(); /** * Set this to true to draw y-icons on the chart. diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt index 57ccfbef8..9e063fb4d 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt @@ -314,7 +314,7 @@ open class BarChartRenderer( val entry = dataSet.getEntryForIndex(j / 4) val `val` = entry.y - if (dataSet.isDrawValuesEnabled) { + if (dataSet.isDrawValues) { drawValue( canvas, dataSet.valueFormatter, `val`, entry, i, x, if (`val` >= 0) (buffer.buffer[j + 1] + posOffset) else (buffer.buffer[j + 3] + negOffset), @@ -372,7 +372,7 @@ open class BarChartRenderer( continue } - if (dataSet.isDrawValuesEnabled) { + if (dataSet.isDrawValues) { drawValue( canvas, dataSet.valueFormatter, entry.y, entry, i, x, buffer.buffer[bufferIndex + 1] + @@ -454,7 +454,7 @@ open class BarChartRenderer( continue } - if (dataSet.isDrawValuesEnabled) { + if (dataSet.isDrawValues) { drawValue( canvas, dataSet.valueFormatter, diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarLineScatterCandleBubbleRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarLineScatterCandleBubbleRenderer.kt index 49221b3f5..5da78a6cb 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarLineScatterCandleBubbleRenderer.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarLineScatterCandleBubbleRenderer.kt @@ -20,7 +20,7 @@ abstract class BarLineScatterCandleBubbleRenderer(animator: ChartAnimator, viewP * Returns true if the DataSet values should be drawn, false if not. */ protected fun shouldDrawValues(set: IDataSet<*>): Boolean { - return set.isVisible() && (set.isDrawValuesEnabled() || set.isDrawIconsEnabled()) + return set.isVisible() && (set.isDrawValues() || set.isDrawIconsEnabled()) } /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt index d8bc78121..7cc50a88c 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt @@ -146,7 +146,7 @@ open class BubbleChartRenderer( val entry = dataSet.getEntryForIndex(j / 2 + xBounds.min) - if (dataSet.isDrawValuesEnabled) { + if (dataSet.isDrawValues) { drawValue( canvas, dataSet.valueFormatter, entry.size, entry, i, x, y + (0.5f * lineHeight), valueTextColor diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CandleStickChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CandleStickChartRenderer.kt index f17dc308c..fc6e3ddb6 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CandleStickChartRenderer.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CandleStickChartRenderer.kt @@ -250,7 +250,7 @@ open class CandleStickChartRenderer( val entry = dataSet.getEntryForIndex(j / 2 + xBounds.min) - if (dataSet.isDrawValuesEnabled) { + if (dataSet.isDrawValues) { drawValue( canvas, dataSet.valueFormatter, diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt index 591918417..7764a5fe7 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt @@ -234,7 +234,7 @@ open class HorizontalBarChartRenderer( negOffset = -negOffset - valueTextWidth } - if (dataSet.isDrawValuesEnabled) { + if (dataSet.isDrawValues) { drawValue( canvas, formattedValue!!, @@ -310,7 +310,7 @@ open class HorizontalBarChartRenderer( negOffset = -negOffset - valueTextWidth } - if (dataSet.isDrawValuesEnabled) { + if (dataSet.isDrawValues) { drawValue( canvas, formattedValue!!, buffer.buffer[bufferIndex + 2] @@ -410,7 +410,7 @@ open class HorizontalBarChartRenderer( continue } - if (dataSet.isDrawValuesEnabled) { + if (dataSet.isDrawValues) { drawValue(canvas, formattedValue!!, x, y + halfTextHeight, color) } diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt index 27258cc91..61849310f 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt @@ -88,7 +88,7 @@ open class LineChartRenderer( return paintRender.strokeWidth = dataSet.lineWidth - paintRender.setPathEffect(dataSet.dashPathEffect) + paintRender.pathEffect = dataSet.dashPathEffect when (dataSet.lineMode) { LineDataSet.Mode.LINEAR, LineDataSet.Mode.STEPPED -> drawLinear(canvas, dataSet) @@ -97,7 +97,7 @@ open class LineChartRenderer( else -> drawLinear(canvas, dataSet) } - paintRender.setPathEffect(null) + paintRender.pathEffect = null } protected fun drawHorizontalBezier(dataSet: ILineDataSet) { @@ -147,7 +147,7 @@ open class LineChartRenderer( bitmapCanvas!!.drawPath(cubicPath, paintRender) - paintRender.setPathEffect(null) + paintRender.pathEffect = null } protected fun drawCubicBezier(dataSet: ILineDataSet) { @@ -221,7 +221,7 @@ open class LineChartRenderer( bitmapCanvas!!.drawPath(cubicPath, paintRender) - paintRender.setPathEffect(null) + paintRender.pathEffect = null } protected fun drawCubicFill(canvas: Canvas, dataSet: ILineDataSet, spline: Path, trans: Transformer, bounds: XBounds) { @@ -379,7 +379,7 @@ open class LineChartRenderer( } } - paintRender.setPathEffect(null) + paintRender.pathEffect = null } protected var mGenerateFilledPathBuffer: Path = Path() @@ -532,7 +532,7 @@ open class LineChartRenderer( val entry = dataSet.getEntryForIndex(j / 2 + xBounds.min) if (entry != null) { - if (dataSet.isDrawValuesEnabled) { + if (dataSet.isDrawValues) { drawValue( canvas, dataSet.valueFormatter, entry.y, entry, i, x, y - valOffset, dataSet.getValueTextColor(j / 2) diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.kt index a3e227d73..fffe32a96 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.kt @@ -397,7 +397,7 @@ open class PieChartRenderer( if (dataSet.entryCount == 0) { continue } - val drawValues = dataSet.isDrawValuesEnabled + val drawValues = dataSet.isDrawValues if (!drawValues && !drawEntryLabels) { continue } diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt index a6768f905..6493421c3 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt @@ -156,7 +156,7 @@ open class RadarChartRenderer( pOut ) - if (dataSet.isDrawValuesEnabled) { + if (dataSet.isDrawValues) { drawValue( canvas, dataSet.valueFormatter, diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.kt index 24c142b72..ecd4f0147 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.kt @@ -116,7 +116,7 @@ open class ScatterChartRenderer(@JvmField var dataProvider: ScatterDataProvider, val entry = dataSet.getEntryForIndex(j / 2 + xBounds.min) - if (dataSet.isDrawValuesEnabled) { + if (dataSet.isDrawValues) { drawValue( canvas, dataSet.valueFormatter, diff --git a/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt index c41f08de4..7f2b5b8e5 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt @@ -124,7 +124,7 @@ class AnotherBarActivity : DemoBase(), OnSeekBarChangeListener { } R.id.actionToggleValues -> { - for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValuesEnabled()) + for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValues()) chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt index deb2ed201..4d53ed7c5 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt @@ -203,7 +203,7 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect R.id.actionToggleValues -> { for (set in chart!!.data!!.dataSets) - set.setDrawValues(!set.isDrawValuesEnabled()) + set.setDrawValues(!set.isDrawValues()) chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt index d3356f796..9af562469 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt @@ -193,7 +193,7 @@ class BarChartActivityMultiDataset : DemoBase(), OnSeekBarChangeListener, OnChar } R.id.actionToggleValues -> { - for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValuesEnabled()) + for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValues()) chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt index 49331c329..798c7dd73 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt @@ -131,7 +131,7 @@ class BarChartActivitySinus : DemoBase(), OnSeekBarChangeListener { } R.id.actionToggleValues -> { - for (set in binding.chart1.data!!.dataSets) set.setDrawValues(!set.isDrawValuesEnabled()) + for (set in binding.chart1.data!!.dataSets) set.setDrawValues(!set.isDrawValues()) binding.chart1.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt index dac69210f..431a7020a 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt @@ -167,7 +167,7 @@ class BubbleChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSel } R.id.actionToggleValues -> { - for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValuesEnabled()) + for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValues()) chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt index c421a80bc..e4d9d7ed2 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt @@ -148,7 +148,7 @@ class CandleStickChartActivity : DemoBase(), OnSeekBarChangeListener { } R.id.actionToggleValues -> { - for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValuesEnabled()) + for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValues()) chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt index aecc44a06..f02df2455 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt @@ -239,7 +239,7 @@ class CombinedChartActivity : DemoBase() { R.id.actionToggleLineValues -> { for (set in chart!!.data!!.dataSets) { - if (set is LineDataSet) set.setDrawValues(!set.isDrawValuesEnabled) + if (set is LineDataSet) set.setDrawValues(!set.isDrawValues) } chart!!.invalidate() @@ -247,7 +247,7 @@ class CombinedChartActivity : DemoBase() { R.id.actionToggleBarValues -> { for (set in chart!!.data!!.dataSets) { - if (set is BarDataSet) set.setDrawValues(!set.isDrawValuesEnabled) + if (set is BarDataSet) set.setDrawValues(!set.isDrawValues) } chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt index 4ab0267d4..76f2f2a9d 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt @@ -154,7 +154,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener { } R.id.actionToggleValues -> { - for (set in binding.chart1.data!!.dataSets) set.setDrawValues(!set.isDrawValuesEnabled) + for (set in binding.chart1.data!!.dataSets) set.setDrawValues(!set.isDrawValues) binding.chart1.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/DrawChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/DrawChartActivity.kt index 0920eee4c..07f1966da 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/DrawChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/DrawChartActivity.kt @@ -82,7 +82,7 @@ class DrawChartActivity : DemoBase(), OnChartValueSelectedListener, OnDrawListen val sets = binding.chart1.data!!.dataSets for (set in sets) { - set.setDrawValues(!set.isDrawValuesEnabled) + set.setDrawValues(!set.isDrawValues) } binding.chart1.invalidate() diff --git a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt index 605883d2a..c75896529 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt @@ -157,7 +157,7 @@ class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartV .dataSets for (iSet in sets) { - iSet.setDrawValues(!iSet.isDrawValuesEnabled()) + iSet.setDrawValues(!iSet.isDrawValues()) } binding.chart1.invalidate() diff --git a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt index f8b11fcf5..22b7b1eef 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt @@ -161,7 +161,7 @@ class HorizontalBarNegativeChartActivity : DemoBase(), OnSeekBarChangeListener, R.id.actionToggleValues -> { chart!!.data!!.dataSets.forEach { - it.setDrawValues(!it.isDrawValuesEnabled()) + it.setDrawValues(!it.isDrawValues()) } chart!!.invalidate() diff --git a/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt index 1f805ad71..ca57f1d66 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt @@ -144,7 +144,7 @@ class InvertedLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa R.id.actionToggleValues -> { chart!!.data!!.dataSets.forEach { iSet -> - iSet.setDrawValues(!iSet.isDrawValuesEnabled) + iSet.setDrawValues(!iSet.isDrawValues) } chart!!.invalidate() diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt index 28ad617b3..415e1589d 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt @@ -155,7 +155,7 @@ class LineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelec R.id.actionToggleValues -> { binding.chart1.data?.dataSets?.forEach { set -> - set.setDrawValues(!set.isDrawValuesEnabled) + set.setDrawValues(!set.isDrawValues) } 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 index 2cb85d9ce..86990b10f 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt @@ -227,7 +227,7 @@ class LineChartDualAxisActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa R.id.actionToggleValues -> { chart!!.data!!.dataSets.forEach { set -> - set.setDrawValues(!set.isDrawValuesEnabled) + set.setDrawValues(!set.isDrawValues) } chart!!.invalidate() diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt index 48a8b7031..efa718710 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt @@ -165,7 +165,7 @@ class LineChartTimeActivity : DemoBase(), OnSeekBarChangeListener { R.id.actionToggleValues -> { chart!!.data!!.dataSets.forEach { set -> - set.setDrawValues(!set.isDrawValuesEnabled) + set.setDrawValues(!set.isDrawValues) } chart!!.invalidate() diff --git a/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt index d7c2933c2..16626510a 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt @@ -132,7 +132,7 @@ class MultiLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartGestu R.id.actionToggleValues -> { binding.chart1.data!!.dataSets.forEach { set -> - set.setDrawValues(!set.isDrawValuesEnabled) + set.setDrawValues(!set.isDrawValues) } binding.chart1.invalidate() diff --git a/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt index d498883d0..c50dcb5a6 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt @@ -177,7 +177,7 @@ class PieChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect } R.id.actionToggleValues -> { - for (set in chart!!.data!!.getDataSets()) set.setDrawValues(!set.isDrawValuesEnabled()) + for (set in chart!!.data!!.getDataSets()) set.setDrawValues(!set.isDrawValues()) chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt index 34f2bd1d2..a6afdc4eb 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt @@ -182,7 +182,7 @@ class PieChartRoundedActivity : DemoBase(), OnSeekBarChangeListener, OnChartValu } R.id.actionToggleValues -> { - for (set in chart!!.data!!.getDataSets()) set.setDrawValues(!set.isDrawValuesEnabled()) + for (set in chart!!.data!!.getDataSets()) set.setDrawValues(!set.isDrawValues()) chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/PiePolylineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/PiePolylineChartActivity.kt index c1e25cfe6..05a8202d6 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/PiePolylineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/PiePolylineChartActivity.kt @@ -171,7 +171,7 @@ class PiePolylineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartVal } R.id.actionToggleValues -> { - for (set in chart!!.data!!.getDataSets()) set.setDrawValues(!set.isDrawValuesEnabled()) + for (set in chart!!.data!!.getDataSets()) set.setDrawValues(!set.isDrawValues()) chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt index a22286207..ff48fc5eb 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt @@ -156,7 +156,7 @@ class RadarChartActivity : DemoBase() { } R.id.actionToggleValues -> { - for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValuesEnabled()) + for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValues()) chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/ScatterChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/ScatterChartActivity.kt index 4db07ae59..178739cc4 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/ScatterChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/ScatterChartActivity.kt @@ -151,7 +151,7 @@ class ScatterChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSe R.id.actionToggleValues -> { chart!!.data!!.dataSets.forEach { set -> - set.setDrawValues(!set.isDrawValuesEnabled) + set.setDrawValues(!set.isDrawValues) } chart!!.invalidate() diff --git a/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt index aaf0ec902..a2dbda999 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt @@ -140,7 +140,7 @@ class SpecificPositionsLineChartActivity : DemoBase(), OnSeekBarChangeListener, R.id.actionToggleValues -> { mChart!!.data?.dataSets?.forEach { val set = it as LineDataSet - set.setDrawValues(!set.isDrawValuesEnabled) + set.setDrawValues(!set.isDrawValues) } mChart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt index 165b1bdc3..8633c4d62 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt @@ -161,7 +161,7 @@ class StackedBarActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSele R.id.actionToggleValues -> { chart!!.data!!.dataSets.forEach { set -> - set.setDrawValues(!set.isDrawValuesEnabled) + set.setDrawValues(!set.isDrawValues) } chart!!.invalidate() diff --git a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt index 25eb40119..b0349554b 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt @@ -129,7 +129,7 @@ class StackedBarActivityNegative : DemoBase(), OnChartValueSelectedListener { R.id.actionToggleValues -> { chart!!.data!!.dataSets.forEach { set -> - set.setDrawValues(!set.isDrawValuesEnabled) + set.setDrawValues(!set.isDrawValues) } chart!!.invalidate() diff --git a/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt index 984911447..1f9550cbb 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt @@ -48,7 +48,6 @@ import com.github.mikephil.charting.interfaces.datasets.IBarDataSet import com.github.mikephil.charting.listener.OnChartValueSelectedListener import com.github.mikephil.charting.utils.MPPointF import info.appdev.chartexample.DataTools.Companion.getValues -import info.appdev.chartexample.DataTools.Companion.setData import info.appdev.chartexample.R import info.appdev.chartexample.notimportant.DemoBaseCompose import timber.log.Timber @@ -380,7 +379,7 @@ class HorizontalBarComposeActivity : DemoBaseCompose() { chart?.let { val sets = it.data?.dataSets ?: return for (iSet in sets) { - iSet.setDrawValues(!iSet.isDrawValuesEnabled) + iSet.setDrawValues(!iSet.isDrawValues) } it.invalidate() } From 7138bc1577474a460698a28606c599f99775b4a9 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Wed, 17 Dec 2025 13:12:23 +0100 Subject: [PATCH 2/3] Use foreach --- .../info/appdev/chartexample/AnotherBarActivity.kt | 5 +++-- .../info/appdev/chartexample/BarChartActivity.kt | 4 ++-- .../chartexample/BarChartActivityMultiDataset.kt | 5 +++-- .../appdev/chartexample/BarChartActivitySinus.kt | 5 +++-- .../info/appdev/chartexample/BubbleChartActivity.kt | 5 +++-- .../appdev/chartexample/CandleStickChartActivity.kt | 5 +++-- .../appdev/chartexample/CombinedChartActivity.kt | 12 ++++++------ .../appdev/chartexample/CubicLineChartActivity.kt | 5 +++-- .../info/appdev/chartexample/DrawChartActivity.kt | 7 ++----- .../chartexample/HorizontalBarChartActivity.kt | 8 ++------ .../appdev/chartexample/InvertedLineChartActivity.kt | 1 - .../appdev/chartexample/LineChartDualAxisActivity.kt | 1 - .../appdev/chartexample/LineChartTimeActivity.kt | 1 - .../appdev/chartexample/MultiLineChartActivity.kt | 1 - .../info/appdev/chartexample/PieChartActivity.kt | 5 +++-- .../appdev/chartexample/PieChartRoundedActivity.kt | 5 +++-- .../appdev/chartexample/PiePolylineChartActivity.kt | 5 +++-- .../info/appdev/chartexample/RadarChartActivity.kt | 5 +++-- .../appdev/chartexample/RealtimeLineChartActivity.kt | 2 +- .../info/appdev/chartexample/ScatterChartActivity.kt | 1 - .../info/appdev/chartexample/ScrollViewActivity.kt | 2 +- .../SpecificPositionsLineChartActivity.kt | 5 ++--- .../info/appdev/chartexample/StackedBarActivity.kt | 2 -- .../chartexample/StackedBarActivityNegative.kt | 1 - .../compose/HorizontalBarComposeActivity.kt | 5 ++--- 25 files changed, 48 insertions(+), 55 deletions(-) diff --git a/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt index 7f2b5b8e5..aa8c83b9b 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt @@ -124,8 +124,9 @@ class AnotherBarActivity : DemoBase(), OnSeekBarChangeListener { } R.id.actionToggleValues -> { - for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValues()) - + chart!!.data!!.dataSets.forEach { set -> + set.setDrawValues(!set.isDrawValues()) + } chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt index 4d53ed7c5..9edac41af 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt @@ -202,9 +202,9 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect } R.id.actionToggleValues -> { - for (set in chart!!.data!!.dataSets) + chart!!.data!!.dataSets.forEach { set -> set.setDrawValues(!set.isDrawValues()) - + } chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt index 9af562469..720c534f6 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt @@ -193,8 +193,9 @@ class BarChartActivityMultiDataset : DemoBase(), OnSeekBarChangeListener, OnChar } R.id.actionToggleValues -> { - for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValues()) - + chart!!.data!!.dataSets.forEach { set -> + set.setDrawValues(!set.isDrawValues()) + } chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt index 798c7dd73..1365320fe 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt @@ -131,8 +131,9 @@ class BarChartActivitySinus : DemoBase(), OnSeekBarChangeListener { } R.id.actionToggleValues -> { - for (set in binding.chart1.data!!.dataSets) set.setDrawValues(!set.isDrawValues()) - + binding.chart1.data!!.dataSets.forEach { set -> + set.setDrawValues(!set.isDrawValues()) + } binding.chart1.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt index 431a7020a..c1ec568a3 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt @@ -167,8 +167,9 @@ class BubbleChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSel } R.id.actionToggleValues -> { - for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValues()) - + chart!!.data!!.dataSets.forEach { set -> + set.setDrawValues(!set.isDrawValues()) + } chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt index e4d9d7ed2..71f3a4530 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt @@ -148,8 +148,9 @@ class CandleStickChartActivity : DemoBase(), OnSeekBarChangeListener { } R.id.actionToggleValues -> { - for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValues()) - + chart!!.data!!.dataSets.forEach { set -> + set.setDrawValues(!set.isDrawValues()) + } chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt index f02df2455..0b7916e61 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt @@ -110,7 +110,7 @@ class CombinedChartActivity : DemoBase() { set.circleRadius = 5f set.setFillColor(Color.rgb(240, 238, 70)) set.lineMode = LineDataSet.Mode.CUBIC_BEZIER - set.setDrawValues(true) + set.isDrawValues = true set.valueTextSize = 10f set.setValueTextColor(Color.rgb(240, 238, 70)) @@ -172,7 +172,7 @@ class CombinedChartActivity : DemoBase() { val set = ScatterDataSet(entries, "Scatter DataSet") set.setColors(*ColorTemplate.MATERIAL_COLORS) set.scatterShapeSize = 7.5f - set.setDrawValues(false) + set.isDrawValues = false set.valueTextSize = 10f d.addDataSet(set) @@ -195,7 +195,7 @@ class CombinedChartActivity : DemoBase() { set.shadowColor = Color.DKGRAY set.setBarSpace(0.3f) set.valueTextSize = 10f - set.setDrawValues(false) + set.isDrawValues = false d.addDataSet(set) return d @@ -217,7 +217,7 @@ class CombinedChartActivity : DemoBase() { set.valueTextSize = 10f set.setValueTextColor(Color.WHITE) set.highlightCircleWidth = 1.5f - set.setDrawValues(true) + set.isDrawValues = true bd.addDataSet(set) return bd @@ -239,7 +239,7 @@ class CombinedChartActivity : DemoBase() { R.id.actionToggleLineValues -> { for (set in chart!!.data!!.dataSets) { - if (set is LineDataSet) set.setDrawValues(!set.isDrawValues) + if (set is LineDataSet) set.isDrawValues = !set.isDrawValues } chart!!.invalidate() @@ -247,7 +247,7 @@ class CombinedChartActivity : DemoBase() { R.id.actionToggleBarValues -> { for (set in chart!!.data!!.dataSets) { - if (set is BarDataSet) set.setDrawValues(!set.isDrawValues) + if (set is BarDataSet) set.isDrawValues = !set.isDrawValues } chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt index 76f2f2a9d..206e38543 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt @@ -154,8 +154,9 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener { } R.id.actionToggleValues -> { - for (set in binding.chart1.data!!.dataSets) set.setDrawValues(!set.isDrawValues) - + binding.chart1.data!!.dataSets.forEach { set -> + set.setDrawValues(!set.isDrawValues()) + } binding.chart1.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/DrawChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/DrawChartActivity.kt index 07f1966da..b72aa9a55 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/DrawChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/DrawChartActivity.kt @@ -79,12 +79,9 @@ class DrawChartActivity : DemoBase(), OnChartValueSelectedListener, OnDrawListen override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { R.id.actionToggleValues -> { - val sets = binding.chart1.data!!.dataSets - - for (set in sets) { - set.setDrawValues(!set.isDrawValues) + binding.chart1.data!!.dataSets.forEach { set -> + set.setDrawValues(!set.isDrawValues()) } - binding.chart1.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt index c75896529..b1852f30b 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt @@ -153,13 +153,9 @@ class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartV } R.id.actionToggleValues -> { - val sets = binding.chart1.data!! - .dataSets - - for (iSet in sets) { - iSet.setDrawValues(!iSet.isDrawValues()) + binding.chart1.data!!.dataSets.forEach { set -> + set.setDrawValues(!set.isDrawValues()) } - binding.chart1.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt index ca57f1d66..d5ac319f5 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt @@ -146,7 +146,6 @@ class InvertedLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa chart!!.data!!.dataSets.forEach { iSet -> iSet.setDrawValues(!iSet.isDrawValues) } - chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt index 86990b10f..c283d62db 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt @@ -229,7 +229,6 @@ class LineChartDualAxisActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa chart!!.data!!.dataSets.forEach { set -> set.setDrawValues(!set.isDrawValues) } - chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt index efa718710..b4f9f3117 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt @@ -167,7 +167,6 @@ class LineChartTimeActivity : DemoBase(), OnSeekBarChangeListener { chart!!.data!!.dataSets.forEach { set -> set.setDrawValues(!set.isDrawValues) } - chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt index 16626510a..55000ecd4 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt @@ -134,7 +134,6 @@ class MultiLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartGestu binding.chart1.data!!.dataSets.forEach { set -> set.setDrawValues(!set.isDrawValues) } - binding.chart1.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt index c50dcb5a6..fd1bce165 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt @@ -177,8 +177,9 @@ class PieChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect } R.id.actionToggleValues -> { - for (set in chart!!.data!!.getDataSets()) set.setDrawValues(!set.isDrawValues()) - + chart!!.data!!.dataSets.forEach { set -> + set.setDrawValues(!set.isDrawValues()) + } chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt index a6afdc4eb..7f01e4e41 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt @@ -182,8 +182,9 @@ class PieChartRoundedActivity : DemoBase(), OnSeekBarChangeListener, OnChartValu } R.id.actionToggleValues -> { - for (set in chart!!.data!!.getDataSets()) set.setDrawValues(!set.isDrawValues()) - + chart!!.data!!.dataSets.forEach { set -> + set.setDrawValues(!set.isDrawValues()) + } chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/PiePolylineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/PiePolylineChartActivity.kt index 05a8202d6..84f3d9682 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/PiePolylineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/PiePolylineChartActivity.kt @@ -171,8 +171,9 @@ class PiePolylineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartVal } R.id.actionToggleValues -> { - for (set in chart!!.data!!.getDataSets()) set.setDrawValues(!set.isDrawValues()) - + chart!!.data!!.dataSets.forEach { set -> + set.setDrawValues(!set.isDrawValues()) + } chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt index ff48fc5eb..b63e6c7e1 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt @@ -156,8 +156,9 @@ class RadarChartActivity : DemoBase() { } R.id.actionToggleValues -> { - for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValues()) - + chart!!.data!!.dataSets.forEach { set -> + set.setDrawValues(!set.isDrawValues()) + } chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/RealtimeLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/RealtimeLineChartActivity.kt index 8fca8faa2..7ecaa1583 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/RealtimeLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/RealtimeLineChartActivity.kt @@ -128,7 +128,7 @@ class RealtimeLineChartActivity : DemoBase(), OnChartValueSelectedListener { set.setHighLightColor(Color.rgb(244, 117, 117)) set.setValueTextColor(Color.WHITE) set.valueTextSize = 9f - set.setDrawValues(false) + set.isDrawValues = false return set } diff --git a/app/src/main/kotlin/info/appdev/chartexample/ScatterChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/ScatterChartActivity.kt index 178739cc4..9fdb34292 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/ScatterChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/ScatterChartActivity.kt @@ -153,7 +153,6 @@ class ScatterChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSe chart!!.data!!.dataSets.forEach { set -> set.setDrawValues(!set.isDrawValues) } - chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/ScrollViewActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/ScrollViewActivity.kt index ddbcd2d7d..dc0380ac3 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/ScrollViewActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/ScrollViewActivity.kt @@ -54,7 +54,7 @@ class ScrollViewActivity : DemoBase() { val set = BarDataSet(values, "Data Set") set.setColors(*ColorTemplate.VORDIPLOM_COLORS) - set.setDrawValues(false) + set.isDrawValues = false val data = BarData(set) diff --git a/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt index a2dbda999..a4abe359a 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt @@ -138,9 +138,8 @@ class SpecificPositionsLineChartActivity : DemoBase(), OnSeekBarChangeListener, override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { R.id.actionToggleValues -> { - mChart!!.data?.dataSets?.forEach { - val set = it as LineDataSet - set.setDrawValues(!set.isDrawValues) + mChart!!.data!!.dataSets.forEach { set -> + set.setDrawValues(!set.isDrawValues()) } mChart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt index 8633c4d62..1f630cb77 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt @@ -163,7 +163,6 @@ class StackedBarActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSele chart!!.data!!.dataSets.forEach { set -> set.setDrawValues(!set.isDrawValues) } - chart!!.invalidate() } @@ -171,7 +170,6 @@ class StackedBarActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSele chart!!.data!!.dataSets.forEach { set -> set.setDrawIcons(!set.isDrawIconsEnabled) } - chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt index b0349554b..ae24346b2 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt @@ -131,7 +131,6 @@ class StackedBarActivityNegative : DemoBase(), OnChartValueSelectedListener { chart!!.data!!.dataSets.forEach { set -> set.setDrawValues(!set.isDrawValues) } - chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt index 1f9550cbb..16adca45b 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt @@ -377,9 +377,8 @@ class HorizontalBarComposeActivity : DemoBaseCompose() { private fun toggleValues() { chart?.let { - val sets = it.data?.dataSets ?: return - for (iSet in sets) { - iSet.setDrawValues(!iSet.isDrawValues) + chart!!.data!!.dataSets.forEach { set -> + set.setDrawValues(!set.isDrawValues()) } it.invalidate() } From 23cfac97f8f34f7d02a73765b869025ba59c042e Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Wed, 17 Dec 2025 13:17:56 +0100 Subject: [PATCH 3/3] Interface change isDrawIcons --- .../java/com/github/mikephil/charting/data/BaseDataSet.kt | 2 +- .../mikephil/charting/interfaces/datasets/IDataSet.java | 2 +- .../github/mikephil/charting/renderer/BarChartRenderer.kt | 6 +++--- .../charting/renderer/BarLineScatterCandleBubbleRenderer.kt | 2 +- .../mikephil/charting/renderer/BubbleChartRenderer.kt | 2 +- .../mikephil/charting/renderer/CandleStickChartRenderer.kt | 2 +- .../charting/renderer/HorizontalBarChartRenderer.kt | 6 +++--- .../github/mikephil/charting/renderer/LineChartRenderer.kt | 2 +- .../github/mikephil/charting/renderer/PieChartRenderer.kt | 2 +- .../github/mikephil/charting/renderer/RadarChartRenderer.kt | 2 +- .../mikephil/charting/renderer/ScatterChartRenderer.kt | 2 +- .../kotlin/info/appdev/chartexample/BarChartActivity.kt | 2 +- .../kotlin/info/appdev/chartexample/BubbleChartActivity.kt | 2 +- .../info/appdev/chartexample/CandleStickChartActivity.kt | 2 +- .../info/appdev/chartexample/HorizontalBarChartActivity.kt | 2 +- .../chartexample/HorizontalBarNegativeChartActivity.kt | 2 +- .../kotlin/info/appdev/chartexample/LineChartActivity.kt | 2 +- .../kotlin/info/appdev/chartexample/PieChartActivity.kt | 2 +- .../info/appdev/chartexample/PieChartRoundedActivity.kt | 2 +- .../kotlin/info/appdev/chartexample/StackedBarActivity.kt | 2 +- .../info/appdev/chartexample/StackedBarActivityNegative.kt | 2 +- .../chartexample/compose/HorizontalBarComposeActivity.kt | 2 +- 22 files changed, 26 insertions(+), 26 deletions(-) diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt index 72193a4dc..b40048cd3 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt @@ -327,7 +327,7 @@ abstract class BaseDataSet() : IDataSet { mDrawIcons = enabled } - override fun isDrawIconsEnabled(): Boolean { + override fun isDrawIcons(): Boolean { return mDrawIcons } diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IDataSet.java b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IDataSet.java index 482d92162..748afea41 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IDataSet.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IDataSet.java @@ -342,7 +342,7 @@ public interface IDataSet { /** * Returns true if y-icon drawing is enabled, false if not */ - boolean isDrawIconsEnabled(); + boolean isDrawIcons(); /** * Offset of icons drawn on the chart. diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt index 9e063fb4d..3a6e9db9d 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt @@ -322,7 +322,7 @@ open class BarChartRenderer( ) } - if (entry.icon != null && dataSet.isDrawIconsEnabled) { + if (entry.icon != null && dataSet.isDrawIcons) { val icon = entry.icon var px = x @@ -381,7 +381,7 @@ open class BarChartRenderer( ) } - if (entry.icon != null && dataSet.isDrawIconsEnabled) { + if (entry.icon != null && dataSet.isDrawIcons) { val icon = entry.icon var px = x @@ -467,7 +467,7 @@ open class BarChartRenderer( ) } - if (entry.icon != null && dataSet.isDrawIconsEnabled) { + if (entry.icon != null && dataSet.isDrawIcons) { val icon = entry.icon icon?.let { diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarLineScatterCandleBubbleRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarLineScatterCandleBubbleRenderer.kt index 5da78a6cb..6ba1846c1 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarLineScatterCandleBubbleRenderer.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarLineScatterCandleBubbleRenderer.kt @@ -20,7 +20,7 @@ abstract class BarLineScatterCandleBubbleRenderer(animator: ChartAnimator, viewP * Returns true if the DataSet values should be drawn, false if not. */ protected fun shouldDrawValues(set: IDataSet<*>): Boolean { - return set.isVisible() && (set.isDrawValues() || set.isDrawIconsEnabled()) + return set.isVisible() && (set.isDrawValues() || set.isDrawIcons()) } /** diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt index 7cc50a88c..cba3558e7 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt @@ -153,7 +153,7 @@ open class BubbleChartRenderer( ) } - if (entry.icon != null && dataSet.isDrawIconsEnabled) { + if (entry.icon != null && dataSet.isDrawIcons) { val icon = entry.icon icon?.let { diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CandleStickChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CandleStickChartRenderer.kt index fc6e3ddb6..a55cac95f 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CandleStickChartRenderer.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CandleStickChartRenderer.kt @@ -264,7 +264,7 @@ open class CandleStickChartRenderer( ) } - if (entry.icon != null && dataSet.isDrawIconsEnabled) { + if (entry.icon != null && dataSet.isDrawIcons) { val icon = entry.icon icon?.let { diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt index 7764a5fe7..2ccd4fab5 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt @@ -244,7 +244,7 @@ open class HorizontalBarChartRenderer( ) } - if (entry.icon != null && dataSet.isDrawIconsEnabled) { + if (entry.icon != null && dataSet.isDrawIcons) { val icon = entry.icon var px = buffer.buffer[j + 2] + (if (`val` >= 0) posOffset else negOffset) @@ -319,7 +319,7 @@ open class HorizontalBarChartRenderer( ) } - if (entry.icon != null && dataSet.isDrawIconsEnabled) { + if (entry.icon != null && dataSet.isDrawIcons) { val icon = entry.icon var px = (buffer.buffer[bufferIndex + 2] @@ -414,7 +414,7 @@ open class HorizontalBarChartRenderer( drawValue(canvas, formattedValue!!, x, y + halfTextHeight, color) } - if (entry.icon != null && dataSet.isDrawIconsEnabled) { + if (entry.icon != null && dataSet.isDrawIcons) { val icon = entry.icon icon?.let { diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt index 61849310f..df08462c9 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt @@ -539,7 +539,7 @@ open class LineChartRenderer( ) } - if (entry.icon != null && dataSet.isDrawIconsEnabled) { + if (entry.icon != null && dataSet.isDrawIcons) { val icon = entry.icon icon?.let { diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.kt index fffe32a96..b04389ad1 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.kt @@ -586,7 +586,7 @@ open class PieChartRenderer( } } - if (entry.icon != null && dataSet.isDrawIconsEnabled) { + if (entry.icon != null && dataSet.isDrawIcons) { val icon = entry.icon val x = (labelRadius + iconsOffset.y) * sliceXBase + center.x diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt index 6493421c3..e6196aa1c 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt @@ -169,7 +169,7 @@ open class RadarChartRenderer( ) } - if (entry.icon != null && dataSet.isDrawIconsEnabled) { + if (entry.icon != null && dataSet.isDrawIcons) { val icon = entry.icon Utils.getPosition( diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.kt index ecd4f0147..62f3f2bcc 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.kt @@ -129,7 +129,7 @@ open class ScatterChartRenderer(@JvmField var dataProvider: ScatterDataProvider, ) } - if (entry.icon != null && dataSet.isDrawIconsEnabled) { + if (entry.icon != null && dataSet.isDrawIcons) { val icon = entry.icon icon?.let { diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt index 9edac41af..d5f77a0c1 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt @@ -210,7 +210,7 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect R.id.actionToggleIcons -> { for (set in chart!!.data!!.dataSets) - set.setDrawIcons(!set.isDrawIconsEnabled()) + set.setDrawIcons(!set.isDrawIcons()) chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt index c1ec568a3..fc738ce75 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt @@ -174,7 +174,7 @@ class BubbleChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSel } R.id.actionToggleIcons -> { - for (set in chart!!.data!!.dataSets) set.setDrawIcons(!set.isDrawIconsEnabled()) + for (set in chart!!.data!!.dataSets) set.setDrawIcons(!set.isDrawIcons()) chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt index 71f3a4530..ab223c24c 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt @@ -155,7 +155,7 @@ class CandleStickChartActivity : DemoBase(), OnSeekBarChangeListener { } R.id.actionToggleIcons -> { - for (set in chart!!.data!!.dataSets) set.setDrawIcons(!set.isDrawIconsEnabled()) + for (set in chart!!.data!!.dataSets) set.setDrawIcons(!set.isDrawIcons()) chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt index b1852f30b..25a8e6ea6 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt @@ -164,7 +164,7 @@ class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartV .dataSets for (iSet in sets) { - iSet.setDrawIcons(!iSet.isDrawIconsEnabled()) + iSet.setDrawIcons(!iSet.isDrawIcons()) } binding.chart1.invalidate() diff --git a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt index 22b7b1eef..f7a911c1d 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt @@ -169,7 +169,7 @@ class HorizontalBarNegativeChartActivity : DemoBase(), OnSeekBarChangeListener, R.id.actionToggleIcons -> { chart!!.data!!.dataSets.forEach { iSet -> - iSet.setDrawIcons(!iSet.isDrawIconsEnabled()) + iSet.setDrawIcons(!iSet.isDrawIcons()) } chart!!.invalidate() diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt index 415e1589d..12696e307 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt @@ -162,7 +162,7 @@ class LineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelec R.id.actionToggleIcons -> { binding.chart1.data?.dataSets?.forEach { set -> - set.setDrawIcons(!set.isDrawIconsEnabled) + set.setDrawIcons(!set.isDrawIcons) binding.chart1.invalidate() } } diff --git a/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt index fd1bce165..5daa7a6f1 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt @@ -184,7 +184,7 @@ class PieChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect } R.id.actionToggleIcons -> { - for (set in chart!!.data!!.getDataSets()) set.setDrawIcons(!set.isDrawIconsEnabled()) + for (set in chart!!.data!!.getDataSets()) set.setDrawIcons(!set.isDrawIcons()) chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt index 7f01e4e41..1ac4fb936 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt @@ -189,7 +189,7 @@ class PieChartRoundedActivity : DemoBase(), OnSeekBarChangeListener, OnChartValu } R.id.actionToggleIcons -> { - for (set in chart!!.data!!.getDataSets()) set.setDrawIcons(!set.isDrawIconsEnabled()) + for (set in chart!!.data!!.getDataSets()) set.setDrawIcons(!set.isDrawIcons()) chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt index 1f630cb77..d7a26de15 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt @@ -168,7 +168,7 @@ class StackedBarActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSele R.id.actionToggleIcons -> { chart!!.data!!.dataSets.forEach { set -> - set.setDrawIcons(!set.isDrawIconsEnabled) + set.setDrawIcons(!set.isDrawIcons) } chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt index ae24346b2..0abce05f3 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt @@ -136,7 +136,7 @@ class StackedBarActivityNegative : DemoBase(), OnChartValueSelectedListener { R.id.actionToggleIcons -> { chart!!.data!!.dataSets.forEach { set -> - set.setDrawIcons(!set.isDrawIconsEnabled) + set.setDrawIcons(!set.isDrawIcons) } chart!!.invalidate() diff --git a/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt index 16adca45b..8630a41b7 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt @@ -388,7 +388,7 @@ class HorizontalBarComposeActivity : DemoBaseCompose() { chart?.let { val sets = it.data?.dataSets ?: return for (iSet in sets) { - iSet.setDrawIcons(!iSet.isDrawIconsEnabled) + iSet.setDrawIcons(!iSet.isDrawIcons) } it.invalidate() }