Watch sessions now run an HKLiveWorkoutBuilder: heart rate and active energy are collected live (shown in an in-workout HUD), saved to Health as a real HKWorkout on completion, and carried back to the phone as WorkoutMetrics on the workout document. Phone-only workouts get an estimated Health workout (MET x bodyweight x duration) after a 10s debounce that a late-arriving watch session cancels; a launch sweep backfills workouts completed within the last day. Dedupe is keyed on metrics.healthKitWorkoutUUID plus the metrics source. Splits gain an activity type (strength, functional, HIIT, core, cardio, cycling) that categorizes the Health workout and picks the MET value. A post-workout summary sheet (duration, calories, avg/max HR, HR zones, total volume) fills in live and is also shown on completed workouts. Weights can now display in lb or kg (display-only relabel), synced to the watch over the existing application context. WorkoutDocument schema 1->2 (metrics are irreplaceable, so older apps must quarantine rather than strip them); cache schema 2 rebuilds the SwiftData store with the new metric columns. Deleting a workout in the app intentionally leaves its Health record in place.
187 lines
7.1 KiB
Swift
187 lines
7.1 KiB
Swift
//
|
|
// PlanEditView.swift
|
|
// Workouts
|
|
//
|
|
// Copyright 2025 Rouslan Zenetl. All Rights Reserved.
|
|
//
|
|
|
|
import SwiftUI
|
|
import SwiftData
|
|
|
|
struct PlanEditView: View {
|
|
@Environment(SyncEngine.self) private var sync
|
|
@Environment(\.modelContext) private var modelContext
|
|
@Environment(\.dismiss) private var dismiss
|
|
|
|
let workout: Workout
|
|
let logID: String
|
|
|
|
@State private var sets: Int = 3
|
|
@State private var reps: Int = 12
|
|
@State private var weight: Int = 0
|
|
@State private var durationMinutes: Int = 0
|
|
@State private var durationSeconds: Int = 0
|
|
@State private var selectedLoadType: LoadType = .weight
|
|
@AppStorage("weightUnit") private var weightUnit: WeightUnit = .lb
|
|
|
|
var body: some View {
|
|
NavigationStack {
|
|
Form {
|
|
// Sets and Reps side by side
|
|
Section {
|
|
HStack(spacing: 20) {
|
|
VStack {
|
|
Text("Sets")
|
|
.font(.headline)
|
|
.foregroundColor(.secondary)
|
|
Picker("Sets", selection: $sets) {
|
|
ForEach(1...7, id: \.self) { num in
|
|
Text("\(num)").tag(num)
|
|
}
|
|
}
|
|
.pickerStyle(.wheel)
|
|
.frame(height: 120)
|
|
}
|
|
.frame(maxWidth: .infinity)
|
|
|
|
VStack {
|
|
Text("Reps")
|
|
.font(.headline)
|
|
.foregroundColor(.secondary)
|
|
Picker("Reps", selection: $reps) {
|
|
ForEach(1...40, id: \.self) { num in
|
|
Text("\(num)").tag(num)
|
|
}
|
|
}
|
|
.pickerStyle(.wheel)
|
|
.frame(height: 120)
|
|
}
|
|
.frame(maxWidth: .infinity)
|
|
}
|
|
}
|
|
|
|
// Load Type Picker
|
|
Section {
|
|
Picker("Load Type", selection: $selectedLoadType) {
|
|
Text("Weight").tag(LoadType.weight)
|
|
Text("Time").tag(LoadType.duration)
|
|
}
|
|
.pickerStyle(.segmented)
|
|
}
|
|
|
|
// Weight or Time picker based on load type
|
|
Section {
|
|
if selectedLoadType == .weight {
|
|
VStack {
|
|
Text("Weight")
|
|
.font(.headline)
|
|
.foregroundColor(.secondary)
|
|
Picker("Weight", selection: $weight) {
|
|
ForEach(0...300, id: \.self) { num in
|
|
Text(weightUnit.format(num)).tag(num)
|
|
}
|
|
}
|
|
.pickerStyle(.wheel)
|
|
.frame(height: 150)
|
|
}
|
|
} else {
|
|
HStack(spacing: 20) {
|
|
VStack {
|
|
Text("Mins")
|
|
.font(.headline)
|
|
.foregroundColor(.secondary)
|
|
Picker("Minutes", selection: $durationMinutes) {
|
|
ForEach(0...60, id: \.self) { num in
|
|
Text("\(num)").tag(num)
|
|
}
|
|
}
|
|
.pickerStyle(.wheel)
|
|
.frame(height: 120)
|
|
}
|
|
.frame(maxWidth: .infinity)
|
|
|
|
VStack {
|
|
Text("Secs")
|
|
.font(.headline)
|
|
.foregroundColor(.secondary)
|
|
Picker("Seconds", selection: $durationSeconds) {
|
|
ForEach(0...59, id: \.self) { num in
|
|
Text("\(num)").tag(num)
|
|
}
|
|
}
|
|
.pickerStyle(.wheel)
|
|
.frame(height: 120)
|
|
}
|
|
.frame(maxWidth: .infinity)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.navigationTitle("Edit Plan")
|
|
.navigationBarTitleDisplayMode(.inline)
|
|
.toolbar {
|
|
ToolbarItem(placement: .cancellationAction) {
|
|
Button("Cancel") {
|
|
dismiss()
|
|
}
|
|
}
|
|
ToolbarItem(placement: .confirmationAction) {
|
|
Button("Save") {
|
|
saveChanges()
|
|
dismiss()
|
|
}
|
|
}
|
|
}
|
|
.onAppear {
|
|
if let log = WorkoutDocument(from: workout).logs.first(where: { $0.id == logID }) {
|
|
sets = log.sets
|
|
reps = log.reps
|
|
weight = log.weight
|
|
durationMinutes = log.durationSeconds / 60
|
|
durationSeconds = log.durationSeconds % 60
|
|
selectedLoadType = LoadType(rawValue: log.loadType) ?? .weight
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
private func saveChanges() {
|
|
let totalSeconds = durationMinutes * 60 + durationSeconds
|
|
|
|
// 1) Update the log within the parent workout document.
|
|
var doc = WorkoutDocument(from: workout)
|
|
guard let i = doc.logs.firstIndex(where: { $0.id == logID }) else { return }
|
|
doc.logs[i].sets = sets
|
|
doc.logs[i].reps = reps
|
|
doc.logs[i].weight = weight
|
|
doc.logs[i].durationSeconds = totalSeconds
|
|
doc.logs[i].loadType = selectedLoadType.rawValue
|
|
doc.updatedAt = Date()
|
|
let exerciseName = doc.logs[i].exerciseName
|
|
let workoutDoc = doc
|
|
|
|
// 2) Mirror the plan onto the matching exercise in the split template.
|
|
var splitDoc: SplitDocument?
|
|
if let splitID = doc.splitID,
|
|
let split = CacheMapper.fetchSplit(id: splitID, in: modelContext) {
|
|
var sDoc = SplitDocument(from: split)
|
|
if let ei = sDoc.exercises.firstIndex(where: { $0.name == exerciseName }) {
|
|
sDoc.exercises[ei].sets = sets
|
|
sDoc.exercises[ei].reps = reps
|
|
sDoc.exercises[ei].weight = weight
|
|
sDoc.exercises[ei].durationSeconds = totalSeconds
|
|
sDoc.exercises[ei].loadType = selectedLoadType.rawValue
|
|
sDoc.updatedAt = Date()
|
|
splitDoc = sDoc
|
|
}
|
|
}
|
|
|
|
Task {
|
|
await sync.save(workout: workoutDoc)
|
|
if let splitDoc {
|
|
await sync.save(split: splitDoc)
|
|
}
|
|
}
|
|
}
|
|
}
|