Save workouts to Apple Health with live watch metrics and a post-workout summary
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.
This commit is contained in:
@@ -34,3 +34,84 @@ enum LoadType: Int, CaseIterable, Codable, Sendable {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// The kind of training a split represents — used to tag the Apple Health workout
|
||||
/// so it lands in the right category (and credits the rings correctly), and to pick
|
||||
/// a MET value when the phone has to estimate calories without watch sensor data.
|
||||
/// Persisted as its raw `Int` on `SplitDocument`; the `HKWorkoutActivityType`
|
||||
/// mapping lives in `Shared/HealthKit/HealthKitMapping.swift` to keep this enum
|
||||
/// HealthKit-free.
|
||||
enum WorkoutActivityType: Int, CaseIterable, Codable, Sendable {
|
||||
case traditionalStrength = 0 // default
|
||||
case functionalStrength = 1
|
||||
case hiit = 2
|
||||
case coreTraining = 3
|
||||
case cardio = 4
|
||||
case cycling = 5
|
||||
|
||||
var displayName: String {
|
||||
switch self {
|
||||
case .traditionalStrength: "Strength Training"
|
||||
case .functionalStrength: "Functional Strength"
|
||||
case .hiit: "HIIT"
|
||||
case .coreTraining: "Core Training"
|
||||
case .cardio: "Cardio"
|
||||
case .cycling: "Cycling"
|
||||
}
|
||||
}
|
||||
|
||||
var systemImage: String {
|
||||
switch self {
|
||||
case .traditionalStrength: "dumbbell.fill"
|
||||
case .functionalStrength: "figure.strengthtraining.functional"
|
||||
case .hiit: "figure.highintensity.intervaltraining"
|
||||
case .coreTraining: "figure.core.training"
|
||||
case .cardio: "figure.run"
|
||||
case .cycling: "figure.outdoor.cycle"
|
||||
}
|
||||
}
|
||||
|
||||
/// Metabolic-equivalent value used only for the phone-side calorie estimate
|
||||
/// (`kcal ≈ MET × bodyweightKg × hours`) when no watch metrics are available.
|
||||
var met: Double {
|
||||
switch self {
|
||||
case .traditionalStrength: 5.0
|
||||
case .functionalStrength: 4.0
|
||||
case .hiit: 8.0
|
||||
case .coreTraining: 4.0
|
||||
case .cardio: 7.0
|
||||
case .cycling: 7.5
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Where a workout's health metrics came from: real watch sensors, or a phone-side
|
||||
/// estimate written when no watch session ran. Persisted in `WorkoutMetrics`.
|
||||
enum MetricSource: String, Codable, Sendable {
|
||||
case watch
|
||||
case phoneEstimate
|
||||
}
|
||||
|
||||
/// Display unit for weights. The stored weight values are plain integers and are
|
||||
/// never rewritten when this changes — switching only relabels what's shown.
|
||||
enum WeightUnit: String, CaseIterable, Codable, Sendable {
|
||||
case lb
|
||||
case kg
|
||||
|
||||
var displayName: String {
|
||||
switch self {
|
||||
case .lb: "Pounds (lb)"
|
||||
case .kg: "Kilograms (kg)"
|
||||
}
|
||||
}
|
||||
|
||||
var abbreviation: String {
|
||||
switch self {
|
||||
case .lb: "lb"
|
||||
case .kg: "kg"
|
||||
}
|
||||
}
|
||||
|
||||
/// Render a stored weight value with the current unit's label, e.g. "135 lb".
|
||||
func format(_ value: Int) -> String { "\(value) \(abbreviation)" }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user