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:
@@ -10,37 +10,41 @@ struct AddSupersetView: View {
|
||||
@ObservedObject var createWorkoutSuperSet: CreateWorkoutSuperSet
|
||||
var viewModel: WorkoutViewModel
|
||||
@Binding var selectedCreateWorkoutSuperSet: CreateWorkoutSuperSet?
|
||||
|
||||
|
||||
var body: some View {
|
||||
TabView {
|
||||
ForEach(createWorkoutSuperSet.exercises, id: \.id) { createWorkoutExercise in
|
||||
VStack {
|
||||
VStack(spacing: WerkoutTheme.sm) {
|
||||
Text(createWorkoutExercise.exercise.name)
|
||||
.font(.title2)
|
||||
.font(WerkoutTheme.cardTitle)
|
||||
.foregroundStyle(WerkoutTheme.textPrimary)
|
||||
.frame(maxWidth: .infinity)
|
||||
if let side = createWorkoutExercise.exercise.side,
|
||||
side.isEmpty == false {
|
||||
Text(side)
|
||||
.font(.title3)
|
||||
.font(WerkoutTheme.bodyText)
|
||||
.foregroundStyle(WerkoutTheme.textSecondary)
|
||||
.frame(maxWidth: .infinity, alignment: .center)
|
||||
}
|
||||
CreateExerciseActionsView(workoutExercise: createWorkoutExercise,
|
||||
superset: createWorkoutSuperSet,
|
||||
viewModel: viewModel)
|
||||
}
|
||||
.frame(width: 300.0)
|
||||
.frame(maxWidth: .infinity)
|
||||
.padding(.horizontal, WerkoutTheme.md)
|
||||
.padding(.bottom, 40)
|
||||
}
|
||||
}
|
||||
.frame(height: 300)
|
||||
.frame(minHeight: 220, maxHeight: 320)
|
||||
.tabViewStyle(.page)
|
||||
.background(WerkoutTheme.background)
|
||||
.onAppear {
|
||||
setupAppearance()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
func setupAppearance() {
|
||||
UIPageControl.appearance().currentPageIndicatorTintColor = .black
|
||||
UIPageControl.appearance().pageIndicatorTintColor = UIColor.black.withAlphaComponent(0.2)
|
||||
UIPageControl.appearance().currentPageIndicatorTintColor = UIColor(WerkoutTheme.accent)
|
||||
UIPageControl.appearance().pageIndicatorTintColor = UIColor(WerkoutTheme.accent).withAlphaComponent(0.25)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user