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

iOS: replace chevron icons with clip-path shape, fix +N overlap in month view

Browse Source 
- DayPreviewAllDayBar: use custom ChevronBarShape (polygon clip) instead of
  chevron SF Symbols; bars have tapered pointed ends for continuation
- MonthView rowHeight: increase bottom padding from +4 to +16 so the
  overflow "+N" count no longer overlaps the last event bar lane

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Scarriffle
2026-06-11 20:34:58 +02:00
parent 17ebf788ce
commit 1dbe405689
1 changed files with 48 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
Calendarr iOS/Views/Calendar/MonthView.swift
View File

@@ -209,7 +209,7 @@ private struct WeekRow: View {
let weekEndExclusive = cal.date(byAdding: .day, value: 7, to: weekStart)! let weekEndExclusive = cal.date(byAdding: .day, value: 7, to: weekStart)!
let (placed, extras) = packEvents() let (placed, extras) = packEvents()
let allWeekEvents = store.events(in: weekStart, end: weekEndExclusive) let allWeekEvents = store.events(in: weekStart, end: weekEndExclusive)
let rowHeight = dayNumberRowHeight + CGFloat(maxLanesPerWeek) * (laneHeight + laneSpacing) + 4 let rowHeight = dayNumberRowHeight + CGFloat(maxLanesPerWeek) * (laneHeight + laneSpacing) + 16
let mondayIdx = days.firstIndex(where: { cal.component(.weekday, from: $0) == 2 }) ?? 0 let mondayIdx = days.firstIndex(where: { cal.component(.weekday, from: $0) == 2 }) ?? 0
// Where in this row does a new month start? (col 1...6 = mid-row step; nil = no step) // Where in this row does a new month start? (col 1...6 = mid-row step; nil = no step)
@@ -446,46 +446,57 @@ private struct DayPreviewAllDayBar: View {
private var cal: Calendar { .current } private var cal: Calendar { .current }
var body: some View { var body: some View {
let color = Color(hex: event.effectiveColor) let color = Color(hex: event.effectiveColor)
let dayStart = cal.startOfDay(for: date) let dayStart = cal.startOfDay(for: date)
let dayEnd = cal.date(byAdding: .day, value: 1, to: dayStart)! let dayEnd = cal.date(byAdding: .day, value: 1, to: dayStart)!
// isAllDay endDate is exclusive let cLeft = event.startDate < dayStart
let cLeft = event.startDate < dayStart let cRight = event.endDate > dayEnd // endDate is exclusive for allDay
let cRight = event.endDate > dayEnd Text(event.title)
.font(.system(size: 11, weight: .medium))
.foregroundStyle(.white)
.lineLimit(1)
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.vertical, 3)
.padding(.leading, cLeft ? 14 : 8)
.padding(.trailing, cRight ? 14 : 8)
.background(color)
.clipShape(ChevronBarShape(continuesLeft: cLeft, continuesRight: cRight))
}
}
HStack(spacing: 0) { private struct ChevronBarShape: Shape {
if cLeft { var continuesLeft: Bool
Image(systemName: "chevron.left") var continuesRight: Bool
.font(.system(size: 8, weight: .semibold)) private let tip: CGFloat = 8
.foregroundStyle(.white)
.padding(.leading, 3) func path(in rect: CGRect) -> Path {
} guard continuesLeft || continuesRight else {
Text(event.title) return RoundedRectangle(cornerRadius: 4).path(in: rect)
.font(.system(size: 11, weight: .medium))
.foregroundStyle(.white)
.lineLimit(1)
.padding(.horizontal, 6)
Spacer(minLength: 0)
if cRight {
Image(systemName: "chevron.right")
.font(.system(size: 8, weight: .semibold))
.foregroundStyle(.white)
.padding(.trailing, 3)
}
} }
.frame(maxWidth: .infinity) var p = Path()
.padding(.vertical, 3) let t = min(tip, rect.width / 2)
.background(color) if continuesLeft && continuesRight {
.clipShape( p.move(to: CGPoint(x: t, y: 0))
UnevenRoundedRectangle( p.addLine(to: CGPoint(x: rect.maxX - t, y: 0))
topLeadingRadius: cLeft ? 0 : 4, p.addLine(to: CGPoint(x: rect.maxX, y: rect.midY))
bottomLeadingRadius: cLeft ? 0 : 4, p.addLine(to: CGPoint(x: rect.maxX - t, y: rect.maxY))
bottomTrailingRadius: cRight ? 0 : 4, p.addLine(to: CGPoint(x: t, y: rect.maxY))
topTrailingRadius: cRight ? 0 : 4 p.addLine(to: CGPoint(x: 0, y: rect.midY))
) } else if continuesLeft {
) p.move(to: CGPoint(x: t, y: 0))
.padding(.leading, cLeft ? 0 : 0) p.addLine(to: CGPoint(x: rect.maxX, y: 0))
.padding(.trailing, cRight ? 0 : 0) p.addLine(to: CGPoint(x: rect.maxX, y: rect.maxY))
p.addLine(to: CGPoint(x: t, y: rect.maxY))
p.addLine(to: CGPoint(x: 0, y: rect.midY))
} else {
p.move(to: CGPoint(x: 0, y: 0))
p.addLine(to: CGPoint(x: rect.maxX - t, y: 0))
p.addLine(to: CGPoint(x: rect.maxX, y: rect.midY))
p.addLine(to: CGPoint(x: rect.maxX - t, y: rect.maxY))
p.addLine(to: CGPoint(x: 0, y: rect.maxY))
}
p.closeSubpath()
return p
} }
} }