Scarriffle/Calendarr-IOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Week view: render multi-day all-day events as continuous spanning bars

Browse Source 
The all-day strip repeated a multi-day event once per day; now events span their
start→end columns and pack into lanes (like the month view) via a GeometryReader
layout.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Scarriffle
2026-07-16 11:20:21 +02:00
parent 7981ced5ba
commit 554ad425b1
1 changed files with 55 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
Calendarr iOS/Views/Calendar/WeekView.swift
View File

@@ -72,37 +72,66 @@ struct WeekView: View {
// MARK: – All-day strip // MARK: – All-day strip
private let allDayLaneHeight: CGFloat = 16
/// All-day / multi-day events laid out as continuous bars: each event spans
/// its start→end columns (clamped to this week) and is packed into lanes so
/// overlapping bars stack — mirrors the month view instead of repeating the
/// event once per day.
private func allDayBars() -> [(ev: CalEvent, start: Int, end: Int, lane: Int)] {
var spans: [(ev: CalEvent, start: Int, end: Int)] = []
for ev in allDayEvents {
var start: Int? = nil
var end = 0
for (i, day) in weekDays.enumerated() {
let ds = cal.startOfDay(for: day)
let de = cal.date(byAdding: .day, value: 1, to: ds)!
if ev.startDate < de && ev.endDate > ds {
if start == nil { start = i }
end = i
}
}
if let s = start { spans.append((ev, s, end)) }
}
// Longer / earlier bars first, then greedily pack into lanes.
spans.sort { a, b in a.start != b.start ? a.start < b.start : (a.end - a.start) > (b.end - b.start) }
var laneEnd: [Int] = [] // last occupied column index per lane
var out: [(ev: CalEvent, start: Int, end: Int, lane: Int)] = []
for s in spans {
var lane = 0
while lane < laneEnd.count && laneEnd[lane] >= s.start { lane += 1 }
if lane == laneEnd.count { laneEnd.append(s.end) } else { laneEnd[lane] = s.end }
out.append((s.ev, s.start, s.end, lane))
}
return out
}
private var allDayRow: some View { private var allDayRow: some View {
HStack(spacing: 0) { let bars = allDayBars()
Spacer().frame(width: timeColumnWidth) let laneCount = max(1, (bars.map { $0.lane }.max() ?? -1) + 1)
ForEach(weekDays, id: \.self) { day in return GeometryReader { geo in
let dayEvs = allDayEvents.filter { ev in let colW = (geo.size.width - timeColumnWidth) / 7
let ds = cal.startOfDay(for: day) ZStack(alignment: .topLeading) {
let de = cal.date(byAdding: .day, value: 1, to: ds)! ForEach(bars, id: \.ev.id) { bar in
return ev.startDate < de && ev.endDate > ds Button { onEventTap(bar.ev) } label: {
} EventLabel(event: bar.ev)
VStack(spacing: 1) { .font(.system(size: 9, weight: .medium))
ForEach(dayEvs.prefix(2)) { ev in .foregroundStyle(.white)
Button { onEventTap(ev) } label: { .lineLimit(1)
EventLabel(event: ev) .frame(maxWidth: .infinity, alignment: .leading)
.font(.system(size: 9, weight: .medium)) .padding(.horizontal, 3)
.foregroundStyle(.white) .frame(height: allDayLaneHeight - 2)
.lineLimit(1) .background(Color(hex: bar.ev.effectiveColor))
.frame(maxWidth: .infinity) .clipShape(RoundedRectangle(cornerRadius: 2))
.padding(.vertical, 2)
.background(Color(hex: ev.effectiveColor))
.clipShape(RoundedRectangle(cornerRadius: 2))
}
.buttonStyle(.plain)
} }
} .buttonStyle(.plain)
.padding(.horizontal, 1) .frame(width: colW * CGFloat(bar.end - bar.start + 1) - 3)
.frame(maxWidth: .infinity) .offset(x: timeColumnWidth + colW * CGFloat(bar.start) + 1.5,
.overlay(alignment: .trailing) { y: CGFloat(bar.lane) * allDayLaneHeight)
Rectangle().fill(Color(hex: lineHex).opacity(gridLineOpacity(lineContrast))).frame(width: 0.5)
} }
} }
} }
.frame(height: CGFloat(laneCount) * allDayLaneHeight)
.padding(.vertical, 4) .padding(.vertical, 4)
.overlay(alignment: .bottom) { Divider() } .overlay(alignment: .bottom) { Divider() }
} }