diff --git a/app/build.gradle b/app/build.gradle index 82d599c61..6cf2053b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -70,9 +70,9 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:d04f40487b' + implementation 'com.github.SimpleMobileTools:Simple-Commons:795a4ae3e3' implementation 'androidx.multidex:multidex:2.0.1' - implementation 'androidx.constraintlayout:constraintlayout:2.1.3' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation "androidx.print:print:1.0.0" diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/MonthView.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/MonthView.kt index d29199e1a..7530ffd99 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/MonthView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/MonthView.kt @@ -116,7 +116,6 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con private fun groupAllEvents() { days.forEach { day -> - day.dayEvents.forEach { event -> // make sure we properly handle events lasting multiple days and repeating ones val lastEvent = allEvents.lastOrNull { it.id == event.id } @@ -133,10 +132,9 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con } } - allEvents = - allEvents.asSequence().sortedWith( - compareBy({ -it.daysCnt }, { !it.isAllDay }, { it.startTS }, { it.endTS }, { it.startDayIndex }, { it.title }) - ).toMutableList() as ArrayList + allEvents = allEvents.asSequence().sortedWith( + compareBy({ -it.daysCnt }, { !it.isAllDay }, { it.startTS }, { it.endTS }, { it.startDayIndex }, { it.title }) + ).toMutableList() as ArrayList } override fun onDraw(canvas: Canvas) {