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:
@@ -18,9 +18,9 @@ class WatchMainViewModel: NSObject, ObservableObject {
|
||||
|
||||
var session: WCSession
|
||||
|
||||
@Published var watchPackageModel = WatchMainViewModel.defualtPackageModle
|
||||
@Published var watchPackageModel = WatchMainViewModel.defaultPackageModel
|
||||
|
||||
static var defualtPackageModle: WatchPackageModel {
|
||||
static var defaultPackageModel: WatchPackageModel {
|
||||
WatchPackageModel(currentExerciseName: "", currentExerciseID: -1, currentTimeLeft: -1, workoutStartDate: Date())
|
||||
}
|
||||
|
||||
@@ -66,7 +66,6 @@ class WatchMainViewModel: NSObject, ObservableObject {
|
||||
func pauseWorkout() {
|
||||
send(.pauseWorkout)
|
||||
WKInterfaceDevice.current().play(.start)
|
||||
WatchWorkout.shared.togglePaused()
|
||||
}
|
||||
|
||||
func dataToAction(messageData: Data) {
|
||||
@@ -81,10 +80,10 @@ class WatchMainViewModel: NSObject, ObservableObject {
|
||||
}
|
||||
self.watchPackageModel = newWatchPackageModel
|
||||
case .reset:
|
||||
self.watchPackageModel = WatchMainViewModel.defualtPackageModle
|
||||
self.watchPackageModel = WatchMainViewModel.defaultPackageModel
|
||||
WatchWorkout.shared.stopWorkout(sendDetails: false)
|
||||
case .endWorkout:
|
||||
self.watchPackageModel = WatchMainViewModel.defualtPackageModle
|
||||
self.watchPackageModel = WatchMainViewModel.defaultPackageModel
|
||||
WatchWorkout.shared.stopWorkout(sendDetails: true)
|
||||
case .startWorkout:
|
||||
WatchWorkout.shared.startWorkout()
|
||||
|
||||
Reference in New Issue
Block a user