Brendan Chen
2d609043f3
Replace the Opal-style custom presentation with the bare iOS design language, keeping the backend, flows, and accessibility identifiers: - Home: NavigationStack + List; rules now presented as list rows with kind icon, block summary, and trailing live status; '+' in the toolbar - New Rule: plain list of rule types and presets; editor still pushed via navigationDestination - Editor: native Form (DatePicker rows, day circles with summary in the section header, toggle rows with footers, stepper rows); create commits with a prominent 'Add Rule' button replacing Hold to Commit; edit uses toolbar Done plus red Disable/Delete rows - Detail: sheet with inline title + status caption, LabeledContent rows; Edit Rule pushes the editor natively - Default color scheme: drop forced dark mode and custom tint; system appearance and accent throughout - Delete Theme, HoldToCommitButton, RuleCardView and custom chrome - Use concrete Color.primary/secondary in button row labels (the hierarchical styles resolve against the button tint) - Tests: 93 passing; only delta is holdToCommitButton press → commitRuleButton tap in 5 call sites - Spec: add §6 mapping the original presentation to the native one
63 lines
1.7 KiB
Swift
63 lines
1.7 KiB
Swift
//
|
|
// DayOfWeekPicker.swift
|
|
// Severed
|
|
//
|
|
|
|
import SwiftUI
|
|
|
|
/// Seven circular day toggles (S M T W T F S) using system colors, meant to
|
|
/// sit inside a Form/List row. The day-set summary is shown by the enclosing
|
|
/// section header.
|
|
struct DayOfWeekPicker: View {
|
|
@Binding var days: Set<Weekday>
|
|
|
|
var body: some View {
|
|
HStack(spacing: 8) {
|
|
ForEach(Weekday.displayOrder, id: \.self) { day in
|
|
dayToggle(day)
|
|
}
|
|
}
|
|
.padding(.vertical, 4)
|
|
}
|
|
|
|
private func dayToggle(_ day: Weekday) -> some View {
|
|
let isOn = days.contains(day)
|
|
return Button {
|
|
if isOn {
|
|
days.remove(day)
|
|
} else {
|
|
days.insert(day)
|
|
}
|
|
} label: {
|
|
Text(day.shortLabel)
|
|
.font(.subheadline.weight(.semibold))
|
|
.foregroundStyle(isOn ? Color.white : .secondary)
|
|
.frame(maxWidth: .infinity)
|
|
.aspectRatio(1, contentMode: .fit)
|
|
.background(
|
|
isOn ? AnyShapeStyle(.tint) : AnyShapeStyle(Color(.tertiarySystemFill)),
|
|
in: Circle()
|
|
)
|
|
}
|
|
.buttonStyle(.borderless)
|
|
.accessibilityIdentifier("dayToggle-\(day.rawValue)")
|
|
.accessibilityLabel(day.abbreviation)
|
|
.accessibilityAddTraits(isOn ? .isSelected : [])
|
|
}
|
|
}
|
|
|
|
#Preview {
|
|
@Previewable @State var days = Weekday.weekdays
|
|
Form {
|
|
Section {
|
|
DayOfWeekPicker(days: $days)
|
|
} header: {
|
|
HStack {
|
|
Text("On these days").textCase(nil)
|
|
Spacer()
|
|
Text(days.summary).textCase(nil)
|
|
}
|
|
}
|
|
}
|
|
}
|