fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Minor readability improvements

Browse Source
This commit is contained in:
Naveen
2022-05-21 20:29:40 +05:30
parent 25998aa6b8
commit ac55c060d5
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,9 +123,7 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
val daysCnt = getEventLastingDaysCount(event) val daysCnt = getEventLastingDaysCount(event)
val validDayEvent = isDayValid(event, day.code) val validDayEvent = isDayValid(event, day.code)
val lastDay = { findLastDay(event) ?: day } if ((lastEvent == null || lastEvent.startDayIndex + daysCnt <= findLastDay(event).indexOnMonthView) && !validDayEvent) {
if ((lastEvent == null || lastEvent.startDayIndex + daysCnt <= lastDay().indexOnMonthView) && !validDayEvent) {
val monthViewEvent = MonthViewEvent( val monthViewEvent = MonthViewEvent(
event.id!!, event.title, event.startTS, event.endTS, event.color, day.indexOnMonthView, event.id!!, event.title, event.startTS, event.endTS, event.color, day.indexOnMonthView,
daysCnt, day.indexOnMonthView, event.getIsAllDay(), event.isPastEvent, event.isTask(), event.isTaskCompleted() 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
return event.startTS != event.endTS && Formatter.getDateTimeFromTS(event.endTS) == Formatter.getDateTimeFromTS(date.seconds()).withTimeAtStartOfDay() return event.startTS != event.endTS && Formatter.getDateTimeFromTS(event.endTS) == Formatter.getDateTimeFromTS(date.seconds()).withTimeAtStartOfDay()
} }
private fun findLastDay(event: Event) = private fun findLastDay(event: Event): DayMonthly {
days.lastOrNull { day -> return days.last { day ->
day.dayEvents.find { it.id == event.id } != null day.dayEvents.find { it.id == event.id } != null
} }
}
fun togglePrintMode() { fun togglePrintMode() {
isPrintVersion = !isPrintVersion isPrintVersion = !isPrintVersion