rzen
0ad93a09da
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.
122 lines
4.1 KiB
Swift
122 lines
4.1 KiB
Swift
//
|
|
// WeightProgressionChartView.swift
|
|
// Workouts
|
|
//
|
|
// Created on 7/20/25.
|
|
//
|
|
// Copyright 2025 Rouslan Zenetl. All Rights Reserved.
|
|
//
|
|
|
|
import SwiftUI
|
|
import Charts
|
|
import SwiftData
|
|
|
|
struct WeightProgressionChartView: View {
|
|
let exerciseName: String
|
|
|
|
/// Completed logs for this exercise, oldest first.
|
|
@Query private var logs: [WorkoutLog]
|
|
|
|
init(exerciseName: String) {
|
|
self.exerciseName = exerciseName
|
|
let name = exerciseName
|
|
_logs = Query(
|
|
filter: #Predicate<WorkoutLog> { $0.exerciseName == name && $0.completed },
|
|
sort: \WorkoutLog.date,
|
|
order: .forward
|
|
)
|
|
}
|
|
|
|
@AppStorage("weightUnit") private var weightUnit: WeightUnit = .lb
|
|
|
|
private var weightData: [WeightDataPoint] {
|
|
logs.map { WeightDataPoint(date: $0.date, weight: $0.weight) }
|
|
}
|
|
|
|
var body: some View {
|
|
VStack(alignment: .leading) {
|
|
if weightData.isEmpty {
|
|
Text("No weight history available yet.")
|
|
.foregroundColor(.secondary)
|
|
.frame(maxWidth: .infinity, alignment: .center)
|
|
.padding()
|
|
} else {
|
|
Text("Weight Progression")
|
|
.font(.headline)
|
|
.padding(.bottom, 4)
|
|
|
|
Chart {
|
|
ForEach(weightData) { dataPoint in
|
|
LineMark(
|
|
x: .value("Date", dataPoint.date),
|
|
y: .value("Weight", dataPoint.weight)
|
|
)
|
|
.foregroundStyle(Color.blue.gradient)
|
|
.interpolationMethod(.catmullRom)
|
|
|
|
PointMark(
|
|
x: .value("Date", dataPoint.date),
|
|
y: .value("Weight", dataPoint.weight)
|
|
)
|
|
.foregroundStyle(Color.blue)
|
|
}
|
|
}
|
|
.chartYScale(domain: .automatic(includesZero: false))
|
|
.chartXAxis {
|
|
AxisMarks(values: .automatic) { _ in
|
|
AxisGridLine()
|
|
AxisValueLabel(format: .dateTime.month().day())
|
|
}
|
|
}
|
|
.frame(height: 200)
|
|
.padding(.bottom, 8)
|
|
|
|
if !motivationalMessage.isEmpty {
|
|
Text(motivationalMessage)
|
|
.font(.subheadline)
|
|
.foregroundColor(.primary)
|
|
.padding()
|
|
.background(Color.blue.opacity(0.1))
|
|
.cornerRadius(8)
|
|
}
|
|
}
|
|
}
|
|
.padding()
|
|
}
|
|
|
|
private var motivationalMessage: String {
|
|
let data = weightData
|
|
guard data.count >= 2 else {
|
|
return "Complete more workouts to track your progress!"
|
|
}
|
|
|
|
let firstWeight = data.first?.weight ?? 0
|
|
let currentWeight = data.last?.weight ?? 0
|
|
let weightDifference = currentWeight - firstWeight
|
|
|
|
if weightDifference > 0 {
|
|
let percentIncrease = firstWeight > 0
|
|
? Int((Double(weightDifference) / Double(firstWeight)) * 100)
|
|
: 0
|
|
if percentIncrease >= 20 {
|
|
return "Amazing progress! You've increased your weight by \(weightUnit.format(weightDifference)) (\(percentIncrease)%)!"
|
|
} else if percentIncrease >= 10 {
|
|
return "Great job! You've increased your weight by \(weightUnit.format(weightDifference)) (\(percentIncrease)%)!"
|
|
} else {
|
|
return "You're making progress! Weight increased by \(weightUnit.format(weightDifference)). Keep it up!"
|
|
}
|
|
} else if weightDifference == 0 {
|
|
return "You're maintaining consistent weight. Focus on form and consider increasing when ready!"
|
|
} else {
|
|
return "Your current weight is lower than when you started. Adjust your training as needed and keep pushing!"
|
|
}
|
|
}
|
|
}
|
|
|
|
// Data structure for chart points
|
|
struct WeightDataPoint: Identifiable {
|
|
let id = UUID()
|
|
let date: Date
|
|
let weight: Int
|
|
}
|