Skip to content

Replaced collection forEach loops with for-in loops across project #800

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
hannesa2 merged 1 commit into from
Jun 23, 2026
Merged

Replaced collection forEach loops with for-in loops across project #800

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand All @@ -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()
}
Expand Down
19 changes: 13 additions & 6 deletions app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand All @@ -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()
}
Expand Down
13 changes: 9 additions & 4 deletions app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand All @@ -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()
}
Expand Down
13 changes: 9 additions & 4 deletions app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand All @@ -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()
}
Expand Down
12 changes: 8 additions & 4 deletions app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
18 changes: 12 additions & 6 deletions app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand All @@ -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()
Expand Down
16 changes: 10 additions & 6 deletions app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
64 changes: 38 additions & 26 deletions app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand All @@ -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()
}
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/kotlin/info/appdev/chartexample/DrawChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
19 changes: 13 additions & 6 deletions app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand All @@ -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()
}
Expand Down
Loading
Loading