Skip to content

Keep events ending at midnight from appearing on the following day #1044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
encarbassotnopot wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Keep events ending at midnight from appearing on the following day #1044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebf919f
fix(monthview): events that end on midnight won't be shown on the nex…
encarbassotnopot Feb 9, 2026
616d902
feat(day fragment): events that end on yesterday's midnight won't be …
encarbassotnopot Feb 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions app/src/main/kotlin/org/fossify/calendar/fragments/DayFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import org.fossify.calendar.extensions.config
import org.fossify.calendar.extensions.eventsHelper
import org.fossify.calendar.extensions.getViewBitmap
import org.fossify.calendar.extensions.printBitmap
import org.fossify.calendar.extensions.seconds
import org.fossify.calendar.helpers.*
import org.fossify.calendar.interfaces.NavigationListener
import org.fossify.calendar.models.Event
Expand Down Expand Up @@ -104,6 +105,13 @@ class DayFragment : Fragment() {
if (replaceDescription) it.location else it.description
})))

// remove events that do not occur today, but happen to end on midnight
sorted.removeIf {
val startDateTimeSeconds = Formatter.getDateTimeFromTS(it.startTS).seconds()
val endDateTimeSeconds = Formatter.getDateTimeFromTS(it.endTS).seconds()
startDateTimeSeconds != endDateTimeSeconds && Formatter.getDateTimeFromTS(endDateTimeSeconds) == Formatter.getDateTimeFromTS(Formatter.getDayStartTS(mDayCode)).withTimeAtStartOfDay()
}

activity?.runOnUiThread {
updateEvents(sorted)
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/org/fossify/calendar/views/MonthView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con

val isMidnight = Formatter.getDateTimeFromTS(endDateTime.seconds()) == Formatter.getDateTimeFromTS(endDateTime.seconds()).withTimeAtStartOfDay()
val numDays = Days.daysBetween(eventStartDateTime, eventEndDateTime).days
val daysCnt = if (numDays == 1 && isMidnight) 0 else numDays
val daysCnt = if (isMidnight) numDays - 1 else numDays
return daysCnt + 1
}

Expand Down
Loading