fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-03-10 16:30:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1837 from DoozyDoz/bugfix_all_day_event_sticks_at_top

Browse Source 
Fixes #1767
This commit is contained in:
Tibor Kaputa 2022-10-25 10:57:53 +02:00 committed by GitHub
commit d485be7cf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -453,7 +453,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
val endDateTime = Formatter.getDateTimeFromTS(event.endTS) val endDateTime = Formatter.getDateTimeFromTS(event.endTS)
val endDayCode = Formatter.getDayCodeFromDateTime(endDateTime) val endDayCode = Formatter.getDayCodeFromDateTime(endDateTime)
if (event.getIsAllDay() || ((startDayCode != endDayCode) && config.showMidnightSpanningEventsAtTop)) { if ((event.getIsAllDay() || (startDayCode != endDayCode)) && config.showMidnightSpanningEventsAtTop) {
continue continue
} }
@ -541,7 +541,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
val startDayCode = Formatter.getDayCodeFromDateTime(startDateTime) val startDayCode = Formatter.getDayCodeFromDateTime(startDateTime)
val endDateTime = Formatter.getDateTimeFromTS(event.endTS) val endDateTime = Formatter.getDateTimeFromTS(event.endTS)
val endDayCode = Formatter.getDayCodeFromDateTime(endDateTime) val endDayCode = Formatter.getDayCodeFromDateTime(endDateTime)
if (event.getIsAllDay() || ((startDayCode != endDayCode) && config.showMidnightSpanningEventsAtTop)) { if ((event.getIsAllDay() || (startDayCode != endDayCode)) && config.showMidnightSpanningEventsAtTop) {
addAllDayEvent(event) addAllDayEvent(event)
} else { } else {
var currentDateTime = startDateTime var currentDateTime = startDateTime