Skip to content

Commit bc43b17

Browse files
hannesa2hannesa2
authored
Merge pull request #800 from venkatbhoogarbh/fix/api23-loop-migration
Replaced collection forEach loops with for-in loops across project
2 parents d51d818 + 82b1448 commit bc43b17

27 files changed

Lines changed: 396 additions & 224 deletions

‎app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,10 @@ class AnotherBarActivity : DemoBase(), OnSeekBarChangeListener {
111111
}
112112

113113
R.id.actionToggleValues -> {
114-
binding.chart1.barData?.dataSets?.forEach {
115-
it.isDrawValues = !it.isDrawValues
114+
binding.chart1.barData?.dataSets?.let { dataSets ->
115+
for (set in dataSets) {
116+
set.isDrawValues = !set.isDrawValues
117+
}
116118
}
117119
binding.chart1.invalidate()
118120
}
@@ -135,11 +137,14 @@ class AnotherBarActivity : DemoBase(), OnSeekBarChangeListener {
135137
}
136138

137139
R.id.actionToggleBarBorders -> {
138-
binding.chart1.barData?.dataSets?.map { it as BarDataSet }?.forEach { set ->
139-
set.barBorderWidth = if (set.barBorderWidth == 1f)
140-
0f
141-
else
142-
1f
140+
binding.chart1.barData?.dataSets?.let { dataSets ->
141+
for (iSet in dataSets) {
142+
val set = iSet as BarDataSet
143+
set.barBorderWidth = if (set.barBorderWidth == 1f)
144+
0f
145+
else
146+
1f
147+
}
143148
}
144149
binding.chart1.invalidate()
145150
}

‎app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,15 +197,19 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect
197197
}
198198

199199
R.id.actionToggleValues -> {
200-
binding.chart1.barData?.dataSets?.forEach {
201-
it.isDrawValues = !it.isDrawValues
200+
binding.chart1.barData?.dataSets?.let { dataSets ->
201+
for (set in dataSets) {
202+
set.isDrawValues = !set.isDrawValues
203+
}
202204
}
203205
binding.chart1.invalidate()
204206
}
205207

206208
R.id.actionToggleIcons -> {
207-
binding.chart1.barData?.dataSets?.forEach { set ->
208-
set.isDrawIcons = !set.isDrawIcons
209+
binding.chart1.barData?.dataSets?.let { dataSets ->
210+
for (set in dataSets) {
211+
set.isDrawIcons = !set.isDrawIcons
212+
}
209213
}
210214
binding.chart1.invalidate()
211215
}
@@ -228,8 +232,11 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect
228232
}
229233

230234
R.id.actionToggleBarBorders -> {
231-
binding.chart1.barData?.dataSets?.map { it as BarDataSet }?.forEach { set ->
232-
set.barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f
235+
binding.chart1.barData?.dataSets?.let { dataSets ->
236+
for (iSet in dataSets) {
237+
val set = iSet as BarDataSet
238+
set.barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f
239+
}
233240
}
234241
binding.chart1.invalidate()
235242
}

‎app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,10 @@ class BarChartActivityMultiDataset : DemoBase(), OnSeekBarChangeListener, OnChar
186186
}
187187

188188
R.id.actionToggleValues -> {
189-
binding.chart1.barData?.dataSets?.forEach {
190-
it.isDrawValues = !it.isDrawValues
189+
binding.chart1.barData?.dataSets?.let { dataSets ->
190+
for (set in dataSets) {
191+
set.isDrawValues = !set.isDrawValues
192+
}
191193
}
192194
binding.chart1.invalidate()
193195
}
@@ -203,8 +205,11 @@ class BarChartActivityMultiDataset : DemoBase(), OnSeekBarChangeListener, OnChar
203205
}
204206

205207
R.id.actionToggleBarBorders -> {
206-
binding.chart1.barData?.dataSets?.map { it as BarDataSet }?.forEach { set ->
207-
set.barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f
208+
binding.chart1.barData?.dataSets?.let { dataSets ->
209+
for (iSet in dataSets) {
210+
val set = iSet as BarDataSet
211+
set.barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f
212+
}
208213
}
209214
binding.chart1.invalidate()
210215
}

‎app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,10 @@ class BarChartActivitySinus : DemoBase(), OnSeekBarChangeListener {
130130
}
131131

132132
R.id.actionToggleValues -> {
133-
binding.chart1.barData?.dataSets?.forEach {
134-
it.isDrawValues = !it.isDrawValues
133+
binding.chart1.barData?.dataSets?.let { dataSets ->
134+
for (set in dataSets) {
135+
set.isDrawValues = !set.isDrawValues
136+
}
135137
}
136138
binding.chart1.invalidate()
137139
}
@@ -154,8 +156,11 @@ class BarChartActivitySinus : DemoBase(), OnSeekBarChangeListener {
154156
}
155157

156158
R.id.actionToggleBarBorders -> {
157-
binding.chart1.barData?.dataSets?.map { it as BarDataSet }?.forEach { set ->
158-
set.barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f
159+
binding.chart1.barData?.dataSets?.let { dataSets ->
160+
for (iSet in dataSets) {
161+
val set = iSet as BarDataSet
162+
set.barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f
163+
}
159164
}
160165
binding.chart1.invalidate()
161166
}

‎app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,15 +155,19 @@ class BubbleChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSel
155155
}
156156

157157
R.id.actionToggleValues -> {
158-
binding.chart1.bubbleData?.dataSets?.forEach {
159-
it.isDrawValues = !it.isDrawValues
158+
binding.chart1.bubbleData?.dataSets?.let { dataSets ->
159+
for (set in dataSets) {
160+
set.isDrawValues = !set.isDrawValues
161+
}
160162
}
161163
binding.chart1.invalidate()
162164
}
163165

164166
R.id.actionToggleIcons -> {
165-
binding.chart1.bubbleData?.dataSets?.forEach { set ->
166-
set.isDrawIcons = !set.isDrawIcons
167+
binding.chart1.bubbleData?.dataSets?.let { dataSets ->
168+
for (set in dataSets) {
169+
set.isDrawIcons = !set.isDrawIcons
170+
}
167171
}
168172
binding.chart1.invalidate()
169173
}

‎app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,15 +135,19 @@ class CandleStickChartActivity : DemoBase(), OnSeekBarChangeListener {
135135
}
136136

137137
R.id.actionToggleValues -> {
138-
binding.chart1.candleData?.dataSets?.forEach {
139-
it.isDrawValues = !it.isDrawValues
138+
binding.chart1.candleData?.dataSets?.let { dataSets ->
139+
for (set in dataSets) {
140+
set.isDrawValues = !set.isDrawValues
141+
}
140142
}
141143
binding.chart1.invalidate()
142144
}
143145

144146
R.id.actionToggleIcons -> {
145-
binding.chart1.candleData?.dataSets?.forEach { set ->
146-
set.isDrawIcons = !set.isDrawIcons
147+
binding.chart1.candleData?.dataSets?.let { dataSets ->
148+
for (set in dataSets) {
149+
set.isDrawIcons = !set.isDrawIcons
150+
}
147151
}
148152
binding.chart1.invalidate()
149153
}
@@ -166,8 +170,10 @@ class CandleStickChartActivity : DemoBase(), OnSeekBarChangeListener {
166170
}
167171

168172
R.id.actionToggleMakeShadowSameColorAsCandle -> {
169-
binding.chart1.candleData?.dataSets?.forEach { set ->
170-
(set as CandleDataSet).shadowColorSameAsCandle = !set.shadowColorSameAsCandle
173+
binding.chart1.candleData?.dataSets?.let { dataSets ->
174+
for (set in dataSets) {
175+
(set as CandleDataSet).shadowColorSameAsCandle = !set.shadowColorSameAsCandle
176+
}
171177
}
172178

173179
binding.chart1.invalidate()

‎app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -239,17 +239,21 @@ class CombinedChartActivity : DemoBase() {
239239
}
240240

241241
R.id.actionToggleLineValues -> {
242-
binding.chart1.lineData?.dataSets?.forEach {
243-
if (it is LineDataSet)
244-
it.isDrawValues = !it.isDrawValues
242+
binding.chart1.lineData?.dataSets?.let { dataSets ->
243+
for (it in dataSets) {
244+
if (it is LineDataSet)
245+
it.isDrawValues = !it.isDrawValues
246+
}
245247
}
246248
binding.chart1.invalidate()
247249
}
248250

249251
R.id.actionToggleBarValues -> {
250-
binding.chart1.barData?.dataSets?.forEach {
251-
if (it is BarDataSet)
252-
it.isDrawValues = !it.isDrawValues
252+
binding.chart1.barData?.dataSets?.let { dataSets ->
253+
for (it in dataSets) {
254+
if (it is BarDataSet)
255+
it.isDrawValues = !it.isDrawValues
256+
}
253257
}
254258
binding.chart1.invalidate()
255259
}

‎app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt‎

Lines changed: 38 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,10 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
145145
}
146146

147147
R.id.actionToggleValues -> {
148-
binding.chart1.lineData.dataSets.forEach {
149-
it.isDrawValues = !it.isDrawValues
148+
binding.chart1.lineData.dataSets.let { dataSets ->
149+
for (it in dataSets) {
150+
it.isDrawValues = !it.isDrawValues
151+
}
150152
}
151153
binding.chart1.invalidate()
152154
}
@@ -159,50 +161,60 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
159161
}
160162

161163
R.id.actionToggleFilled -> {
162-
binding.chart1.lineData.dataSets.forEach {
163-
val set = it as LineDataSet
164-
set.isDrawFilled = !set.isDrawFilled
164+
binding.chart1.lineData.dataSets.let { dataSets ->
165+
for (it in dataSets) {
166+
val set = it as LineDataSet
167+
set.isDrawFilled = !set.isDrawFilled
168+
}
165169
}
166170
binding.chart1.invalidate()
167171
}
168172

169173
R.id.actionToggleCircles -> {
170-
binding.chart1.lineData.dataSets.forEach {
171-
val set = it as LineDataSet
172-
set.isDrawCircles = !set.isDrawCircles
174+
binding.chart1.lineData.dataSets.let { dataSets ->
175+
for (it in dataSets) {
176+
val set = it as LineDataSet
177+
set.isDrawCircles = !set.isDrawCircles
178+
}
173179
}
174180
binding.chart1.invalidate()
175181
}
176182

177183
R.id.actionToggleCubic -> {
178-
binding.chart1.lineData.dataSets.forEach {
179-
val set = it as LineDataSet
180-
set.lineMode = if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER)
181-
LineDataSet.Mode.LINEAR
182-
else
183-
LineDataSet.Mode.CUBIC_BEZIER
184+
binding.chart1.lineData.dataSets.let { dataSets ->
185+
for (it in dataSets) {
186+
val set = it as LineDataSet
187+
set.lineMode = if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER)
188+
LineDataSet.Mode.LINEAR
189+
else
190+
LineDataSet.Mode.CUBIC_BEZIER
191+
}
184192
}
185193
binding.chart1.invalidate()
186194
}
187195

188196
R.id.actionToggleStepped -> {
189-
binding.chart1.lineData.dataSets.forEach {
190-
val set = it as LineDataSet
191-
set.lineMode = if (set.lineMode == LineDataSet.Mode.STEPPED)
192-
LineDataSet.Mode.LINEAR
193-
else
194-
LineDataSet.Mode.STEPPED
197+
binding.chart1.lineData.dataSets.let { dataSets ->
198+
for (it in dataSets) {
199+
val set = it as LineDataSet
200+
set.lineMode = if (set.lineMode == LineDataSet.Mode.STEPPED)
201+
LineDataSet.Mode.LINEAR
202+
else
203+
LineDataSet.Mode.STEPPED
204+
}
195205
}
196206
binding.chart1.invalidate()
197207
}
198208

199209
R.id.actionToggleHorizontalCubic -> {
200-
binding.chart1.lineData.dataSets.forEach {
201-
val set = it as LineDataSet
202-
set.lineMode = if (set.lineMode == LineDataSet.Mode.HORIZONTAL_BEZIER)
203-
LineDataSet.Mode.LINEAR
204-
else
205-
LineDataSet.Mode.HORIZONTAL_BEZIER
210+
binding.chart1.lineData.dataSets.let { dataSets ->
211+
for (it in dataSets) {
212+
val set = it as LineDataSet
213+
set.lineMode = if (set.lineMode == LineDataSet.Mode.HORIZONTAL_BEZIER)
214+
LineDataSet.Mode.LINEAR
215+
else
216+
LineDataSet.Mode.HORIZONTAL_BEZIER
217+
}
206218
}
207219
binding.chart1.invalidate()
208220
}

‎app/src/main/kotlin/info/appdev/chartexample/DrawChartActivity.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,10 @@ class DrawChartActivity : DemoBase(), OnChartValueSelectedListener, OnDrawListen
7878
override fun onOptionsItemSelected(item: MenuItem): Boolean {
7979
when (item.itemId) {
8080
R.id.actionToggleValues -> {
81-
binding.chart1.data?.dataSets?.forEach {
82-
it.isDrawValues = !it.isDrawValues
81+
binding.chart1.data?.dataSets?.let { dataSets ->
82+
for (it in dataSets) {
83+
it.isDrawValues = !it.isDrawValues
84+
}
8385
}
8486
binding.chart1.invalidate()
8587
}

‎app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,15 +157,19 @@ class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartV
157157
}
158158

159159
R.id.actionToggleValues -> {
160-
binding.chart1.barData?.dataSets?.forEach {
161-
it.isDrawValues = !it.isDrawValues
160+
binding.chart1.barData?.dataSets?.let { dataSets ->
161+
for (it in dataSets) {
162+
it.isDrawValues = !it.isDrawValues
163+
}
162164
}
163165
binding.chart1.invalidate()
164166
}
165167

166168
R.id.actionToggleIcons -> {
167-
binding.chart1.barData?.dataSets?.forEach { set ->
168-
set.isDrawIcons = !set.isDrawIcons
169+
binding.chart1.barData?.dataSets?.let { dataSets ->
170+
for (set in dataSets) {
171+
set.isDrawIcons = !set.isDrawIcons
172+
}
169173
}
170174
binding.chart1.invalidate()
171175
}
@@ -188,8 +192,11 @@ class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartV
188192
}
189193

190194
R.id.actionToggleBarBorders -> {
191-
binding.chart1.barData?.dataSets?.map { it as BarDataSet }?.forEach { set ->
192-
set.barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f
195+
binding.chart1.barData?.dataSets?.let { dataSets ->
196+
for (iSet in dataSets) {
197+
val set = iSet as BarDataSet
198+
set.barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f
199+
}
193200
}
194201
binding.chart1.invalidate()
195202
}

0 commit comments

Comments
 (0)