+3








9ccc303a2a
Release — F-Droid repo + Gitea/Codeberg release + Play / detect (push) Successful in 8s
Renovate / renovate (push) Successful in 2m19s
Release — F-Droid repo + Gitea/Codeberg release + Play / release (push) Successful in 20m28s
Release — F-Droid repo + Gitea/Codeberg release + Play / play (push) Successful in 1m34s
Beta — Codeberg pre-release / detect (push) Successful in 6s
Beta — Codeberg pre-release / beta (push) Skipped
2.24.0: the widget redesign and the fixes collected on release/2.24.0. Full list in CHANGELOG.md under 2.24.0. - Seven new widgets (quick add, date, week strip, upcoming, today, countdown, month with day), each with its own settings; new look for the agenda and month widgets. - Drag all-day events between days or into the grid; cancelled and tentative events are marked; month view setting to hide start times. - Fixes: short events late at night, one notification per event, weekend missing from the week strip widget, split month view animations and back gesture. - Weblate translations from #434, including the new Traditional Chinese (zh-TW), with its store listing and What's New. Merges main's v2.23.1 in. #427 is moved out of the milestone until it can be reproduced. Closes #434 Co-authored-by: Jean-Luc Makiola <business@jeanlucmakiola.de> Co-authored-by: Sup99999 <alelmnour1o234@proton.me> Co-authored-by: Weblate <noreply-mt-weblate@weblate.org> Co-authored-by: Benutzer <gabrielegobboch@protonmail.ch> Co-authored-by: N Donkersloot <n@donkerslootjes.nl> Co-authored-by: VinCap <vcapaldo@ik.me> Co-authored-by: AventineC <AventineC@outlook.com> Co-authored-by: Weblate <noreply@weblate.org> Co-authored-by: NattyNarwhal <fr.schuessele@gmx.de> Co-authored-by: James Trivette <trivette@atlas.cz> Co-authored-by: Dmitri Gabinski <dkgabi@gmail.com> Co-authored-by: Tritra002 <tritratrulala002@outlook.com> Reviewed-on: https://codeberg.org/jlmakiola/calendula/pulls/487
36 lines
1.3 KiB
Kotlin
36 lines
1.3 KiB
Kotlin
package de.jeanlucmakiola.calendula.domain
|
|
|
|
import kotlinx.datetime.TimeZone
|
|
import kotlinx.datetime.atStartOfDayIn
|
|
import kotlin.time.Instant
|
|
|
|
/** Lower values appear first in lists and get the upper visible lanes in grids. */
|
|
fun EventInstance.displayPriority(zone: TimeZone): Int = when {
|
|
isCrossedOut -> 3
|
|
spansMultipleDays(zone) -> 0
|
|
coversWholeDays(zone) -> 1
|
|
else -> 2
|
|
}
|
|
|
|
/**
|
|
* Shared order for agenda and split day lists. Grid bars add their lane geometry.
|
|
* Each event's priority is worked out once, not on every comparison.
|
|
*/
|
|
fun List<EventInstance>.sortedForDisplay(zone: TimeZone): List<EventInstance> =
|
|
map { Triple(it, it.displayPriority(zone), it.displayStart(zone)) }
|
|
.sortedWith(
|
|
compareBy<Triple<EventInstance, Int, Instant>> { it.second }
|
|
.thenBy { it.third }
|
|
.thenBy { it.first.title }
|
|
.thenBy { it.first.instanceId },
|
|
)
|
|
.map { it.first }
|
|
|
|
/**
|
|
* Where an event starts for ordering: a whole-day event at local midnight of its
|
|
* first day, since an all-day one is stored at UTC midnight and would otherwise
|
|
* sort around timed events by the device's offset (#296).
|
|
*/
|
|
internal fun EventInstance.displayStart(zone: TimeZone): Instant =
|
|
if (coversWholeDays(zone)) spanFirstDay(zone).atStartOfDayIn(zone) else start
|