Fix 28 issues from deep audit and UI audit + redesign changes
Some checks failed
Apple Platform CI / smoke-and-tests (push) Has been cancelled

Deep audit (issues 2-14):
- Add missing WCSession handlers for applicationContext and userInfo
- Fix BoundedFIFOQueue race condition with serial dispatch queue
- Fix timer race condition with main thread guarantee
- Fix watch pause state divergence — phone is now source of truth
- Fix wrong notification posted on logout (createdNewWorkout → userLoggedOut)
- Fix POST status check to accept any 2xx (was exact match)
- Fix @StateObject → @ObservedObject for injected viewModel
- Add pull-to-refresh to CompletedWorkoutsView
- Fix typos: RefreshUserInfoFetcable, defualtPackageModle
- Replace string concatenation with interpolation
- Replace 6 @StateObject with @ObservedObject for BridgeModule.shared
- Replace 7 hardcoded AVPlayer URLs with BaseURLs.currentBaseURL

UI audit (issues 1-15):
- Fix GeometryReader eating VStack space — replaced with .overlay
- Fix refreshable continuation resuming before fetch completes
- Remove duplicate @State workouts — derive from DataStore
- Decouple leaf views from BridgeModule (pass discrete values)
- Convert selectedIds from Array to Set for O(1) lookups
- Extract .sorted() from var body into computed properties
- Move search filter out of ForEach render loop
- Replace import SwiftUI with import Combine in non-UI classes
- Mark all @State properties private
- Extract L/R exercise auto-add logic to WorkoutViewModel
- Use enumerated() instead of .indices in ForEach
- Make AddSupersetView frame flexible instead of fixed 300pt
- Hoist Set construction out of per-exercise filter loop
- Move ViewModel network fetch from init to load()

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Trey t
2026-02-23 10:24:06 -06:00
parent 921829f2c3
commit 5d39dcb66f
60 changed files with 1783 additions and 1346 deletions

View File

@@ -10,46 +10,56 @@ import SwiftUI
struct PlannedWorkoutView: View {
let workouts: [PlannedWorkout]
@Binding var selectedPlannedWorkout: Workout?
private var sortedWorkouts: [PlannedWorkout] {
workouts.sorted(by: { $0.onDate < $1.onDate })
}
var body: some View {
List {
ForEach(workouts.sorted(by: { $0.onDate < $1.onDate }), id: \.id) { plannedWorkout in
Button(action: {
selectedPlannedWorkout = plannedWorkout.workout
}, label: {
HStack {
VStack(alignment: .leading) {
Text(plannedWorkout.onDate.plannedDate?.weekDay ?? "-")
.font(.title)
Text(plannedWorkout.onDate.plannedDate?.monthString ?? "-")
.font(.title)
Text(plannedWorkout.onDate.plannedDate?.dateString ?? "-")
.font(.title)
ScrollView {
LazyVStack(spacing: WerkoutTheme.sm) {
ForEach(sortedWorkouts, id: \.id) { plannedWorkout in
Button(action: {
selectedPlannedWorkout = plannedWorkout.workout
}, label: {
HStack(spacing: WerkoutTheme.md) {
VStack(spacing: WerkoutTheme.xs) {
Text(plannedWorkout.onDate.plannedDate?.weekDay ?? "-")
.font(WerkoutTheme.caption)
.foregroundStyle(WerkoutTheme.accent)
Text(plannedWorkout.onDate.plannedDate?.dateString ?? "-")
.font(.system(size: 28, weight: .black, design: .monospaced))
.foregroundStyle(WerkoutTheme.accent)
Text(plannedWorkout.onDate.plannedDate?.monthString ?? "-")
.font(WerkoutTheme.caption)
.foregroundStyle(WerkoutTheme.textSecondary)
}
.frame(width: 60)
WerkoutTheme.divider.frame(width: 0.5)
VStack(alignment: .leading, spacing: WerkoutTheme.xs) {
Text(plannedWorkout.workout.name)
.font(WerkoutTheme.cardTitle)
.foregroundStyle(WerkoutTheme.textPrimary)
Text(plannedWorkout.workout.description ?? "")
.font(WerkoutTheme.bodyText)
.foregroundStyle(WerkoutTheme.textSecondary)
}
.frame(maxWidth: .infinity, alignment: .leading)
}
Divider()
VStack {
Text(plannedWorkout.workout.name)
.font(.title)
.frame(maxWidth: .infinity, alignment: .leading)
Text(plannedWorkout.workout.description ?? "")
.font(.body)
.frame(maxWidth: .infinity, alignment: .leading)
}
}
})
.buttonStyle(.plain)
.accessibilityLabel("Open planned workout \(plannedWorkout.workout.name)")
.accessibilityHint("Shows workout details")
.werkoutCard()
})
.buttonStyle(.plain)
.accessibilityLabel("Open planned workout \(plannedWorkout.workout.name)")
.accessibilityHint("Shows workout details")
}
}
.padding(.horizontal, WerkoutTheme.sm)
}
.scrollEdgeEffectStyle(.soft, for: .top)
}
}
//#Preview {
// PlannedWorkoutView()
//}