File tree Expand file tree Collapse file tree 1 file changed +17
-5
lines changed
app/src/main/kotlin/com/d4rk/cleaner/app/clean/dashboard/ui Expand file tree Collapse file tree 1 file changed +17
-5
lines changed Original file line number Diff line number Diff line change @@ -206,16 +206,28 @@ fun ScannerDashboardScreen(
206
206
AdSlot .F to 11
207
207
)
208
208
209
- val adQueue = allowedSlots.sortedBy { slotAnchors[it]!! }.toMutableList()
209
+ val adQueue = allowedSlots
210
+ .filter { slotAnchors[it] != null }
211
+ .sortedBy { slotAnchors.getValue(it) }
212
+ .toMutableList()
210
213
val items = mutableListOf<HomeItem >()
211
214
var lastWasAd = false
212
215
for ((index, card) in content) {
213
216
items.add(HomeItem .Card (card))
214
217
lastWasAd = false
215
- while (adQueue.isNotEmpty() && slotAnchors[adQueue.first()]!! <= index) {
216
- if (! lastWasAd) {
217
- items.add(HomeItem .Ad (adQueue.removeAt(0 )))
218
- lastWasAd = true
218
+ while (adQueue.isNotEmpty()) {
219
+ val slot = adQueue.first()
220
+ val anchor = slotAnchors[slot] ? : run {
221
+ adQueue.removeAt(0 )
222
+ continue
223
+ }
224
+ if (anchor <= index) {
225
+ if (! lastWasAd) {
226
+ items.add(HomeItem .Ad (adQueue.removeAt(0 )))
227
+ lastWasAd = true
228
+ } else {
229
+ break
230
+ }
219
231
} else {
220
232
break
221
233
}
You can’t perform that action at this time.
0 commit comments