Show only the day's docket on the Today board and add ad hoc Now workouts
- Due-filter schedules: daily always, fixed days by weekday, one-offs on their date; rest days get an empty state - Workouts with no due schedule row (ad hoc or off-day starts) now render as their own board rows - The + sheet is now "New Workout" with a "When" picker; "Now" (offered when adding on today) skips the schedule and starts the workout directly - Remove the times-per-week scheduling mode everywhere (enum, document, entity, mappers, planner, seeds, tests)
This commit is contained in:
@@ -9,8 +9,45 @@ import IndieSync
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
|
||||
/// Add / edit a schedule: pick a routine, tag it with a goal, and set how often it
|
||||
/// recurs. Fields are snapshotted in `init` so the sheet never holds the live entity.
|
||||
/// The UI-only "When" choice — a superset of `ScheduleRecurrence` with one extra
|
||||
/// option, `.now`, that never gets persisted: it skips the schedule document
|
||||
/// entirely and hands the routine straight back to the caller to start immediately.
|
||||
private enum WhenChoice: String, CaseIterable, Identifiable {
|
||||
case now, once, daily, fixedDays
|
||||
|
||||
var id: String { rawValue }
|
||||
|
||||
var displayName: String {
|
||||
switch self {
|
||||
case .now: "Now"
|
||||
case .once: "Once"
|
||||
case .daily: "Daily"
|
||||
case .fixedDays: "Fixed Days"
|
||||
}
|
||||
}
|
||||
|
||||
/// The persisted recurrence this choice maps to, or nil for `.now` (never persisted).
|
||||
var recurrence: ScheduleRecurrence? {
|
||||
switch self {
|
||||
case .now: nil
|
||||
case .once: .once
|
||||
case .daily: .daily
|
||||
case .fixedDays: .fixedDays
|
||||
}
|
||||
}
|
||||
|
||||
init(recurrence: ScheduleRecurrence) {
|
||||
switch recurrence {
|
||||
case .once: self = .once
|
||||
case .daily: self = .daily
|
||||
case .fixedDays: self = .fixedDays
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Add / edit a workout plan: pick a routine, tag it with a goal, and choose when it
|
||||
/// happens — right now (unscheduled, adding only), once, daily, or on fixed days.
|
||||
/// Fields are snapshotted in `init` so the sheet never holds the live entity.
|
||||
struct ScheduleAddEditView: View {
|
||||
@Environment(SyncEngine.self) private var sync
|
||||
@Environment(\.modelContext) private var modelContext
|
||||
@@ -28,11 +65,19 @@ struct ScheduleAddEditView: View {
|
||||
/// has since been deleted so the user knows what they're reassigning.
|
||||
@State private var originalRoutineName: String
|
||||
@State private var goal: GoalKind?
|
||||
@State private var recurrence: ScheduleRecurrence
|
||||
@State private var when: WhenChoice
|
||||
@State private var weekdays: Set<Int>
|
||||
@State private var timesPerWeek: Int
|
||||
@State private var date: Date
|
||||
|
||||
/// "Now" starts a workout immediately instead of saving a schedule — only offered
|
||||
/// when adding (not editing) for today's default date, since a past/future day
|
||||
/// can't be started "now".
|
||||
private let offersNow: Bool
|
||||
|
||||
/// Called (after dismiss) when the user picks "Now" and taps Start Workout, with
|
||||
/// the routine to start. The Today board starts it and navigates in.
|
||||
private let onStartNow: (Routine) -> Void
|
||||
|
||||
/// Calendar weekday numbers in Monday-first display order (Mon…Sat = 2…7, Sun = 1).
|
||||
private let weekdayOrder = [2, 3, 4, 5, 6, 7, 1]
|
||||
/// Gregorian short names, 0-indexed from Sunday — weekday `n` is `symbols[n - 1]`.
|
||||
@@ -40,17 +85,25 @@ struct ScheduleAddEditView: View {
|
||||
|
||||
/// `defaultDate` seeds the `.once` day when adding — the Today board passes the day
|
||||
/// currently on screen, so "navigate to a day, tap +" plans a one-off for that day.
|
||||
init(schedule: Schedule? = nil, defaultDate: Date = Date()) {
|
||||
init(schedule: Schedule? = nil, defaultDate: Date = Date(),
|
||||
onStartNow: @escaping (Routine) -> Void = { _ in }) {
|
||||
_scheduleID = State(initialValue: schedule?.id)
|
||||
_order = State(initialValue: schedule?.order ?? 0)
|
||||
_createdAt = State(initialValue: schedule?.createdAt ?? Date())
|
||||
_routineID = State(initialValue: schedule?.routineID ?? "")
|
||||
_originalRoutineName = State(initialValue: schedule?.routineName ?? "")
|
||||
_goal = State(initialValue: schedule?.goalKind)
|
||||
_recurrence = State(initialValue: schedule?.recurrenceEnum ?? .once)
|
||||
_weekdays = State(initialValue: Set(schedule?.weekdays ?? []))
|
||||
_timesPerWeek = State(initialValue: schedule?.timesPerWeek ?? 3)
|
||||
_date = State(initialValue: schedule?.date ?? defaultDate)
|
||||
self.onStartNow = onStartNow
|
||||
|
||||
let offersNow = schedule == nil && defaultDate.isSameDay(as: Date())
|
||||
self.offersNow = offersNow
|
||||
if let schedule {
|
||||
_when = State(initialValue: WhenChoice(recurrence: schedule.recurrenceEnum))
|
||||
} else {
|
||||
_when = State(initialValue: offersNow ? .now : .once)
|
||||
}
|
||||
}
|
||||
|
||||
private var isEditing: Bool { scheduleID != nil }
|
||||
@@ -60,7 +113,7 @@ struct ScheduleAddEditView: View {
|
||||
|
||||
private var canSave: Bool {
|
||||
guard selectedRoutine != nil else { return false }
|
||||
if recurrence == .fixedDays { return !weekdays.isEmpty }
|
||||
if when == .fixedDays { return !weekdays.isEmpty }
|
||||
return true
|
||||
}
|
||||
|
||||
@@ -68,17 +121,20 @@ struct ScheduleAddEditView: View {
|
||||
NavigationStack {
|
||||
Form {
|
||||
routineSection
|
||||
goalSection
|
||||
recurrenceSection
|
||||
if when != .now {
|
||||
goalSection
|
||||
}
|
||||
whenSection
|
||||
}
|
||||
.navigationTitle(isEditing ? "Edit Schedule" : "New Schedule")
|
||||
.navigationTitle(isEditing ? "Edit Workout" : "New Workout")
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
.toolbar {
|
||||
ToolbarItem(placement: .navigationBarLeading) {
|
||||
Button("Cancel") { dismiss() }
|
||||
}
|
||||
ToolbarItem(placement: .navigationBarTrailing) {
|
||||
Button("Save", action: save).disabled(!canSave)
|
||||
Button(when == .now ? "Start Workout" : "Save", action: save)
|
||||
.disabled(!canSave)
|
||||
}
|
||||
}
|
||||
.onAppear {
|
||||
@@ -124,28 +180,26 @@ struct ScheduleAddEditView: View {
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
private var recurrenceSection: some View {
|
||||
private var whenSection: some View {
|
||||
Section {
|
||||
Picker("Repeat", selection: $recurrence) {
|
||||
ForEach(ScheduleRecurrence.allCases, id: \.self) { r in
|
||||
Text(r.displayName).tag(r)
|
||||
Picker("When", selection: $when) {
|
||||
ForEach(WhenChoice.allCases) { choice in
|
||||
if choice != .now || offersNow {
|
||||
Text(choice.displayName).tag(choice)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
switch recurrence {
|
||||
switch when {
|
||||
case .now, .daily:
|
||||
EmptyView()
|
||||
case .once:
|
||||
DatePicker("Date", selection: $date, displayedComponents: .date)
|
||||
case .daily:
|
||||
EmptyView()
|
||||
case .fixedDays:
|
||||
weekdayPicker
|
||||
case .frequency:
|
||||
Stepper(value: $timesPerWeek, in: 1...7) {
|
||||
Text("\(timesPerWeek)× per week")
|
||||
}
|
||||
}
|
||||
} header: {
|
||||
Text("Repeat")
|
||||
Text("When")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -174,6 +228,15 @@ struct ScheduleAddEditView: View {
|
||||
|
||||
private func save() {
|
||||
guard let routine = selectedRoutine else { return }
|
||||
|
||||
// "Now" never persists a schedule — dismiss and hand the routine back so the
|
||||
// Today board starts it immediately (mirroring its own start path).
|
||||
guard let recurrence = when.recurrence else {
|
||||
dismiss()
|
||||
onStartNow(routine)
|
||||
return
|
||||
}
|
||||
|
||||
let doc = ScheduleDocument(
|
||||
schemaVersion: ScheduleDocument.currentSchemaVersion,
|
||||
id: scheduleID ?? ULID.make(),
|
||||
@@ -182,7 +245,6 @@ struct ScheduleAddEditView: View {
|
||||
goal: goal?.rawValue,
|
||||
recurrence: recurrence.rawValue,
|
||||
weekdays: recurrence == .fixedDays ? weekdays.sorted() : nil,
|
||||
timesPerWeek: recurrence == .frequency ? timesPerWeek : nil,
|
||||
date: recurrence == .once ? date : nil,
|
||||
order: isEditing ? order : nextOrder(),
|
||||
createdAt: createdAt,
|
||||
|
||||
Reference in New Issue
Block a user