Fix 28 issues from deep audit and UI audit + redesign changes
Some checks failed
Apple Platform CI / smoke-and-tests (push) Has been cancelled
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:
@@ -11,7 +11,7 @@ struct CreateWorkoutSupersetView: View {
|
||||
@Binding var showAddExercise: Bool
|
||||
@ObservedObject var superset: CreateWorkoutSuperSet
|
||||
@ObservedObject var viewModel: WorkoutViewModel
|
||||
|
||||
|
||||
var body: some View {
|
||||
Section(content: {
|
||||
AddSupersetView(
|
||||
@@ -19,50 +19,58 @@ struct CreateWorkoutSupersetView: View {
|
||||
viewModel: viewModel,
|
||||
selectedCreateWorkoutSuperSet: $selectedCreateWorkoutSuperSet)
|
||||
}, header: {
|
||||
VStack {
|
||||
VStack(spacing: WerkoutTheme.sm) {
|
||||
HStack {
|
||||
TextField("Superset Title", text: $superset.title)
|
||||
.font(.title2)
|
||||
.font(WerkoutTheme.sectionTitle)
|
||||
.foregroundStyle(WerkoutTheme.accent)
|
||||
}
|
||||
|
||||
VStack {
|
||||
|
||||
VStack(spacing: WerkoutTheme.sm) {
|
||||
HStack {
|
||||
Text("Exercises: \(superset.exercises.count)")
|
||||
.font(.subheadline)
|
||||
.bold()
|
||||
|
||||
.font(WerkoutTheme.caption)
|
||||
.foregroundStyle(WerkoutTheme.textSecondary)
|
||||
|
||||
Spacer()
|
||||
|
||||
|
||||
Button(action: {
|
||||
selectedCreateWorkoutSuperSet = superset
|
||||
showAddExercise = true
|
||||
}, label: {
|
||||
Image(systemName: "dumbbell.fill")
|
||||
.font(.title2)
|
||||
.foregroundStyle(WerkoutTheme.accent)
|
||||
})
|
||||
.accessibilityLabel("Add exercise")
|
||||
.accessibilityHint("Adds an exercise to this superset")
|
||||
|
||||
|
||||
Divider()
|
||||
|
||||
.overlay(WerkoutTheme.divider)
|
||||
|
||||
Button(action: {
|
||||
viewModel.delete(superset: superset)
|
||||
}, label: {
|
||||
Image(systemName: "trash")
|
||||
.font(.title2)
|
||||
.foregroundStyle(WerkoutTheme.danger)
|
||||
})
|
||||
.accessibilityLabel("Delete superset")
|
||||
.accessibilityHint("Removes this superset")
|
||||
}
|
||||
|
||||
|
||||
Divider()
|
||||
|
||||
.overlay(WerkoutTheme.divider)
|
||||
|
||||
Stepper(label: {
|
||||
HStack {
|
||||
Text("Rounds: ")
|
||||
|
||||
.font(WerkoutTheme.bodyText)
|
||||
.foregroundStyle(WerkoutTheme.textPrimary)
|
||||
|
||||
Text("\(superset.numberOfRounds)")
|
||||
.foregroundColor(superset.numberOfRounds > 0 ? Color(uiColor: .label) : .red)
|
||||
.foregroundColor(superset.numberOfRounds > 0 ? WerkoutTheme.textPrimary : WerkoutTheme.danger)
|
||||
.font(WerkoutTheme.bodyText)
|
||||
.bold()
|
||||
}
|
||||
}, onIncrement: {
|
||||
@@ -70,8 +78,10 @@ struct CreateWorkoutSupersetView: View {
|
||||
}, onDecrement: {
|
||||
superset.decreaseNumberOfRounds()
|
||||
})
|
||||
.tint(WerkoutTheme.accent)
|
||||
}
|
||||
}
|
||||
.padding(.vertical, WerkoutTheme.xs)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user