+8 -4

WorkoutEditor.xcodeproj/project.pbxproj

··· 8 8 9 9 /* Begin PBXBuildFile section */ 10 10 06E7DFAC2B3608DD0025260F /* WorkoutEditorApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06E7DFAB2B3608DD0025260F /* WorkoutEditorApp.swift */; }; 11 11 - 06E7DFAE2B3608DD0025260F /* WorkoutAddView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06E7DFAD2B3608DD0025260F /* WorkoutAddView.swift */; }; 12 11 06E7DFB02B3608E00025260F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 06E7DFAF2B3608E00025260F /* Assets.xcassets */; }; 13 12 06E7DFB32B3608E00025260F /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 06E7DFB22B3608E00025260F /* Preview Assets.xcassets */; }; 14 13 06E7DFC32B3653F70025260F /* HealthKitManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06E7DFC22B3653F70025260F /* HealthKitManager.swift */; }; 15 14 06E7DFC52B3654500025260F /* WorkoutListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06E7DFC42B3654500025260F /* WorkoutListView.swift */; }; 16 15 06E7DFC72B3654D50025260F /* WorkoutEditView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06E7DFC62B3654D50025260F /* WorkoutEditView.swift */; }; 16 16 + AA000001AAAA000100000001 /* ActivityGraphView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA000001AAAA000100000002 /* ActivityGraphView.swift */; }; 17 17 + AA000002AAAA000200000001 /* RangeSliderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA000002AAAA000200000002 /* RangeSliderView.swift */; }; 17 18 /* End PBXBuildFile section */ 18 19 19 20 /* Begin PBXFileReference section */ 20 21 063E686B2B45161B0048778C /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = System/Library/Frameworks/HealthKit.framework; sourceTree = SDKROOT; }; 21 22 06E7DFA82B3608DD0025260F /* WorkoutEditor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WorkoutEditor.app; sourceTree = BUILT_PRODUCTS_DIR; }; 22 23 06E7DFAB2B3608DD0025260F /* WorkoutEditorApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkoutEditorApp.swift; sourceTree = "<group>"; }; 23 23 - 06E7DFAD2B3608DD0025260F /* WorkoutAddView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkoutAddView.swift; sourceTree = "<group>"; }; 24 24 06E7DFAF2B3608E00025260F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; }; 25 25 + AA000001AAAA000100000002 /* ActivityGraphView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityGraphView.swift; sourceTree = "<group>"; }; 26 26 + AA000002AAAA000200000002 /* RangeSliderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RangeSliderView.swift; sourceTree = "<group>"; }; 25 27 06E7DFB22B3608E00025260F /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; }; 26 28 06E7DFB92B3609EA0025260F /* WorkoutEditor.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WorkoutEditor.entitlements; sourceTree = "<group>"; }; 27 29 06E7DFC22B3653F70025260F /* HealthKitManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HealthKitManager.swift; sourceTree = "<group>"; }; ··· 72 74 06E7DFC82B3668D10025260F /* Info.plist */, 73 75 06E7DFB92B3609EA0025260F /* WorkoutEditor.entitlements */, 74 76 06E7DFAB2B3608DD0025260F /* WorkoutEditorApp.swift */, 75 75 - 06E7DFAD2B3608DD0025260F /* WorkoutAddView.swift */, 76 77 06E7DFC62B3654D50025260F /* WorkoutEditView.swift */, 78 78 + AA000001AAAA000100000002 /* ActivityGraphView.swift */, 79 79 + AA000002AAAA000200000002 /* RangeSliderView.swift */, 77 80 06E7DFC42B3654500025260F /* WorkoutListView.swift */, 78 81 06E7DFC22B3653F70025260F /* HealthKitManager.swift */, 79 82 06E7DFAF2B3608E00025260F /* Assets.xcassets */, ··· 160 163 isa = PBXSourcesBuildPhase; 161 164 buildActionMask = 2147483647; 162 165 files = ( 163 163 - 06E7DFAE2B3608DD0025260F /* WorkoutAddView.swift in Sources */, 164 166 06E7DFAC2B3608DD0025260F /* WorkoutEditorApp.swift in Sources */, 165 167 06E7DFC52B3654500025260F /* WorkoutListView.swift in Sources */, 166 168 06E7DFC32B3653F70025260F /* HealthKitManager.swift in Sources */, 167 169 06E7DFC72B3654D50025260F /* WorkoutEditView.swift in Sources */, 170 170 + AA000001AAAA000100000001 /* ActivityGraphView.swift in Sources */, 171 171 + AA000002AAAA000200000001 /* RangeSliderView.swift in Sources */, 168 172 ); 169 173 runOnlyForDeploymentPostprocessing = 0; 170 174 };

+71

WorkoutEditor/ActivityGraphView.swift

··· 1 1 + import SwiftUI 2 2 + import Charts 3 3 + 4 4 + struct ActivityGraphView: View { 5 5 + let samples: [IntensitySample] 6 6 + let metric: IntensityMetric 7 7 + let lowerBound: Double 8 8 + let upperBound: Double 9 9 + 10 10 + var body: some View { 11 11 + Chart { 12 12 + ForEach(samples) { sample in 13 13 + AreaMark( 14 14 + x: .value("Time", sample.date), 15 15 + y: .value(metric.label, sample.value) 16 16 + ) 17 17 + .foregroundStyle( 18 18 + .linearGradient( 19 19 + colors: [.blue.opacity(0.3), .blue.opacity(0.05)], 20 20 + startPoint: .top, 21 21 + endPoint: .bottom 22 22 + ) 23 23 + ) 24 24 + 25 25 + LineMark( 26 26 + x: .value("Time", sample.date), 27 27 + y: .value(metric.label, sample.value) 28 28 + ) 29 29 + .foregroundStyle(.blue) 30 30 + .lineStyle(StrokeStyle(lineWidth: 1.5)) 31 31 + } 32 32 + 33 33 + // Dimming overlay for trimmed start region 34 34 + if lowerBound > 0, let startDate = samples.first?.date, let endDate = samples.last?.date { 35 35 + let trimStart = startDate.addingTimeInterval( 36 36 + lowerBound * endDate.timeIntervalSince(startDate) 37 37 + ) 38 38 + RectangleMark( 39 39 + xStart: .value("", startDate), 40 40 + xEnd: .value("", trimStart) 41 41 + ) 42 42 + .foregroundStyle(Color(.systemBackground).opacity(0.7)) 43 43 + } 44 44 + 45 45 + // Dimming overlay for trimmed end region 46 46 + if upperBound < 1, let startDate = samples.first?.date, let endDate = samples.last?.date { 47 47 + let trimEnd = startDate.addingTimeInterval( 48 48 + upperBound * endDate.timeIntervalSince(startDate) 49 49 + ) 50 50 + RectangleMark( 51 51 + xStart: .value("", trimEnd), 52 52 + xEnd: .value("", endDate) 53 53 + ) 54 54 + .foregroundStyle(Color(.systemBackground).opacity(0.7)) 55 55 + } 56 56 + } 57 57 + .chartXAxis(.hidden) 58 58 + .chartYAxis { 59 59 + AxisMarks(position: .leading, values: .automatic(desiredCount: 3)) { value in 60 60 + AxisGridLine() 61 61 + AxisValueLabel { 62 62 + if let v = value.as(Double.self) { 63 63 + Text("\(Int(v))") 64 64 + .font(.caption2) 65 65 + } 66 66 + } 67 67 + } 68 68 + } 69 69 + .chartYAxisLabel(metric.label, position: .leading) 70 70 + } 71 71 + }

+155 -2

WorkoutEditor/HealthKitManager.swift

··· 1 1 import Foundation 2 2 import HealthKit 3 3 4 4 + struct IntensitySample: Identifiable { 5 5 + let id = UUID() 6 6 + let date: Date 7 7 + let value: Double 8 8 + } 9 9 + 10 10 + enum IntensityMetric { 11 11 + case heartRate 12 12 + case activeEnergy 13 13 + case distance 14 14 + 15 15 + var unit: HKUnit { 16 16 + switch self { 17 17 + case .heartRate: .count().unitDivided(by: .minute()) 18 18 + case .activeEnergy: .kilocalorie() 19 19 + case .distance: .meter() 20 20 + } 21 21 + } 22 22 + 23 23 + var label: String { 24 24 + switch self { 25 25 + case .heartRate: "BPM" 26 26 + case .activeEnergy: "kcal" 27 27 + case .distance: "m" 28 28 + } 29 29 + } 30 30 + 31 31 + var quantityType: HKQuantityType { 32 32 + switch self { 33 33 + case .heartRate: HKQuantityType(.heartRate) 34 34 + case .activeEnergy: HKQuantityType(.activeEnergyBurned) 35 35 + case .distance: HKQuantityType(.distanceWalkingRunning) 36 36 + } 37 37 + } 38 38 + } 39 39 + 4 40 @Observable 5 41 class HealthKitManager { 6 42 static let shared = HealthKitManager() ··· 13 49 throw HealthKitError.healthDataNotAvailable 14 50 } 15 51 16 16 - let typesToRead: Set<HKObjectType> = [HKObjectType.workoutType()] 17 17 - let typesToWrite: Set<HKSampleType> = [HKObjectType.workoutType()] 52 52 + let typesToRead: Set<HKObjectType> = [ 53 53 + HKObjectType.workoutType(), 54 54 + HKQuantityType(.heartRate), 55 55 + HKQuantityType(.activeEnergyBurned), 56 56 + HKQuantityType(.distanceWalkingRunning), 57 57 + HKQuantityType(.distanceCycling), 58 58 + ] 59 59 + let typesToWrite: Set<HKSampleType> = [ 60 60 + HKObjectType.workoutType(), 61 61 + HKQuantityType(.heartRate), 62 62 + ] 18 63 19 64 try await healthStore.requestAuthorization(toShare: typesToWrite, read: typesToRead) 20 65 } ··· 37 82 } 38 83 } 39 84 85 85 + func fetchIntensitySamples(for workout: HKWorkout) async -> (samples: [IntensitySample], metric: IntensityMetric) { 86 86 + let metrics: [IntensityMetric] = [.heartRate, .activeEnergy, .distance] 87 87 + 88 88 + for metric in metrics { 89 89 + let predicate = HKQuery.predicateForSamples( 90 90 + withStart: workout.startDate, 91 91 + end: workout.endDate, 92 92 + options: .strictStartDate 93 93 + ) 94 94 + let sortDescriptor = SortDescriptor(\HKQuantitySample.startDate, order: .forward) 95 95 + let descriptor = HKSampleQueryDescriptor( 96 96 + predicates: [.quantitySample(type: metric.quantityType, predicate: predicate)], 97 97 + sortDescriptors: [sortDescriptor], 98 98 + limit: 5000 99 99 + ) 100 100 + 101 101 + do { 102 102 + let results = try await descriptor.result(for: healthStore) 103 103 + if !results.isEmpty { 104 104 + var samples = results.map { sample in 105 105 + IntensitySample( 106 106 + date: sample.startDate, 107 107 + value: sample.quantity.doubleValue(for: metric.unit) 108 108 + ) 109 109 + } 110 110 + if samples.count > 500 { 111 111 + samples = downsample(samples, to: 500) 112 112 + } 113 113 + return (samples, metric) 114 114 + } 115 115 + } catch { 116 116 + print("Error fetching \(metric.label): \(error.localizedDescription)") 117 117 + } 118 118 + } 119 119 + 120 120 + return ([], .heartRate) 121 121 + } 122 122 + 123 123 + private func downsample(_ samples: [IntensitySample], to target: Int) -> [IntensitySample] { 124 124 + let stride = Double(samples.count) / Double(target) 125 125 + return (0..<target).map { i in 126 126 + samples[min(Int(Double(i) * stride), samples.count - 1)] 127 127 + } 128 128 + } 129 129 + 40 130 func saveWorkout(activityType: HKWorkoutActivityType, start: Date, end: Date, metadata: [String: Any]? = nil) async throws { 41 131 let configuration = HKWorkoutConfiguration() 42 132 configuration.activityType = activityType ··· 55 145 func deleteWorkout(_ workout: HKWorkout) async throws { 56 146 try await healthStore.delete(workout) 57 147 } 148 148 + 149 149 + #if DEBUG 150 150 + func insertSampleWorkouts() async throws { 151 151 + let samples: [(HKWorkoutActivityType, TimeInterval, TimeInterval)] = [ 152 152 + (.running, -3600 * 25, 60 * 60), // yesterday, 30 min active + 30 min forgot-to-stop 153 153 + (.cycling, -3600 * 50, 90 * 60), 154 154 + (.swimming, -3600 * 74, 30 * 60), 155 155 + (.hiking, -3600 * 100, 120 * 60), 156 156 + ] 157 157 + 158 158 + for (type, startOffset, duration) in samples { 159 159 + let start = Date(timeIntervalSinceNow: startOffset) 160 160 + let end = start.addingTimeInterval(duration) 161 161 + 162 162 + let configuration = HKWorkoutConfiguration() 163 163 + configuration.activityType = type 164 164 + 165 165 + let builder = HKWorkoutBuilder(healthStore: healthStore, configuration: configuration, device: nil) 166 166 + try await builder.beginCollection(at: start) 167 167 + 168 168 + // Generate realistic heart rate samples with a drop-off at the end 169 169 + let hrType = HKQuantityType(.heartRate) 170 170 + let bpmUnit = HKUnit.count().unitDivided(by: .minute()) 171 171 + let sampleInterval: TimeInterval = 5 // every 5 seconds 172 172 + let totalSamples = Int(duration / sampleInterval) 173 173 + var hrSamples: [HKQuantitySample] = [] 174 174 + 175 175 + for i in 0..<totalSamples { 176 176 + let elapsed = Double(i) / Double(totalSamples) 177 177 + let sampleDate = start.addingTimeInterval(Double(i) * sampleInterval) 178 178 + 179 179 + let bpm: Double 180 180 + if elapsed < 0.05 { 181 181 + // Ramp up 182 182 + bpm = 70 + (elapsed / 0.05) * 80 183 183 + } else if elapsed < 0.47 { 184 184 + // Sustained effort (~28 min of a 60 min workout, or ~70% of shorter ones) 185 185 + bpm = 145 + Double.random(in: -15...15) 186 186 + } else if elapsed < 0.5 { 187 187 + // Sharp drop-off 188 188 + let dropProgress = (elapsed - 0.47) / 0.03 189 189 + bpm = 145 - dropProgress * 80 190 190 + } else { 191 191 + // Resting / idle tail (forgot to stop — whole second half) 192 192 + bpm = 62 + Double.random(in: -5...8) 193 193 + } 194 194 + 195 195 + let quantity = HKQuantity(unit: bpmUnit, doubleValue: max(bpm, 50)) 196 196 + let sample = HKQuantitySample( 197 197 + type: hrType, 198 198 + quantity: quantity, 199 199 + start: sampleDate, 200 200 + end: sampleDate.addingTimeInterval(sampleInterval) 201 201 + ) 202 202 + hrSamples.append(sample) 203 203 + } 204 204 + 205 205 + try await builder.addSamples(hrSamples) 206 206 + try await builder.endCollection(at: end) 207 207 + try await builder.finishWorkout() 208 208 + } 209 209 + } 210 210 + #endif 58 211 } 59 212 60 213 enum HealthKitError: LocalizedError {

+64

WorkoutEditor/RangeSliderView.swift

··· 1 1 + import SwiftUI 2 2 + 3 3 + struct RangeSliderView: View { 4 4 + @Binding var lowerBound: Double 5 5 + @Binding var upperBound: Double 6 6 + 7 7 + private let thumbSize: CGFloat = 24 8 8 + private let trackHeight: CGFloat = 6 9 9 + private let minimumGap: Double = 0.02 10 10 + 11 11 + var body: some View { 12 12 + GeometryReader { geometry in 13 13 + let width = geometry.size.width - thumbSize 14 14 + ZStack(alignment: .leading) { 15 15 + // Background track 16 16 + Capsule() 17 17 + .fill(Color(UIColor.systemGray4)) 18 18 + .frame(height: trackHeight) 19 19 + .padding(.horizontal, thumbSize / 2) 20 20 + 21 21 + // Selected range 22 22 + Capsule() 23 23 + .fill(Color.accentColor) 24 24 + .frame( 25 25 + width: CGFloat(upperBound - lowerBound) * width, 26 26 + height: trackHeight 27 27 + ) 28 28 + .offset(x: thumbSize / 2 + CGFloat(lowerBound) * width) 29 29 + 30 30 + // Lower thumb 31 31 + thumb() 32 32 + .offset(x: CGFloat(lowerBound) * width) 33 33 + .gesture( 34 34 + DragGesture() 35 35 + .onChanged { value in 36 36 + let new = Double(value.location.x / width) 37 37 + lowerBound = min(max(new, 0), upperBound - minimumGap) 38 38 + } 39 39 + ) 40 40 + 41 41 + // Upper thumb 42 42 + thumb() 43 43 + .offset(x: CGFloat(upperBound) * width) 44 44 + .gesture( 45 45 + DragGesture() 46 46 + .onChanged { value in 47 47 + let new = Double(value.location.x / width) 48 48 + upperBound = max(min(new, 1), lowerBound + minimumGap) 49 49 + } 50 50 + ) 51 51 + } 52 52 + .frame(height: 44) 53 53 + } 54 54 + .frame(height: 44) 55 55 + } 56 56 + 57 57 + private func thumb() -> some View { 58 58 + Circle() 59 59 + .fill(.white) 60 60 + .shadow(color: .black.opacity(0.15), radius: 3, y: 1) 61 61 + .frame(width: thumbSize, height: thumbSize) 62 62 + .contentShape(Rectangle().size(width: 44, height: 44)) 63 63 + } 64 64 + }

-115

WorkoutEditor/WorkoutAddView.swift

··· 1 1 - import SwiftUI 2 2 - import HealthKit 3 3 - 4 4 - struct WorkoutAddView: View { 5 5 - @Environment(\.dismiss) private var dismiss 6 6 - 7 7 - @State private var selectedActivityType: HKWorkoutActivityType = .running 8 8 - @State private var startTime = Date() 9 9 - @State private var endTime = Date() 10 10 - @State private var errorMessage: String? 11 11 - 12 12 - private var isValid: Bool { 13 13 - endTime > startTime 14 14 - } 15 15 - 16 16 - var body: some View { 17 17 - Form { 18 18 - Section("New Workout Details") { 19 19 - DatePicker("Start", selection: $startTime) 20 20 - DatePicker("End", selection: $endTime) 21 21 - 22 22 - Picker("Activity Type", selection: $selectedActivityType) { 23 23 - ForEach(HKWorkoutActivityType.commonTypes, id: \.self) { type in 24 24 - Text(type.activityTypeDescription).tag(type) 25 25 - } 26 26 - } 27 27 - } 28 28 - 29 29 - if !isValid { 30 30 - Section { 31 31 - Label("End time must be after start time.", systemImage: "exclamationmark.triangle") 32 32 - .foregroundStyle(.red) 33 33 - } 34 34 - } 35 35 - 36 36 - Section { 37 37 - Button("Save Workout") { 38 38 - saveWorkout() 39 39 - } 40 40 - .disabled(!isValid) 41 41 - } 42 42 - 43 43 - if let errorMessage { 44 44 - Section { 45 45 - Label(errorMessage, systemImage: "xmark.circle") 46 46 - .foregroundStyle(.red) 47 47 - } 48 48 - } 49 49 - } 50 50 - .navigationTitle("Add Workout") 51 51 - .navigationBarTitleDisplayMode(.inline) 52 52 - } 53 53 - 54 54 - private func saveWorkout() { 55 55 - Task { 56 56 - do { 57 57 - let metadata = [HKMetadataKeyTimeZone: TimeZone.current.identifier] 58 58 - try await HealthKitManager.shared.saveWorkout( 59 59 - activityType: selectedActivityType, 60 60 - start: startTime, 61 61 - end: endTime, 62 62 - metadata: metadata 63 63 - ) 64 64 - await HealthKitManager.shared.loadWorkouts() 65 65 - dismiss() 66 66 - } catch { 67 67 - errorMessage = error.localizedDescription 68 68 - } 69 69 - } 70 70 - } 71 71 - } 72 72 - 73 73 - // MARK: - Activity Type Helpers 74 74 - 75 75 - extension HKWorkoutActivityType { 76 76 - static let commonTypes: [HKWorkoutActivityType] = [ 77 77 - .running, .walking, .hiking, .cycling, .swimming, 78 78 - .yoga, .functionalStrengthTraining, .traditionalStrengthTraining, 79 79 - .crossTraining, .elliptical, .rowing, .stairClimbing, 80 80 - .highIntensityIntervalTraining, .socialDance, .cooldown, 81 81 - .coreTraining, .pilates, .kickboxing, .boxing, .climbing 82 82 - ] 83 83 - 84 84 - var activityTypeDescription: String { 85 85 - switch self { 86 86 - case .running: "Running" 87 87 - case .walking: "Walking" 88 88 - case .hiking: "Hiking" 89 89 - case .cycling: "Cycling" 90 90 - case .swimming: "Swimming" 91 91 - case .yoga: "Yoga" 92 92 - case .functionalStrengthTraining: "Functional Strength" 93 93 - case .traditionalStrengthTraining: "Strength Training" 94 94 - case .crossTraining: "Cross Training" 95 95 - case .elliptical: "Elliptical" 96 96 - case .rowing: "Rowing" 97 97 - case .stairClimbing: "Stair Climbing" 98 98 - case .highIntensityIntervalTraining: "HIIT" 99 99 - case .socialDance: "Dance" 100 100 - case .cooldown: "Cooldown" 101 101 - case .coreTraining: "Core Training" 102 102 - case .pilates: "Pilates" 103 103 - case .kickboxing: "Kickboxing" 104 104 - case .boxing: "Boxing" 105 105 - case .climbing: "Climbing" 106 106 - default: "Other" 107 107 - } 108 108 - } 109 109 - } 110 110 - 111 111 - #Preview { 112 112 - NavigationStack { 113 113 - WorkoutAddView() 114 114 - } 115 115 - }

+183 -42

WorkoutEditor/WorkoutEditView.swift

··· 5 5 let workout: HKWorkout 6 6 @Environment(\.dismiss) private var dismiss 7 7 8 8 - @State private var editedStartTime: Date 9 9 - @State private var editedEndTime: Date 8 8 + @State private var lowerBound: Double = 0 9 9 + @State private var upperBound: Double = 1 10 10 @State private var editedActivityType: HKWorkoutActivityType 11 11 + @State private var intensitySamples: [IntensitySample] = [] 12 12 + @State private var intensityMetric: IntensityMetric = .heartRate 13 13 + @State private var isLoadingSamples = true 11 14 @State private var showSaveAlert = false 12 15 @State private var showDeleteAlert = false 13 16 @State private var errorMessage: String? 14 17 15 18 init(workout: HKWorkout) { 16 19 self.workout = workout 17 17 - _editedStartTime = State(initialValue: workout.startDate) 18 18 - _editedEndTime = State(initialValue: workout.endDate) 19 20 _editedActivityType = State(initialValue: workout.workoutActivityType) 20 21 } 21 22 23 23 + private var workoutDuration: TimeInterval { 24 24 + workout.endDate.timeIntervalSince(workout.startDate) 25 25 + } 26 26 + 27 27 + private var trimmedStartDate: Date { 28 28 + workout.startDate.addingTimeInterval(lowerBound * workoutDuration) 29 29 + } 30 30 + 31 31 + private var trimmedEndDate: Date { 32 32 + workout.startDate.addingTimeInterval(upperBound * workoutDuration) 33 33 + } 34 34 + 35 35 + private var trimmedDuration: TimeInterval { 36 36 + trimmedEndDate.timeIntervalSince(trimmedStartDate) 37 37 + } 38 38 + 22 39 private var isValid: Bool { 23 23 - editedEndTime > editedStartTime 40 40 + trimmedDuration > 0 24 41 } 25 42 26 43 var body: some View { 27 27 - Form { 28 28 - Section("Workout Details") { 29 29 - DatePicker("Start", selection: $editedStartTime) 30 30 - DatePicker("End", selection: $editedEndTime) 44 44 + ScrollView { 45 45 + VStack(spacing: 20) { 46 46 + // Activity graph 47 47 + Group { 48 48 + if isLoadingSamples { 49 49 + ProgressView("Loading activity data...") 50 50 + .frame(height: 200) 51 51 + } else if intensitySamples.isEmpty { 52 52 + ContentUnavailableView( 53 53 + "No Activity Data", 54 54 + systemImage: "waveform.slash", 55 55 + description: Text("No heart rate or activity samples found for this workout.") 56 56 + ) 57 57 + .frame(height: 200) 58 58 + } else { 59 59 + ActivityGraphView( 60 60 + samples: intensitySamples, 61 61 + metric: intensityMetric, 62 62 + lowerBound: lowerBound, 63 63 + upperBound: upperBound 64 64 + ) 65 65 + .frame(height: 200) 66 66 + } 67 67 + } 68 68 + .padding(.horizontal) 69 69 + 70 70 + // Range slider 71 71 + RangeSliderView(lowerBound: $lowerBound, upperBound: $upperBound) 72 72 + .padding(.horizontal) 73 73 + 74 74 + // Time labels 75 75 + HStack { 76 76 + VStack(alignment: .leading) { 77 77 + Text("Start") 78 78 + .font(.caption) 79 79 + .foregroundStyle(.secondary) 80 80 + Text(trimmedStartDate.formatted(date: .omitted, time: .shortened)) 81 81 + .font(.subheadline.monospacedDigit()) 82 82 + } 31 83 32 32 - Picker("Activity Type", selection: $editedActivityType) { 33 33 - ForEach(HKWorkoutActivityType.commonTypes, id: \.self) { type in 34 34 - Text(type.activityTypeDescription).tag(type) 84 84 + Spacer() 85 85 + 86 86 + VStack { 87 87 + Text("Duration") 88 88 + .font(.caption) 89 89 + .foregroundStyle(.secondary) 90 90 + Text(formattedDuration(trimmedDuration)) 91 91 + .font(.subheadline.monospacedDigit()) 92 92 + } 93 93 + 94 94 + Spacer() 95 95 + 96 96 + VStack(alignment: .trailing) { 97 97 + Text("End") 98 98 + .font(.caption) 99 99 + .foregroundStyle(.secondary) 100 100 + Text(trimmedEndDate.formatted(date: .omitted, time: .shortened)) 101 101 + .font(.subheadline.monospacedDigit()) 35 102 } 36 103 } 37 37 - } 104 104 + .padding(.horizontal) 38 105 39 39 - if !isValid { 40 40 - Section { 41 41 - Label("End time must be after start time.", systemImage: "exclamationmark.triangle") 42 42 - .foregroundStyle(.red) 106 106 + Divider() 107 107 + .padding(.horizontal) 108 108 + 109 109 + // Activity type picker 110 110 + HStack { 111 111 + Text("Activity Type") 112 112 + Spacer() 113 113 + Picker("Activity Type", selection: $editedActivityType) { 114 114 + ForEach(HKWorkoutActivityType.commonTypes, id: \.self) { type in 115 115 + Text(type.activityTypeDescription).tag(type) 116 116 + } 117 117 + } 118 118 + .labelsHidden() 43 119 } 44 44 - } 120 120 + .padding(.horizontal) 121 121 + 122 122 + Divider() 123 123 + .padding(.horizontal) 45 124 46 46 - Section { 47 47 - Button("Save Changes") { 48 48 - showSaveAlert = true 49 49 - } 50 50 - .disabled(!isValid) 51 51 - .alert("Save Changes", isPresented: $showSaveAlert) { 52 52 - Button("Save") { saveChanges() } 53 53 - Button("Cancel", role: .cancel) {} 54 54 - } message: { 55 55 - Text("Are you sure you want to save these changes?") 56 56 - } 125 125 + // Action buttons 126 126 + VStack(spacing: 12) { 127 127 + Button { 128 128 + showSaveAlert = true 129 129 + } label: { 130 130 + Text("Save Changes") 131 131 + .frame(maxWidth: .infinity) 132 132 + } 133 133 + .buttonStyle(.borderedProminent) 134 134 + .disabled(!isValid) 57 135 58 58 - Button("Delete Workout", role: .destructive) { 59 59 - showDeleteAlert = true 60 60 - } 61 61 - .alert("Delete Workout", isPresented: $showDeleteAlert) { 62 62 - Button("Delete", role: .destructive) { deleteWorkout() } 63 63 - Button("Cancel", role: .cancel) {} 64 64 - } message: { 65 65 - Text("This action cannot be undone.") 136 136 + Button(role: .destructive) { 137 137 + showDeleteAlert = true 138 138 + } label: { 139 139 + Text("Delete Workout") 140 140 + .frame(maxWidth: .infinity) 141 141 + } 142 142 + .buttonStyle(.bordered) 66 143 } 67 67 - } 144 144 + .padding(.horizontal) 68 145 69 69 - if let errorMessage { 70 70 - Section { 146 146 + if let errorMessage { 71 147 Label(errorMessage, systemImage: "xmark.circle") 72 148 .foregroundStyle(.red) 149 149 + .padding(.horizontal) 73 150 } 74 151 } 152 152 + .padding(.vertical) 75 153 } 76 154 .navigationTitle(workout.workoutActivityType.activityTypeDescription) 77 155 .navigationBarTitleDisplayMode(.inline) 156 156 + .task { 157 157 + let result = await HealthKitManager.shared.fetchIntensitySamples(for: workout) 158 158 + intensitySamples = result.samples 159 159 + intensityMetric = result.metric 160 160 + isLoadingSamples = false 161 161 + } 162 162 + .alert("Save Changes", isPresented: $showSaveAlert) { 163 163 + Button("Save", role: .destructive) { saveChanges() } 164 164 + Button("Cancel", role: .cancel) {} 165 165 + } message: { 166 166 + Text("This will delete the original workout and replace it with the trimmed version.\n\nTHIS ACTION CANNOT BE UNDONE.") 167 167 + } 168 168 + .alert("Delete Workout", isPresented: $showDeleteAlert) { 169 169 + Button("Delete", role: .destructive) { deleteWorkout() } 170 170 + Button("Cancel", role: .cancel) {} 171 171 + } message: { 172 172 + Text("This action cannot be undone.") 173 173 + } 174 174 + } 175 175 + 176 176 + private func formattedDuration(_ duration: TimeInterval) -> String { 177 177 + let formatter = DateComponentsFormatter() 178 178 + formatter.allowedUnits = [.hour, .minute, .second] 179 179 + formatter.unitsStyle = .abbreviated 180 180 + return formatter.string(from: duration) ?? "" 78 181 } 79 182 80 183 private func saveChanges() { ··· 82 185 do { 83 186 try await HealthKitManager.shared.saveWorkout( 84 187 activityType: editedActivityType, 85 85 - start: editedStartTime, 86 86 - end: editedEndTime, 188 188 + start: trimmedStartDate, 189 189 + end: trimmedEndDate, 87 190 metadata: workout.metadata as [String: Any]? 88 191 ) 89 192 try await HealthKitManager.shared.deleteWorkout(workout) ··· 104 207 } catch { 105 208 errorMessage = error.localizedDescription 106 209 } 210 210 + } 211 211 + } 212 212 + } 213 213 + 214 214 + // MARK: - Activity Type Helpers 215 215 + 216 216 + extension HKWorkoutActivityType { 217 217 + static let commonTypes: [HKWorkoutActivityType] = [ 218 218 + .running, .walking, .hiking, .cycling, .swimming, 219 219 + .yoga, .functionalStrengthTraining, .traditionalStrengthTraining, 220 220 + .crossTraining, .elliptical, .rowing, .stairClimbing, 221 221 + .highIntensityIntervalTraining, .socialDance, .cooldown, 222 222 + .coreTraining, .pilates, .kickboxing, .boxing, .climbing 223 223 + ] 224 224 + 225 225 + var activityTypeDescription: String { 226 226 + switch self { 227 227 + case .running: "Running" 228 228 + case .walking: "Walking" 229 229 + case .hiking: "Hiking" 230 230 + case .cycling: "Cycling" 231 231 + case .swimming: "Swimming" 232 232 + case .yoga: "Yoga" 233 233 + case .functionalStrengthTraining: "Functional Strength" 234 234 + case .traditionalStrengthTraining: "Strength Training" 235 235 + case .crossTraining: "Cross Training" 236 236 + case .elliptical: "Elliptical" 237 237 + case .rowing: "Rowing" 238 238 + case .stairClimbing: "Stair Climbing" 239 239 + case .highIntensityIntervalTraining: "HIIT" 240 240 + case .socialDance: "Dance" 241 241 + case .cooldown: "Cooldown" 242 242 + case .coreTraining: "Core Training" 243 243 + case .pilates: "Pilates" 244 244 + case .kickboxing: "Kickboxing" 245 245 + case .boxing: "Boxing" 246 246 + case .climbing: "Climbing" 247 247 + default: "Other" 107 248 } 108 249 } 109 250 }

+15 -1

WorkoutEditor/WorkoutEditorApp.swift

··· 1 1 import SwiftUI 2 2 + import os 3 3 + 4 4 + private let logger = Logger(subsystem: "com.workouteditor", category: "app") 2 5 3 6 @main 4 7 struct WorkoutEditorApp: App { ··· 8 11 .task { 9 12 do { 10 13 try await HealthKitManager.shared.requestAuthorization() 14 14 + logger.notice("Auth succeeded") 11 15 await HealthKitManager.shared.loadWorkouts() 16 16 + logger.notice("Loaded \(HealthKitManager.shared.loadedWorkouts.count) workouts") 17 17 + #if DEBUG 18 18 + // Reset sample data 19 19 + for workout in HealthKitManager.shared.loadedWorkouts { 20 20 + try await HealthKitManager.shared.deleteWorkout(workout) 21 21 + } 22 22 + try await HealthKitManager.shared.insertSampleWorkouts() 23 23 + await HealthKitManager.shared.loadWorkouts() 24 24 + logger.notice("Reset samples: \(HealthKitManager.shared.loadedWorkouts.count) workouts") 25 25 + #endif 12 26 } catch { 13 13 - print("HealthKit authorization error: \(error.localizedDescription)") 27 27 + logger.error("HealthKit error: \(error)") 14 28 } 15 29 } 16 30 }

+6 -10

WorkoutEditor/WorkoutListView.swift

··· 3 3 4 4 struct WorkoutListView: View { 5 5 var manager = HealthKitManager.shared 6 6 + @Environment(\.scenePhase) private var scenePhase 6 7 7 8 var body: some View { 8 9 NavigationStack { ··· 28 29 WorkoutEditView(workout: workout) 29 30 } 30 31 .navigationTitle("Workouts") 31 31 - .toolbar { 32 32 - ToolbarItem(placement: .topBarTrailing) { 33 33 - NavigationLink(value: "add") { 34 34 - Image(systemName: "plus") 35 35 - } 36 36 - } 37 37 - } 38 38 - .navigationDestination(for: String.self) { _ in 39 39 - WorkoutAddView() 40 40 - } 41 32 .refreshable { 42 33 await manager.loadWorkouts() 34 34 + } 35 35 + .onChange(of: scenePhase) { _, phase in 36 36 + if phase == .active { 37 37 + Task { await manager.loadWorkouts() } 38 38 + } 43 39 } 44 40 .overlay { 45 41 if manager.loadedWorkouts.isEmpty {