Use foreach

hannesa2 · hannesa2 · commit 7138bc157747 · 2025-12-17T13:12:23.000+01:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,15 +239,15 @@ 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()
             }
 
             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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -163,15 +163,13 @@ class StackedBarActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSele
                 chart!!.data!!.dataSets.forEach { set ->
                     set.setDrawValues(!set.isDrawValues)
                 }
-
                 chart!!.invalidate()
             }
 
             R.id.actionToggleIcons -> {
                 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
@@ -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
@@ -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()
         }

Original file line number	Diff line number	Diff line change
`@@ -124,8 +124,9 @@ class AnotherBarActivity : DemoBase(), OnSeekBarChangeListener {`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`R.id.actionToggleValues -> {`
`127`		`- for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValues())`
`128`		`-`
	`127`	`+ chart!!.data!!.dataSets.forEach { set ->`
	`128`	`+ set.setDrawValues(!set.isDrawValues())`
	`129`	`+ }`
`129`	`130`	`chart!!.invalidate()`
`130`	`131`	`}`
`131`	`132`
Original file line number	Diff line number	Diff line change
`@@ -202,9 +202,9 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`R.id.actionToggleValues -> {`
`205`		`- for (set in chart!!.data!!.dataSets)`
	`205`	`+ chart!!.data!!.dataSets.forEach { set ->`
`206`	`206`	`set.setDrawValues(!set.isDrawValues())`
`207`		`-`
	`207`	`+ }`
`208`	`208`	`chart!!.invalidate()`
`209`	`209`	`}`
`210`	`210`
Original file line number	Diff line number	Diff line change
`@@ -193,8 +193,9 @@ class BarChartActivityMultiDataset : DemoBase(), OnSeekBarChangeListener, OnChar`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`R.id.actionToggleValues -> {`
`196`		`- for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValues())`
`197`		`-`
	`196`	`+ chart!!.data!!.dataSets.forEach { set ->`
	`197`	`+ set.setDrawValues(!set.isDrawValues())`
	`198`	`+ }`
`198`	`199`	`chart!!.invalidate()`
`199`	`200`	`}`
`200`	`201`
Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,9 @@ class BarChartActivitySinus : DemoBase(), OnSeekBarChangeListener {`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`R.id.actionToggleValues -> {`
`134`		`- for (set in binding.chart1.data!!.dataSets) set.setDrawValues(!set.isDrawValues())`
`135`		`-`
	`134`	`+ binding.chart1.data!!.dataSets.forEach { set ->`
	`135`	`+ set.setDrawValues(!set.isDrawValues())`
	`136`	`+ }`
`136`	`137`	`binding.chart1.invalidate()`
`137`	`138`	`}`
`138`	`139`
Original file line number	Diff line number	Diff line change
`@@ -167,8 +167,9 @@ class BubbleChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSel`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`R.id.actionToggleValues -> {`
`170`		`- for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValues())`
`171`		`-`
	`170`	`+ chart!!.data!!.dataSets.forEach { set ->`
	`171`	`+ set.setDrawValues(!set.isDrawValues())`
	`172`	`+ }`
`172`	`173`	`chart!!.invalidate()`
`173`	`174`	`}`
`174`	`175`
Original file line number	Diff line number	Diff line change
`@@ -148,8 +148,9 @@ class CandleStickChartActivity : DemoBase(), OnSeekBarChangeListener {`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`R.id.actionToggleValues -> {`
`151`		`- for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValues())`
`152`		`-`
	`151`	`+ chart!!.data!!.dataSets.forEach { set ->`
	`152`	`+ set.setDrawValues(!set.isDrawValues())`
	`153`	`+ }`
`153`	`154`	`chart!!.invalidate()`
`154`	`155`	`}`
`155`	`156`
Original file line number	Diff line number	Diff line change
`@@ -154,8 +154,9 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`R.id.actionToggleValues -> {`
`157`		`- for (set in binding.chart1.data!!.dataSets) set.setDrawValues(!set.isDrawValues)`
`158`		`-`
	`157`	`+ binding.chart1.data!!.dataSets.forEach { set ->`
	`158`	`+ set.setDrawValues(!set.isDrawValues())`
	`159`	`+ }`
`159`	`160`	`binding.chart1.invalidate()`
`160`	`161`	`}`
`161`	`162`
Original file line number	Diff line number	Diff line change
`@@ -79,12 +79,9 @@ class DrawChartActivity : DemoBase(), OnChartValueSelectedListener, OnDrawListen`
`79`	`79`	`override fun onOptionsItemSelected(item: MenuItem): Boolean {`
`80`	`80`	`when (item.itemId) {`
`81`	`81`	`R.id.actionToggleValues -> {`
`82`		`- val sets = binding.chart1.data!!.dataSets`
`83`		`-`
`84`		`- for (set in sets) {`
`85`		`- set.setDrawValues(!set.isDrawValues)`
	`82`	`+ binding.chart1.data!!.dataSets.forEach { set ->`
	`83`	`+ set.setDrawValues(!set.isDrawValues())`
`86`	`84`	`}`
`87`		`-`
`88`	`85`	`binding.chart1.invalidate()`
`89`	`86`	`}`
`90`	`87`
Original file line number	Diff line number	Diff line change
`@@ -153,13 +153,9 @@ class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartV`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`R.id.actionToggleValues -> {`
`156`		`- val sets = binding.chart1.data!!`
`157`		`- .dataSets`
`158`		`-`
`159`		`- for (iSet in sets) {`
`160`		`- iSet.setDrawValues(!iSet.isDrawValues())`
	`156`	`+ binding.chart1.data!!.dataSets.forEach { set ->`
	`157`	`+ set.setDrawValues(!set.isDrawValues())`
`161`	`158`	`}`
`162`		`-`
`163`	`159`	`binding.chart1.invalidate()`
`164`	`160`	`}`
`165`	`161`