From 82b14481ebcdf2c7ad95ebfe9a993a4875aee38a Mon Sep 17 00:00:00 2001 From: Venkat Bhoogarbh <249282841+venkatbhoogarbh@users.noreply.github.com> Date: Tue, 23 Jun 2026 14:34:43 +0530 Subject: [PATCH] Replaced collection forEach loops with for-in loops across project --- .../appdev/chartexample/AnotherBarActivity.kt | 19 ++++-- .../appdev/chartexample/BarChartActivity.kt | 19 ++++-- .../BarChartActivityMultiDataset.kt | 13 ++-- .../chartexample/BarChartActivitySinus.kt | 13 ++-- .../chartexample/BubbleChartActivity.kt | 12 ++-- .../chartexample/CandleStickChartActivity.kt | 18 +++-- .../chartexample/CombinedChartActivity.kt | 16 +++-- .../chartexample/CubicLineChartActivity.kt | 64 ++++++++++-------- .../appdev/chartexample/DrawChartActivity.kt | 6 +- .../HorizontalBarChartActivity.kt | 19 ++++-- .../HorizontalBarNegativeChartActivity.kt | 19 ++++-- .../chartexample/InvertedLineChartActivity.kt | 18 +++-- .../appdev/chartexample/LineChartActivity.kt | 66 ++++++++++++------- .../chartexample/LineChartDualAxisActivity.kt | 54 +++++++++------ .../chartexample/LineChartTimeActivity.kt | 42 +++++++----- .../chartexample/MultiLineChartActivity.kt | 62 ++++++++++------- .../appdev/chartexample/PieChartActivity.kt | 12 ++-- .../chartexample/PieChartRoundedActivity.kt | 12 ++-- .../chartexample/PiePolylineChartActivity.kt | 6 +- .../appdev/chartexample/RadarChartActivity.kt | 18 +++-- .../chartexample/ScatterChartActivity.kt | 6 +- .../SpecificPositionsLineChartActivity.kt | 46 ++++++++----- .../appdev/chartexample/StackedBarActivity.kt | 19 ++++-- .../StackedBarActivityNegative.kt | 19 ++++-- .../compose/HorizontalBarComposeActivity.kt | 6 +- .../charting/renderer/LineChartRenderer.kt | 8 ++- .../charting/renderer/RadarChartRenderer.kt | 8 ++- 27 files changed, 396 insertions(+), 224 deletions(-) diff --git a/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt index 5db7c77a8..85782aa28 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt @@ -111,8 +111,10 @@ class AnotherBarActivity : DemoBase(), OnSeekBarChangeListener { } R.id.actionToggleValues -> { - binding.chart1.barData?.dataSets?.forEach { - it.isDrawValues = !it.isDrawValues + binding.chart1.barData?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawValues = !set.isDrawValues + } } binding.chart1.invalidate() } @@ -135,11 +137,14 @@ class AnotherBarActivity : DemoBase(), OnSeekBarChangeListener { } R.id.actionToggleBarBorders -> { - binding.chart1.barData?.dataSets?.map { it as BarDataSet }?.forEach { set -> - set.barBorderWidth = if (set.barBorderWidth == 1f) - 0f - else - 1f + binding.chart1.barData?.dataSets?.let { dataSets -> + for (iSet in dataSets) { + val set = iSet as BarDataSet + set.barBorderWidth = if (set.barBorderWidth == 1f) + 0f + else + 1f + } } binding.chart1.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt index 6cada4ec2..e9704d6f3 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt @@ -197,15 +197,19 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect } R.id.actionToggleValues -> { - binding.chart1.barData?.dataSets?.forEach { - it.isDrawValues = !it.isDrawValues + binding.chart1.barData?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawValues = !set.isDrawValues + } } binding.chart1.invalidate() } R.id.actionToggleIcons -> { - binding.chart1.barData?.dataSets?.forEach { set -> - set.isDrawIcons = !set.isDrawIcons + binding.chart1.barData?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawIcons = !set.isDrawIcons + } } binding.chart1.invalidate() } @@ -228,8 +232,11 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect } R.id.actionToggleBarBorders -> { - binding.chart1.barData?.dataSets?.map { it as BarDataSet }?.forEach { set -> - set.barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f + binding.chart1.barData?.dataSets?.let { dataSets -> + for (iSet in dataSets) { + val set = iSet as BarDataSet + set.barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f + } } binding.chart1.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt index eba9e3c41..fc679c16f 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt @@ -186,8 +186,10 @@ class BarChartActivityMultiDataset : DemoBase(), OnSeekBarChangeListener, OnChar } R.id.actionToggleValues -> { - binding.chart1.barData?.dataSets?.forEach { - it.isDrawValues = !it.isDrawValues + binding.chart1.barData?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawValues = !set.isDrawValues + } } binding.chart1.invalidate() } @@ -203,8 +205,11 @@ class BarChartActivityMultiDataset : DemoBase(), OnSeekBarChangeListener, OnChar } R.id.actionToggleBarBorders -> { - binding.chart1.barData?.dataSets?.map { it as BarDataSet }?.forEach { set -> - set.barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f + binding.chart1.barData?.dataSets?.let { dataSets -> + for (iSet in dataSets) { + val set = iSet as BarDataSet + set.barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f + } } binding.chart1.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt index ee11fa0db..113f287d9 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt @@ -130,8 +130,10 @@ class BarChartActivitySinus : DemoBase(), OnSeekBarChangeListener { } R.id.actionToggleValues -> { - binding.chart1.barData?.dataSets?.forEach { - it.isDrawValues = !it.isDrawValues + binding.chart1.barData?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawValues = !set.isDrawValues + } } binding.chart1.invalidate() } @@ -154,8 +156,11 @@ class BarChartActivitySinus : DemoBase(), OnSeekBarChangeListener { } R.id.actionToggleBarBorders -> { - binding.chart1.barData?.dataSets?.map { it as BarDataSet }?.forEach { set -> - set.barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f + binding.chart1.barData?.dataSets?.let { dataSets -> + for (iSet in dataSets) { + val set = iSet as BarDataSet + set.barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f + } } 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 8b8e147d0..9f63bd6a3 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt @@ -155,15 +155,19 @@ class BubbleChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSel } R.id.actionToggleValues -> { - binding.chart1.bubbleData?.dataSets?.forEach { - it.isDrawValues = !it.isDrawValues + binding.chart1.bubbleData?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawValues = !set.isDrawValues + } } binding.chart1.invalidate() } R.id.actionToggleIcons -> { - binding.chart1.bubbleData?.dataSets?.forEach { set -> - set.isDrawIcons = !set.isDrawIcons + binding.chart1.bubbleData?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawIcons = !set.isDrawIcons + } } binding.chart1.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt index 7ce3b5f41..04760f6a6 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt @@ -135,15 +135,19 @@ class CandleStickChartActivity : DemoBase(), OnSeekBarChangeListener { } R.id.actionToggleValues -> { - binding.chart1.candleData?.dataSets?.forEach { - it.isDrawValues = !it.isDrawValues + binding.chart1.candleData?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawValues = !set.isDrawValues + } } binding.chart1.invalidate() } R.id.actionToggleIcons -> { - binding.chart1.candleData?.dataSets?.forEach { set -> - set.isDrawIcons = !set.isDrawIcons + binding.chart1.candleData?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawIcons = !set.isDrawIcons + } } binding.chart1.invalidate() } @@ -166,8 +170,10 @@ class CandleStickChartActivity : DemoBase(), OnSeekBarChangeListener { } R.id.actionToggleMakeShadowSameColorAsCandle -> { - binding.chart1.candleData?.dataSets?.forEach { set -> - (set as CandleDataSet).shadowColorSameAsCandle = !set.shadowColorSameAsCandle + binding.chart1.candleData?.dataSets?.let { dataSets -> + for (set in dataSets) { + (set as CandleDataSet).shadowColorSameAsCandle = !set.shadowColorSameAsCandle + } } binding.chart1.invalidate() diff --git a/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt index f51629fb6..6326cce32 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt @@ -239,17 +239,21 @@ class CombinedChartActivity : DemoBase() { } R.id.actionToggleLineValues -> { - binding.chart1.lineData?.dataSets?.forEach { - if (it is LineDataSet) - it.isDrawValues = !it.isDrawValues + binding.chart1.lineData?.dataSets?.let { dataSets -> + for (it in dataSets) { + if (it is LineDataSet) + it.isDrawValues = !it.isDrawValues + } } binding.chart1.invalidate() } R.id.actionToggleBarValues -> { - binding.chart1.barData?.dataSets?.forEach { - if (it is BarDataSet) - it.isDrawValues = !it.isDrawValues + binding.chart1.barData?.dataSets?.let { dataSets -> + for (it in dataSets) { + if (it is BarDataSet) + it.isDrawValues = !it.isDrawValues + } } binding.chart1.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt index 73642a52f..d67111a48 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt @@ -145,8 +145,10 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener { } R.id.actionToggleValues -> { - binding.chart1.lineData.dataSets.forEach { - it.isDrawValues = !it.isDrawValues + binding.chart1.lineData.dataSets.let { dataSets -> + for (it in dataSets) { + it.isDrawValues = !it.isDrawValues + } } binding.chart1.invalidate() } @@ -159,50 +161,60 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener { } R.id.actionToggleFilled -> { - binding.chart1.lineData.dataSets.forEach { - val set = it as LineDataSet - set.isDrawFilled = !set.isDrawFilled + binding.chart1.lineData.dataSets.let { dataSets -> + for (it in dataSets) { + val set = it as LineDataSet + set.isDrawFilled = !set.isDrawFilled + } } binding.chart1.invalidate() } R.id.actionToggleCircles -> { - binding.chart1.lineData.dataSets.forEach { - val set = it as LineDataSet - set.isDrawCircles = !set.isDrawCircles + binding.chart1.lineData.dataSets.let { dataSets -> + for (it in dataSets) { + val set = it as LineDataSet + set.isDrawCircles = !set.isDrawCircles + } } binding.chart1.invalidate() } R.id.actionToggleCubic -> { - binding.chart1.lineData.dataSets.forEach { - val set = it as LineDataSet - set.lineMode = if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER) - LineDataSet.Mode.LINEAR - else - LineDataSet.Mode.CUBIC_BEZIER + binding.chart1.lineData.dataSets.let { dataSets -> + for (it in dataSets) { + val set = it as LineDataSet + set.lineMode = if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER) + LineDataSet.Mode.LINEAR + else + LineDataSet.Mode.CUBIC_BEZIER + } } binding.chart1.invalidate() } R.id.actionToggleStepped -> { - binding.chart1.lineData.dataSets.forEach { - val set = it as LineDataSet - set.lineMode = if (set.lineMode == LineDataSet.Mode.STEPPED) - LineDataSet.Mode.LINEAR - else - LineDataSet.Mode.STEPPED + binding.chart1.lineData.dataSets.let { dataSets -> + for (it in dataSets) { + val set = it as LineDataSet + set.lineMode = if (set.lineMode == LineDataSet.Mode.STEPPED) + LineDataSet.Mode.LINEAR + else + LineDataSet.Mode.STEPPED + } } binding.chart1.invalidate() } R.id.actionToggleHorizontalCubic -> { - binding.chart1.lineData.dataSets.forEach { - val set = it as LineDataSet - set.lineMode = if (set.lineMode == LineDataSet.Mode.HORIZONTAL_BEZIER) - LineDataSet.Mode.LINEAR - else - LineDataSet.Mode.HORIZONTAL_BEZIER + binding.chart1.lineData.dataSets.let { dataSets -> + for (it in dataSets) { + val set = it as LineDataSet + set.lineMode = if (set.lineMode == LineDataSet.Mode.HORIZONTAL_BEZIER) + LineDataSet.Mode.LINEAR + else + LineDataSet.Mode.HORIZONTAL_BEZIER + } } 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 826c3c09b..6ebd2bb90 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/DrawChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/DrawChartActivity.kt @@ -78,8 +78,10 @@ class DrawChartActivity : DemoBase(), OnChartValueSelectedListener, OnDrawListen override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { R.id.actionToggleValues -> { - binding.chart1.data?.dataSets?.forEach { - it.isDrawValues = !it.isDrawValues + binding.chart1.data?.dataSets?.let { dataSets -> + for (it in dataSets) { + it.isDrawValues = !it.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 9340c22ee..5de649c50 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt @@ -157,15 +157,19 @@ class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartV } R.id.actionToggleValues -> { - binding.chart1.barData?.dataSets?.forEach { - it.isDrawValues = !it.isDrawValues + binding.chart1.barData?.dataSets?.let { dataSets -> + for (it in dataSets) { + it.isDrawValues = !it.isDrawValues + } } binding.chart1.invalidate() } R.id.actionToggleIcons -> { - binding.chart1.barData?.dataSets?.forEach { set -> - set.isDrawIcons = !set.isDrawIcons + binding.chart1.barData?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawIcons = !set.isDrawIcons + } } binding.chart1.invalidate() } @@ -188,8 +192,11 @@ class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartV } R.id.actionToggleBarBorders -> { - binding.chart1.barData?.dataSets?.map { it as BarDataSet }?.forEach { set -> - set.barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f + binding.chart1.barData?.dataSets?.let { dataSets -> + for (iSet in dataSets) { + val set = iSet as BarDataSet + set.barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f + } } 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 af349ac06..efca17f24 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt @@ -150,15 +150,19 @@ class HorizontalBarNegativeChartActivity : DemoBase(), OnSeekBarChangeListener, } R.id.actionToggleValues -> { - binding.chart1.barData?.dataSets?.forEach { - it.isDrawValues = !it.isDrawValues + binding.chart1.barData?.dataSets?.let { dataSets -> + for (it in dataSets) { + it.isDrawValues = !it.isDrawValues + } } binding.chart1.invalidate() } R.id.actionToggleIcons -> { - binding.chart1.barData?.dataSets?.forEach { set -> - set.isDrawIcons = !set.isDrawIcons + binding.chart1.barData?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawIcons = !set.isDrawIcons + } } binding.chart1.invalidate() } @@ -181,8 +185,11 @@ class HorizontalBarNegativeChartActivity : DemoBase(), OnSeekBarChangeListener, } R.id.actionToggleBarBorders -> { - binding.chart1.barData?.dataSets?.map { it as BarDataSet }?.forEach { set -> - set.barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f + binding.chart1.barData?.dataSets?.let { dataSets -> + for (iSet in dataSets) { + val set = iSet as BarDataSet + set.barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f + } } 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 f01ead6ee..67fcf5038 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt @@ -132,8 +132,10 @@ class InvertedLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa } R.id.actionToggleValues -> { - binding.chart1.lineData.dataSets.forEach { - it.isDrawValues = !it.isDrawValues + binding.chart1.lineData.dataSets.let { dataSets -> + for (it in dataSets) { + it.isDrawValues = !it.isDrawValues + } } binding.chart1.invalidate() } @@ -146,15 +148,19 @@ class InvertedLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa } R.id.actionToggleFilled -> { - binding.chart1.data?.dataSets?.forEach { set -> - set.isDrawFilled = !set.isDrawFilled + binding.chart1.data?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawFilled = !set.isDrawFilled + } } binding.chart1.invalidate() } R.id.actionToggleCircles -> { - binding.chart1.data?.dataSets?.forEach { set -> - set.isDrawCircles = !set.isDrawCircles + binding.chart1.data?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawCircles = !set.isDrawCircles + } } 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 index ea61629c7..1166609c7 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt @@ -153,15 +153,19 @@ class LineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelec } R.id.actionToggleValues -> { - binding.chart1.lineData.dataSets.forEach { set -> - set.isDrawValues = !set.isDrawValues + binding.chart1.lineData.dataSets.let { dataSets -> + for (set in dataSets) { + set.isDrawValues = !set.isDrawValues + } } binding.chart1.invalidate() } R.id.actionToggleIcons -> { - binding.chart1.data?.dataSets?.forEach { set -> - set.isDrawIcons = !set.isDrawIcons + binding.chart1.data?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawIcons = !set.isDrawIcons + } } binding.chart1.invalidate() } @@ -174,45 +178,59 @@ class LineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelec } R.id.actionToggleFilled -> { - binding.chart1.data?.dataSets?.forEach { set -> - set.isDrawFilled = !set.isDrawFilled - binding.chart1.invalidate() + binding.chart1.data?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawFilled = !set.isDrawFilled + } } + binding.chart1.invalidate() } R.id.actionToggleCircles -> { - binding.chart1.data?.dataSets?.map { it as LineDataSet<*> }?.forEach { set -> - set.isDrawCircles = !set.isDrawCircles + binding.chart1.data?.dataSets?.let { dataSets -> + for (iSet in dataSets) { + val set = iSet as LineDataSet<*> + set.isDrawCircles = !set.isDrawCircles + } } binding.chart1.invalidate() } R.id.actionToggleCubic -> { - binding.chart1.data?.dataSets?.map { it as LineDataSet<*> }?.forEach { set -> - set.lineMode = if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER) - LineDataSet.Mode.LINEAR - else - LineDataSet.Mode.CUBIC_BEZIER + binding.chart1.data?.dataSets?.let { dataSets -> + for (iSet in dataSets) { + val set = iSet as LineDataSet<*> + set.lineMode = if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER) + LineDataSet.Mode.LINEAR + else + LineDataSet.Mode.CUBIC_BEZIER + } } binding.chart1.invalidate() } R.id.actionToggleStepped -> { - binding.chart1.data?.dataSets?.map { it as LineDataSet<*> }?.forEach { set -> - set.lineMode = if (set.lineMode == LineDataSet.Mode.STEPPED) - LineDataSet.Mode.LINEAR - else - LineDataSet.Mode.STEPPED + binding.chart1.data?.dataSets?.let { dataSets -> + for (iSet in dataSets) { + val set = iSet as LineDataSet<*> + set.lineMode = if (set.lineMode == LineDataSet.Mode.STEPPED) + LineDataSet.Mode.LINEAR + else + LineDataSet.Mode.STEPPED + } } binding.chart1.invalidate() } R.id.actionToggleHorizontalCubic -> { - binding.chart1.data?.dataSets?.map { it as LineDataSet<*> }?.forEach { set -> - set.lineMode = if (set.lineMode == LineDataSet.Mode.HORIZONTAL_BEZIER) - LineDataSet.Mode.LINEAR - else - LineDataSet.Mode.HORIZONTAL_BEZIER + binding.chart1.data?.dataSets?.let { dataSets -> + for (iSet in dataSets) { + val set = iSet as LineDataSet<*> + set.lineMode = if (set.lineMode == LineDataSet.Mode.HORIZONTAL_BEZIER) + LineDataSet.Mode.LINEAR + else + LineDataSet.Mode.HORIZONTAL_BEZIER + } } 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 99559b132..e4487b34b 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt @@ -211,8 +211,10 @@ class LineChartDualAxisActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa } R.id.actionToggleValues -> { - binding.chart1.data?.dataSets?.forEach { set -> - set.isDrawValues = !set.isDrawValues + binding.chart1.data?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawValues = !set.isDrawValues + } } binding.chart1.invalidate() } @@ -225,45 +227,55 @@ class LineChartDualAxisActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa } R.id.actionToggleFilled -> { - binding.chart1.data?.dataSets?.forEach { set -> - set.isDrawFilled = !set.isDrawFilled + binding.chart1.data?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawFilled = !set.isDrawFilled + } } binding.chart1.invalidate() } R.id.actionToggleCircles -> { - binding.chart1.data?.dataSets?.forEach { set -> - set.isDrawCircles = !set.isDrawCircles + binding.chart1.data?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawCircles = !set.isDrawCircles + } } binding.chart1.invalidate() } R.id.actionToggleCubic -> { - binding.chart1.data?.dataSets?.forEach { set -> - set.lineMode = if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER) - LineDataSet.Mode.LINEAR - else - LineDataSet.Mode.CUBIC_BEZIER + binding.chart1.data?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.lineMode = if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER) + LineDataSet.Mode.LINEAR + else + LineDataSet.Mode.CUBIC_BEZIER + } } binding.chart1.invalidate() } R.id.actionToggleStepped -> { - binding.chart1.data?.dataSets?.forEach { set -> - set.lineMode = if (set.lineMode == LineDataSet.Mode.STEPPED) - LineDataSet.Mode.LINEAR - else - LineDataSet.Mode.STEPPED + binding.chart1.data?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.lineMode = if (set.lineMode == LineDataSet.Mode.STEPPED) + LineDataSet.Mode.LINEAR + else + LineDataSet.Mode.STEPPED + } } binding.chart1.invalidate() } R.id.actionToggleHorizontalCubic -> { - binding.chart1.data?.dataSets?.forEach { set -> - set.lineMode = if (set.lineMode == LineDataSet.Mode.HORIZONTAL_BEZIER) - LineDataSet.Mode.LINEAR - else - LineDataSet.Mode.HORIZONTAL_BEZIER + binding.chart1.data?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.lineMode = if (set.lineMode == LineDataSet.Mode.HORIZONTAL_BEZIER) + LineDataSet.Mode.LINEAR + else + LineDataSet.Mode.HORIZONTAL_BEZIER + } } 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 index 78738de1b..1b2450a0a 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt @@ -159,8 +159,10 @@ class LineChartTimeActivity : DemoBase(), OnSeekBarChangeListener { } R.id.actionToggleValues -> { - binding.chart1.lineData.dataSets.forEach { - it.isDrawValues = !it.isDrawValues + binding.chart1.lineData.dataSets.let { dataSets -> + for (it in dataSets) { + it.isDrawValues = !it.isDrawValues + } } binding.chart1.invalidate() } @@ -173,35 +175,43 @@ class LineChartTimeActivity : DemoBase(), OnSeekBarChangeListener { } R.id.actionToggleFilled -> { - binding.chart1.data?.dataSets?.forEach { set -> - set.isDrawFilled = !set.isDrawFilled + binding.chart1.data?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawFilled = !set.isDrawFilled + } } binding.chart1.invalidate() } R.id.actionToggleCircles -> { - binding.chart1.data?.dataSets?.forEach { set -> - set.isDrawCircles = !set.isDrawCircles + binding.chart1.data?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawCircles = !set.isDrawCircles + } } binding.chart1.invalidate() } R.id.actionToggleCubic -> { - binding.chart1.data?.dataSets?.forEach { set -> - if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER) - set.lineMode = LineDataSet.Mode.LINEAR - else - set.lineMode = LineDataSet.Mode.CUBIC_BEZIER + binding.chart1.data?.dataSets?.let { dataSets -> + for (set in dataSets) { + if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER) + set.lineMode = LineDataSet.Mode.LINEAR + else + set.lineMode = LineDataSet.Mode.CUBIC_BEZIER + } } binding.chart1.invalidate() } R.id.actionToggleStepped -> { - binding.chart1.data?.dataSets?.forEach { set -> - if (set.lineMode == LineDataSet.Mode.STEPPED) - set.lineMode = LineDataSet.Mode.LINEAR - else - set.lineMode = LineDataSet.Mode.STEPPED + binding.chart1.data?.dataSets?.let { dataSets -> + for (set in dataSets) { + if (set.lineMode == LineDataSet.Mode.STEPPED) + set.lineMode = LineDataSet.Mode.LINEAR + else + set.lineMode = LineDataSet.Mode.STEPPED + } } 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 index 3a45531cb..1715bcec7 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt @@ -134,8 +134,10 @@ class MultiLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartGestu } R.id.actionToggleValues -> { - binding.chart1.lineData.dataSets.forEach { set -> - set.isDrawValues = !set.isDrawValues + binding.chart1.lineData.dataSets.let { dataSets -> + for (set in dataSets) { + set.isDrawValues = !set.isDrawValues + } } binding.chart1.invalidate() } @@ -158,50 +160,60 @@ class MultiLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartGestu } R.id.actionToggleFilled -> { - binding.chart1.data?.dataSets?.forEach { set -> - set.isDrawFilled = !set.isDrawFilled + binding.chart1.data?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawFilled = !set.isDrawFilled + } } binding.chart1.invalidate() } R.id.actionToggleCircles -> { - binding.chart1.data?.dataSets?.forEach { set -> - if (set is LineDataSet) { - set.isDrawCircles = !set.isDrawCircles + binding.chart1.data?.dataSets?.let { dataSets -> + for (set in dataSets) { + if (set is LineDataSet) { + set.isDrawCircles = !set.isDrawCircles + } } } binding.chart1.invalidate() } R.id.actionToggleCubic -> { - binding.chart1.data?.dataSets?.forEach { iSet -> - val set = iSet as LineDataSet - set.lineMode = if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER) - LineDataSet.Mode.LINEAR - else - LineDataSet.Mode.CUBIC_BEZIER + binding.chart1.data?.dataSets?.let { dataSets -> + for (iSet in dataSets) { + val set = iSet as LineDataSet + set.lineMode = if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER) + LineDataSet.Mode.LINEAR + else + LineDataSet.Mode.CUBIC_BEZIER + } } binding.chart1.invalidate() } R.id.actionToggleStepped -> { - binding.chart1.data?.dataSets?.forEach { iSet -> - val set = iSet as LineDataSet - set.lineMode = if (set.lineMode == LineDataSet.Mode.STEPPED) - LineDataSet.Mode.LINEAR - else - LineDataSet.Mode.STEPPED + binding.chart1.data?.dataSets?.let { dataSets -> + for (iSet in dataSets) { + val set = iSet as LineDataSet + set.lineMode = if (set.lineMode == LineDataSet.Mode.STEPPED) + LineDataSet.Mode.LINEAR + else + LineDataSet.Mode.STEPPED + } } binding.chart1.invalidate() } R.id.actionToggleHorizontalCubic -> { - binding.chart1.data?.dataSets?.forEach { iSet -> - val set = iSet as LineDataSet - set.lineMode = if (set.lineMode == LineDataSet.Mode.HORIZONTAL_BEZIER) - LineDataSet.Mode.LINEAR - else - LineDataSet.Mode.HORIZONTAL_BEZIER + binding.chart1.data?.dataSets?.let { dataSets -> + for (iSet in dataSets) { + val set = iSet as LineDataSet + set.lineMode = if (set.lineMode == LineDataSet.Mode.HORIZONTAL_BEZIER) + LineDataSet.Mode.LINEAR + else + LineDataSet.Mode.HORIZONTAL_BEZIER + } } 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 db12f8f98..9ca8922e9 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt @@ -168,15 +168,19 @@ class PieChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect } R.id.actionToggleValues -> { - binding.chart1.data?.dataSets?.forEach { - it.isDrawValues = !it.isDrawValues + binding.chart1.data?.dataSets?.let { dataSets -> + for (it in dataSets) { + it.isDrawValues = !it.isDrawValues + } } binding.chart1.invalidate() } R.id.actionToggleIcons -> { - binding.chart1.data?.dataSets?.forEach { set -> - set.isDrawIcons = !set.isDrawIcons + binding.chart1.data?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawIcons = !set.isDrawIcons + } } binding.chart1.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt index 1da5c9b95..7e6ee19b1 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt @@ -172,15 +172,19 @@ class PieChartRoundedActivity : DemoBase(), OnSeekBarChangeListener, OnChartValu } R.id.actionToggleValues -> { - binding.chart1.data?.dataSets?.forEach { - it.isDrawValues = !it.isDrawValues + binding.chart1.data?.dataSets?.let { dataSets -> + for (it in dataSets) { + it.isDrawValues = !it.isDrawValues + } } binding.chart1.invalidate() } R.id.actionToggleIcons -> { - binding.chart1.data?.dataSets?.forEach { set -> - set.isDrawIcons = !set.isDrawIcons + binding.chart1.data?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawIcons = !set.isDrawIcons + } } binding.chart1.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/PiePolylineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/PiePolylineChartActivity.kt index edfda9865..21675aab1 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/PiePolylineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/PiePolylineChartActivity.kt @@ -161,8 +161,10 @@ class PiePolylineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartVal } R.id.actionToggleValues -> { - binding.chart1.data?.dataSets?.forEach { - it.isDrawValues = !it.isDrawValues + binding.chart1.data?.dataSets?.let { dataSets -> + for (it in dataSets) { + it.isDrawValues = !it.isDrawValues + } } binding.chart1.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt index 1021a6d65..e1b8633cd 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt @@ -157,8 +157,10 @@ class RadarChartActivity : DemoBase() { } R.id.actionToggleValues -> { - binding.chart1.data?.dataSets?.forEach { - it.isDrawValues = !it.isDrawValues + binding.chart1.data?.dataSets?.let { dataSets -> + for (it in dataSets) { + it.isDrawValues = !it.isDrawValues + } } binding.chart1.invalidate() } @@ -176,15 +178,19 @@ class RadarChartActivity : DemoBase() { } R.id.actionToggleFilled -> { - binding.chart1.data?.dataSets?.forEach { set -> - set.isDrawFilled = !set.isDrawFilled + binding.chart1.data?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawFilled = !set.isDrawFilled + } } binding.chart1.invalidate() } R.id.actionToggleHighlightCircle -> { - binding.chart1.data?.dataSets?.forEach { set -> - set.isDrawHighlightCircle = !set.isDrawHighlightCircle + binding.chart1.data?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawHighlightCircle = !set.isDrawHighlightCircle + } } binding.chart1.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/ScatterChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/ScatterChartActivity.kt index e0cc925a3..e78b5e8fd 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/ScatterChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/ScatterChartActivity.kt @@ -141,8 +141,10 @@ class ScatterChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSe } R.id.actionToggleValues -> { - binding.chart1.scatterData?.dataSets?.forEach { set -> - set.isDrawValues = !set.isDrawValues + binding.chart1.scatterData?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawValues = !set.isDrawValues + } } 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 index a586736b0..212d96084 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt @@ -128,8 +128,10 @@ class SpecificPositionsLineChartActivity : DemoBase(), OnSeekBarChangeListener, override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { R.id.actionToggleValues -> { - binding.chart1.data?.dataSets?.forEach { - it.isDrawValues = !it.isDrawValues + binding.chart1.data?.dataSets?.let { dataSets -> + for (it in dataSets) { + it.isDrawValues = !it.isDrawValues + } } binding.chart1.invalidate() } @@ -142,41 +144,51 @@ class SpecificPositionsLineChartActivity : DemoBase(), OnSeekBarChangeListener, } R.id.actionToggleFilled -> { - binding.chart1.data?.dataSets?.forEach { - val set = it as LineDataSet - set.isDrawFilled = !set.isDrawFilled + binding.chart1.data?.dataSets?.let { dataSets -> + for (it in dataSets) { + val set = it as LineDataSet + set.isDrawFilled = !set.isDrawFilled + } } binding.chart1.invalidate() } R.id.actionToggleCircles -> { - binding.chart1.data?.dataSets?.forEach { - val set = it as LineDataSet - set.isDrawCircles = !set.isDrawCircles + binding.chart1.data?.dataSets?.let { dataSets -> + for (it in dataSets) { + val set = it as LineDataSet + set.isDrawCircles = !set.isDrawCircles + } } binding.chart1.invalidate() } R.id.actionToggleCubic -> { - binding.chart1.data?.dataSets?.forEach { - val set = it as LineDataSet - set.lineMode = if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER) LineDataSet.Mode.LINEAR else LineDataSet.Mode.CUBIC_BEZIER + binding.chart1.data?.dataSets?.let { dataSets -> + for (it in dataSets) { + val set = it as LineDataSet + set.lineMode = if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER) LineDataSet.Mode.LINEAR else LineDataSet.Mode.CUBIC_BEZIER + } } binding.chart1.invalidate() } R.id.actionToggleStepped -> { - binding.chart1.data?.dataSets?.forEach { - val set = it as LineDataSet - set.lineMode = if (set.lineMode == LineDataSet.Mode.STEPPED) LineDataSet.Mode.LINEAR else LineDataSet.Mode.STEPPED + binding.chart1.data?.dataSets?.let { dataSets -> + for (it in dataSets) { + val set = it as LineDataSet + set.lineMode = if (set.lineMode == LineDataSet.Mode.STEPPED) LineDataSet.Mode.LINEAR else LineDataSet.Mode.STEPPED + } } binding.chart1.invalidate() } R.id.actionToggleHorizontalCubic -> { - binding.chart1.data?.dataSets?.forEach { - val set = it as LineDataSet - set.lineMode = if (set.lineMode == LineDataSet.Mode.HORIZONTAL_BEZIER) LineDataSet.Mode.LINEAR else LineDataSet.Mode.HORIZONTAL_BEZIER + binding.chart1.data?.dataSets?.let { dataSets -> + for (it in dataSets) { + val set = it as LineDataSet + set.lineMode = if (set.lineMode == LineDataSet.Mode.HORIZONTAL_BEZIER) LineDataSet.Mode.LINEAR else LineDataSet.Mode.HORIZONTAL_BEZIER + } } binding.chart1.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt index b28b1ce4c..75b0540dc 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt @@ -151,15 +151,19 @@ class StackedBarActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSele } R.id.actionToggleValues -> { - binding.chart1.barData?.dataSets?.forEach { - it.isDrawValues = !it.isDrawValues + binding.chart1.barData?.dataSets?.let { dataSets -> + for (it in dataSets) { + it.isDrawValues = !it.isDrawValues + } } binding.chart1.invalidate() } R.id.actionToggleIcons -> { - binding.chart1.barData?.dataSets?.forEach { set -> - set.isDrawIcons = !set.isDrawIcons + binding.chart1.barData?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawIcons = !set.isDrawIcons + } } binding.chart1.invalidate() } @@ -182,8 +186,11 @@ class StackedBarActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSele } R.id.actionToggleBarBorders -> { - binding.chart1.barData?.dataSets?.map { it as BarDataSet }?.forEach { set -> - set.barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f + binding.chart1.barData?.dataSets?.let { dataSets -> + for (iSet in dataSets) { + val set = iSet as BarDataSet + set.barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f + } } binding.chart1.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt index b57761080..7053a82db 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt @@ -130,15 +130,19 @@ class StackedBarActivityNegative : DemoBase(), OnChartValueSelectedListener { } R.id.actionToggleValues -> { - binding.chart1.barData?.dataSets?.forEach { - it.isDrawValues = !it.isDrawValues + binding.chart1.barData?.dataSets?.let { dataSets -> + for (it in dataSets) { + it.isDrawValues = !it.isDrawValues + } } binding.chart1.invalidate() } R.id.actionToggleIcons -> { - binding.chart1.barData?.dataSets?.forEach { set -> - set.isDrawIcons = !set.isDrawIcons + binding.chart1.barData?.dataSets?.let { dataSets -> + for (set in dataSets) { + set.isDrawIcons = !set.isDrawIcons + } } binding.chart1.invalidate() } @@ -161,8 +165,11 @@ class StackedBarActivityNegative : DemoBase(), OnChartValueSelectedListener { } R.id.actionToggleBarBorders -> { - binding.chart1.barData?.dataSets?.map { it as BarDataSet }?.forEach { set -> - set.barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f + binding.chart1.barData?.dataSets?.let { dataSets -> + for (iSet in dataSets) { + val set = iSet as BarDataSet + set.barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f + } } binding.chart1.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 713bce742..f9833c341 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt @@ -377,8 +377,10 @@ class HorizontalBarComposeActivity : DemoBaseCompose() { private fun toggleValues() { chart?.let { - it.barData?.dataSets?.forEach { - it.isDrawValues = !it.isDrawValues + it.barData?.dataSets?.let { dataSets -> + for (it in dataSets) { + it.isDrawValues = !it.isDrawValues + } } it.invalidate() } diff --git a/chartLib/src/main/kotlin/info/appdev/charting/renderer/LineChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/LineChartRenderer.kt index 0b0db2432..f5f6e87aa 100644 --- a/chartLib/src/main/kotlin/info/appdev/charting/renderer/LineChartRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/LineChartRenderer.kt @@ -80,9 +80,11 @@ open class LineChartRenderer( drawBitmapLocal.eraseColor(Color.TRANSPARENT) dataProvider.lineData?.let { lineData -> - lineData.dataSets.forEach { set -> - if (set.isVisible) - drawDataSet(canvas, set) + lineData.dataSets.let { dataSets -> + for (set in dataSets) { + if (set.isVisible) + drawDataSet(canvas, set) + } } } canvas.drawBitmap(drawBitmapLocal, 0f, 0f, null) diff --git a/chartLib/src/main/kotlin/info/appdev/charting/renderer/RadarChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/RadarChartRenderer.kt index dcf35d459..5c0c8ba01 100644 --- a/chartLib/src/main/kotlin/info/appdev/charting/renderer/RadarChartRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/RadarChartRenderer.kt @@ -38,9 +38,11 @@ open class RadarChartRenderer( val mostEntries = radarData.maxEntryCountSet?.entryCount ?: 0 - radarData.dataSets.forEach { set -> - if (set.isVisible) { - drawDataSet(canvas, set, mostEntries) + radarData.dataSets.let { dataSets -> + for (set in dataSets) { + if (set.isVisible) { + drawDataSet(canvas, set, mostEntries) + } } } }