5d39dcb66f
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>
123 lines
4.2 KiB
Swift
123 lines
4.2 KiB
Swift
//
|
|
// PlanWorkoutView.swift
|
|
// Werkout_ios
|
|
//
|
|
// Created by Trey Tartt on 7/2/23.
|
|
//
|
|
|
|
import SwiftUI
|
|
|
|
struct PlanWorkoutView: View {
|
|
@State var selectedDate = Date()
|
|
@State private var hasError = false
|
|
@State private var errorMessage = ""
|
|
let workout: Workout
|
|
@Environment(\.dismiss) var dismiss
|
|
var addedPlannedWorkout: (() -> Void)?
|
|
|
|
var body: some View {
|
|
VStack() {
|
|
Text(workout.name)
|
|
.font(WerkoutTheme.heroTitle)
|
|
.foregroundStyle(WerkoutTheme.textPrimary)
|
|
.frame(maxWidth: .infinity, alignment: .leading)
|
|
|
|
Text(selectedDate.formatted(date: .abbreviated, time: .omitted))
|
|
.font(.system(size: 28))
|
|
.bold()
|
|
.foregroundStyle(WerkoutTheme.accent)
|
|
.padding()
|
|
.animation(.spring(), value: selectedDate)
|
|
|
|
Divider()
|
|
.overlay(WerkoutTheme.divider)
|
|
.frame(height: 1)
|
|
|
|
DatePicker("Select Date", selection: $selectedDate, displayedComponents: [.date])
|
|
.padding(.horizontal)
|
|
.datePickerStyle(.graphical)
|
|
.tint(WerkoutTheme.accent)
|
|
.foregroundStyle(WerkoutTheme.textPrimary)
|
|
|
|
Divider()
|
|
.overlay(WerkoutTheme.divider)
|
|
|
|
GlassEffectContainer {
|
|
HStack {
|
|
Button(action: {
|
|
dismiss()
|
|
}, label: {
|
|
Image(systemName: "xmark.octagon.fill")
|
|
.font(.title)
|
|
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
|
})
|
|
.foregroundStyle(WerkoutTheme.textPrimary)
|
|
.frame(maxWidth: .infinity, alignment: .center)
|
|
.frame(height: 44)
|
|
.glassEffect(.regular.interactive())
|
|
.tint(WerkoutTheme.danger)
|
|
.clipShape(RoundedRectangle(cornerRadius: WerkoutTheme.buttonRadius, style: .continuous))
|
|
.padding()
|
|
.accessibilityLabel("Cancel planning")
|
|
.accessibilityHint("Closes this screen without planning a workout")
|
|
|
|
Button(action: {
|
|
planWorkout()
|
|
}, label: {
|
|
Image(systemName: "plus.app")
|
|
.font(.title)
|
|
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
|
})
|
|
.foregroundStyle(WerkoutTheme.textPrimary)
|
|
.frame(maxWidth: .infinity, alignment: .center)
|
|
.frame(height: 44)
|
|
.glassEffect(.regular.interactive())
|
|
.tint(WerkoutTheme.accent)
|
|
.clipShape(RoundedRectangle(cornerRadius: WerkoutTheme.buttonRadius, style: .continuous))
|
|
.padding()
|
|
.accessibilityLabel("Plan workout")
|
|
.accessibilityHint("Adds this workout to your selected date")
|
|
}
|
|
}
|
|
|
|
Spacer()
|
|
}
|
|
.padding()
|
|
.background(WerkoutTheme.background)
|
|
.alert("Unable to Plan Workout", isPresented: $hasError) {
|
|
Button("OK", role: .cancel) {}
|
|
} message: {
|
|
Text(errorMessage)
|
|
}
|
|
}
|
|
|
|
func planWorkout() {
|
|
let postData = [
|
|
"on_date": selectedDate.formatForPlannedWorkout,
|
|
"workout": workout.id
|
|
] as [String : Any]
|
|
|
|
PlanWorkoutFetchable(postData: postData).fetch(completion: { result in
|
|
switch result {
|
|
case .success(_):
|
|
DispatchQueue.main.async {
|
|
UserStore.shared.fetchPlannedWorkouts()
|
|
dismiss()
|
|
addedPlannedWorkout?()
|
|
}
|
|
case .failure(let failure):
|
|
DispatchQueue.main.async {
|
|
errorMessage = failure.localizedDescription
|
|
hasError = true
|
|
}
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
struct PlanWorkoutView_Previews: PreviewProvider {
|
|
static var previews: some View {
|
|
PlanWorkoutView(workout: PreviewData.workout())
|
|
}
|
|
}
|