Skip to content

Commit ac55c06

Browse files
committed
Minor readability improvements
1 parent 25998aa commit ac55c06

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

  • app/src/main/kotlin/com/simplemobiletools/calendar/pro/views

app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/MonthView.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,7 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
123123
val daysCnt = getEventLastingDaysCount(event)
124124
val validDayEvent = isDayValid(event, day.code)
125125

126-
val lastDay = { findLastDay(event) ?: day }
127-
128-
if ((lastEvent == null || lastEvent.startDayIndex + daysCnt <= lastDay().indexOnMonthView) && !validDayEvent) {
126+
if ((lastEvent == null || lastEvent.startDayIndex + daysCnt <= findLastDay(event).indexOnMonthView) && !validDayEvent) {
129127
val monthViewEvent = MonthViewEvent(
130128
event.id!!, event.title, event.startTS, event.endTS, event.color, day.indexOnMonthView,
131129
daysCnt, day.indexOnMonthView, event.getIsAllDay(), event.isPastEvent, event.isTask(), event.isTaskCompleted()
@@ -433,10 +431,11 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
433431
return event.startTS != event.endTS && Formatter.getDateTimeFromTS(event.endTS) == Formatter.getDateTimeFromTS(date.seconds()).withTimeAtStartOfDay()
434432
}
435433

436-
private fun findLastDay(event: Event) =
437-
days.lastOrNull { day ->
434+
private fun findLastDay(event: Event): DayMonthly {
435+
return days.last { day ->
438436
day.dayEvents.find { it.id == event.id } != null
439437
}
438+
}
440439

441440
fun togglePrintMode() {
442441
isPrintVersion = !isPrintVersion

0 commit comments

Comments
 (0)