Every completed set now writes a SetEntry (reps/weight or seconds), pre-filled from the plan by transition(to:) so the list checkbox, both run flows, and One More all capture for free; reset clears, skip keeps partials. The rest and finish pages show the just-done set as a pill that opens a stepper sheet for correcting reps and weight (2.5 lb / 1.25 kg steps). The Weight Progression chart plots the top-set actual weight and workout volume sums recorded sets, both falling back to the plan for legacy logs via effectiveSetEntries. Storage side of UX #3 rides along: plan weights are Double now. Schema bumps: SplitDocument 2→3, WorkoutDocument 3→4 (a fractional weight fails an older Int decode, and a rewrite would strip the irreplaceable actuals), SwiftData cache 4→5. A per-log updatedAt is reserved for the future cross-device log merge. Claude-Session: https://claude.ai/code/session_01HJDQQDA9QdP8zByg43H5v3
215 lines
8.3 KiB
Swift
215 lines
8.3 KiB
Swift
//
|
|
// ExerciseAddEditView.swift
|
|
// Workouts
|
|
//
|
|
// Created by rzen on 7/15/25 at 7:12 AM.
|
|
//
|
|
// Copyright 2025 Rouslan Zenetl. All Rights Reserved.
|
|
//
|
|
|
|
import SwiftUI
|
|
import SwiftData
|
|
|
|
struct ExerciseAddEditView: View {
|
|
@Environment(SyncEngine.self) private var sync
|
|
@Environment(\.dismiss) private var dismiss
|
|
|
|
@State private var showingExercisePicker = false
|
|
|
|
// The exercise entity provides initial values (read-only).
|
|
let exercise: Exercise
|
|
// The parent split is needed to rebuild and save the SplitDocument.
|
|
let split: Split
|
|
|
|
// Local editable state
|
|
@State private var exerciseName: String
|
|
@State private var loadType: LoadType
|
|
@State private var minutes: Int
|
|
@State private var seconds: Int
|
|
@State private var weightTens: Int
|
|
@State private var weightOnes: Int
|
|
@State private var reps: Int
|
|
@State private var sets: Int
|
|
// Machine comfort settings. `machineEnabled` mirrors the optionality of the
|
|
// stored `machineSettings` — ON persists a (possibly empty) array, OFF persists
|
|
// nil. `machineSettings` holds the ordered rows while the toggle is on.
|
|
@State private var machineEnabled: Bool
|
|
@State private var machineSettings: [MachineSetting]
|
|
@AppStorage("weightUnit") private var weightUnit: WeightUnit = .lb
|
|
|
|
init(exercise: Exercise, split: Split) {
|
|
self.exercise = exercise
|
|
self.split = split
|
|
|
|
// The tens/ones pickers step whole values; a fractional stored weight
|
|
// shows (and saves back) its whole part until UX #3's UI lands.
|
|
let w = Int(exercise.weight)
|
|
_exerciseName = State(initialValue: exercise.name)
|
|
_loadType = State(initialValue: exercise.loadTypeEnum)
|
|
_minutes = State(initialValue: exercise.durationMinutes)
|
|
_seconds = State(initialValue: exercise.durationSeconds)
|
|
_weightTens = State(initialValue: (w / 10) * 10)
|
|
_weightOnes = State(initialValue: w % 10)
|
|
_reps = State(initialValue: exercise.reps)
|
|
_sets = State(initialValue: exercise.sets)
|
|
_machineEnabled = State(initialValue: exercise.machineSettings != nil)
|
|
_machineSettings = State(initialValue: exercise.machineSettings ?? [])
|
|
}
|
|
|
|
var body: some View {
|
|
NavigationStack {
|
|
Form {
|
|
Section(header: Text("Exercise")) {
|
|
if exerciseName.isEmpty {
|
|
Button(action: {
|
|
showingExercisePicker = true
|
|
}) {
|
|
HStack {
|
|
Text("Select Exercise")
|
|
Spacer()
|
|
Image(systemName: "chevron.right")
|
|
.foregroundColor(.gray)
|
|
}
|
|
}
|
|
} else {
|
|
ListItem(title: exerciseName)
|
|
}
|
|
}
|
|
|
|
Section(header: Text("Sets/Reps")) {
|
|
HStack(alignment: .bottom) {
|
|
VStack(alignment: .center) {
|
|
Text("Sets")
|
|
Picker("", selection: $sets) {
|
|
ForEach(0..<20) { s in
|
|
Text("\(s)").tag(s)
|
|
}
|
|
}
|
|
.frame(height: 100)
|
|
.pickerStyle(.wheel)
|
|
}
|
|
VStack(alignment: .center) {
|
|
Text("Reps")
|
|
Picker("", selection: $reps) {
|
|
ForEach(0..<100) { r in
|
|
Text("\(r)").tag(r)
|
|
}
|
|
}
|
|
.frame(height: 100)
|
|
.pickerStyle(.wheel)
|
|
}
|
|
}
|
|
}
|
|
|
|
Section(
|
|
header: Text("Load Type"),
|
|
footer: Text("For bodyweight exercises choose None. For resistance or weight training select Weight. For exercises that are time oriented (like plank or meditation) select Time.")
|
|
) {
|
|
Picker("", selection: $loadType) {
|
|
ForEach(LoadType.allCases, id: \.self) { load in
|
|
Text(load.name)
|
|
.tag(load)
|
|
}
|
|
}
|
|
.pickerStyle(.segmented)
|
|
}
|
|
|
|
if loadType == .weight {
|
|
Section(header: Text("Weight")) {
|
|
HStack {
|
|
Picker("", selection: $weightTens) {
|
|
ForEach(0..<100) { lbs in
|
|
Text("\(lbs * 10)").tag(lbs * 10)
|
|
}
|
|
}
|
|
.frame(height: 100)
|
|
.pickerStyle(.wheel)
|
|
|
|
Picker("", selection: $weightOnes) {
|
|
ForEach(0..<10) { lbs in
|
|
Text("\(lbs)").tag(lbs)
|
|
}
|
|
}
|
|
.frame(height: 100)
|
|
.pickerStyle(.wheel)
|
|
|
|
Text(weightUnit.abbreviation)
|
|
}
|
|
}
|
|
}
|
|
|
|
if loadType == .duration {
|
|
Section(header: Text("Duration")) {
|
|
HStack {
|
|
Picker("Minutes", selection: $minutes) {
|
|
ForEach(0..<60) { minute in
|
|
Text("\(minute) min").tag(minute)
|
|
}
|
|
}
|
|
.pickerStyle(.wheel)
|
|
|
|
Picker("Seconds", selection: $seconds) {
|
|
ForEach(0..<60) { second in
|
|
Text("\(second) sec").tag(second)
|
|
}
|
|
}
|
|
.pickerStyle(.wheel)
|
|
}
|
|
}
|
|
}
|
|
|
|
Section(
|
|
header: Text("Machine"),
|
|
footer: Text("Turn on for machine-based exercises to record comfort settings (seat height, back-rest incline, pin position…). During a workout you can adjust these and update this default.")
|
|
) {
|
|
Toggle("Machine-based", isOn: $machineEnabled.animation())
|
|
|
|
if machineEnabled {
|
|
MachineSettingsEditor(settings: $machineSettings)
|
|
}
|
|
}
|
|
|
|
}
|
|
.sheet(isPresented: $showingExercisePicker) {
|
|
ExercisePickerView { exerciseNames in
|
|
exerciseName = exerciseNames.first ?? "Unnamed"
|
|
}
|
|
}
|
|
.navigationTitle(exerciseName.isEmpty ? "New Exercise" : exerciseName)
|
|
.toolbar {
|
|
ToolbarItem(placement: .navigationBarLeading) {
|
|
Button("Cancel") {
|
|
dismiss()
|
|
}
|
|
}
|
|
|
|
ToolbarItem(placement: .navigationBarTrailing) {
|
|
Button("Save") {
|
|
saveExercise()
|
|
dismiss()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
private func saveExercise() {
|
|
let newWeight = weightTens + weightOnes
|
|
let durationSecs = minutes * 60 + seconds
|
|
|
|
var doc = SplitDocument(from: split)
|
|
if let idx = doc.exercises.firstIndex(where: { $0.id == exercise.id }) {
|
|
doc.exercises[idx].name = exerciseName
|
|
doc.exercises[idx].sets = sets
|
|
doc.exercises[idx].reps = reps
|
|
doc.exercises[idx].weight = Double(newWeight)
|
|
doc.exercises[idx].loadType = loadType.rawValue
|
|
doc.exercises[idx].durationSeconds = durationSecs
|
|
// ON → a (possibly empty) array; OFF → nil, discarding any prior settings.
|
|
doc.exercises[idx].machineSettings = machineEnabled ? machineSettings : nil
|
|
}
|
|
doc.updatedAt = Date()
|
|
Task { await sync.save(split: doc) }
|
|
}
|
|
}
|