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:
@@ -5,7 +5,8 @@
|
||||
// Created by Trey Tartt on 6/18/23.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
import Combine
|
||||
import Foundation
|
||||
import SharedCore
|
||||
|
||||
class CreateWorkoutExercise: ObservableObject, Identifiable {
|
||||
@@ -93,6 +94,9 @@ class WorkoutViewModel: ObservableObject {
|
||||
@Published var description = String()
|
||||
@Published var validationError: String?
|
||||
@Published var isUploading = false
|
||||
// MARK: - Manual Invalidation
|
||||
// Workaround: nested ObservableObject changes don't propagate to parent.
|
||||
// Remove when migrating to @Observable (iOS 17+).
|
||||
@Published var randomValueForUpdatingValue = 0
|
||||
|
||||
func increaseRandomNumberForUpdating() {
|
||||
@@ -112,7 +116,32 @@ class WorkoutViewModel: ObservableObject {
|
||||
increaseRandomNumberForUpdating()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
func addExercise(_ exercise: Exercise, to superset: CreateWorkoutSuperSet) {
|
||||
let workoutExercise = CreateWorkoutExercise(exercise: exercise)
|
||||
superset.exercises.append(workoutExercise)
|
||||
|
||||
if exercise.side?.isEmpty == false {
|
||||
autoAddSiblingExercises(for: exercise, to: superset)
|
||||
}
|
||||
increaseRandomNumberForUpdating()
|
||||
}
|
||||
|
||||
private func autoAddSiblingExercises(for exercise: Exercise, to superset: CreateWorkoutSuperSet) {
|
||||
guard let allExercises = DataStore.shared.allExercise else { return }
|
||||
let siblings = allExercises.filter { $0.name == exercise.name }
|
||||
guard siblings.count == 2,
|
||||
let recover = allExercises.first(where: { $0.name.lowercased() == "recover" }) else { return }
|
||||
|
||||
let recoverExercise = CreateWorkoutExercise(exercise: recover)
|
||||
superset.exercises.append(recoverExercise)
|
||||
|
||||
for sibling in siblings where sibling.id != exercise.id {
|
||||
let otherSideExercise = CreateWorkoutExercise(exercise: sibling)
|
||||
superset.exercises.append(otherSideExercise)
|
||||
}
|
||||
}
|
||||
|
||||
func showRoundsError() {
|
||||
validationError = "Each superset must have at least one round."
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user