fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-02-17 12:20:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixing some crashes on Android 5 and 6

Browse Source
This commit is contained in:
tibbi 2022-03-16 15:19:02 +01:00
parent 501373cd45
commit 6c4a07424f
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -69,7 +69,7 @@ android {
} }
dependencies { dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:ee9863c9c5' implementation 'com.github.SimpleMobileTools:Simple-Commons:c3c88596e0'
implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3' implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

11
app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt
View File

@ -429,7 +429,6 @@ class WeekFragment : Fragment(), WeeklyCalendar {
addEvents(currEvents) addEvents(currEvents)
} }
@SuppressLint("NewApi")
private fun addEvents(events: ArrayList<Event>) { private fun addEvents(events: ArrayList<Event>) {
initGrid() initGrid()
allDayHolders.clear() allDayHolders.clear()
@ -483,9 +482,9 @@ class WeekFragment : Fragment(), WeeklyCalendar {
} while (currentDayCode.toInt() <= endDayCode.toInt()) } while (currentDayCode.toInt() <= endDayCode.toInt())
} }
eventTimeRanges.forEach { daycode, eventDayList -> for ((_, eventDayList) in eventTimeRanges) {
val eventsCollisionChecked = ArrayList<Long>() val eventsCollisionChecked = ArrayList<Long>()
eventDayList.forEach { eventId, eventWeeklyView -> for ((eventId, eventWeeklyView) in eventDayList) {
if (eventWeeklyView.slot == 0) { if (eventWeeklyView.slot == 0) {
eventWeeklyView.slot = 1 eventWeeklyView.slot = 1
eventWeeklyView.slot_max = 1 eventWeeklyView.slot_max = 1
@ -493,7 +492,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
eventsCollisionChecked.add(eventId) eventsCollisionChecked.add(eventId)
val eventWeeklyViewsToCheck = eventDayList.filter { !eventsCollisionChecked.contains(it.key) } val eventWeeklyViewsToCheck = eventDayList.filter { !eventsCollisionChecked.contains(it.key) }
eventWeeklyViewsToCheck.forEach { toCheckId, eventWeeklyViewToCheck -> for ((toCheckId, eventWeeklyViewToCheck) in eventWeeklyViewsToCheck) {
val areTouching = eventWeeklyView.range.touch(eventWeeklyViewToCheck.range) val areTouching = eventWeeklyView.range.touch(eventWeeklyViewToCheck.range)
val doHaveCommonMinutes = if (areTouching) { val doHaveCommonMinutes = if (areTouching) {
eventWeeklyView.range.upper > eventWeeklyViewToCheck.range.lower || (eventWeeklyView.range.lower == eventWeeklyView.range.upper && eventWeeklyView.range.upper > eventWeeklyViewToCheck.range.lower || (eventWeeklyView.range.lower == eventWeeklyView.range.upper &&
@ -507,7 +506,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
val nextSlot = eventWeeklyView.slot_max + 1 val nextSlot = eventWeeklyView.slot_max + 1
val slotRange = Array(eventWeeklyView.slot_max) { it + 1 } val slotRange = Array(eventWeeklyView.slot_max) { it + 1 }
val collisionEventWeeklyViews = eventDayList.filter { eventWeeklyView.collisions.contains(it.key) } val collisionEventWeeklyViews = eventDayList.filter { eventWeeklyView.collisions.contains(it.key) }
collisionEventWeeklyViews.forEach { collision_id, collisionEventWeeklyView -> for ((_, collisionEventWeeklyView) in collisionEventWeeklyViews) {
if (collisionEventWeeklyView.range.touch(eventWeeklyViewToCheck.range)) { if (collisionEventWeeklyView.range.touch(eventWeeklyViewToCheck.range)) {
slotRange[collisionEventWeeklyView.slot - 1] = nextSlot slotRange[collisionEventWeeklyView.slot - 1] = nextSlot
} }
@ -518,7 +517,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
if (slot == nextSlot) { if (slot == nextSlot) {
eventWeeklyViewToCheck.slot_max = nextSlot eventWeeklyViewToCheck.slot_max = nextSlot
eventWeeklyView.slot_max = nextSlot eventWeeklyView.slot_max = nextSlot
collisionEventWeeklyViews.forEach { collision_id, collisionEventWeeklyView -> for ((_, collisionEventWeeklyView) in collisionEventWeeklyViews) {
collisionEventWeeklyView.slot_max++ collisionEventWeeklyView.slot_max++
} }
} else { } else {