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>
118 lines
4.5 KiB
Swift
118 lines
4.5 KiB
Swift
//
|
|
// ActionsView.swift
|
|
// Werkout_ios
|
|
//
|
|
// Created by Trey Tartt on 7/7/23.
|
|
//
|
|
|
|
import SwiftUI
|
|
|
|
struct ActionsView: View {
|
|
@ObservedObject var bridgeModule = BridgeModule.shared
|
|
var completedWorkout: (() -> Void)?
|
|
var planWorkout: ((Workout) -> Void)?
|
|
|
|
var workout: Workout
|
|
@Environment(\.dismiss) var dismiss
|
|
var showAddToCalendar: Bool
|
|
var startWorkoutAction: (() -> Void)
|
|
@State var showCompleteSheet: Bool = false
|
|
|
|
var body: some View {
|
|
GlassEffectContainer {
|
|
HStack(spacing: WerkoutTheme.sm) {
|
|
if bridgeModule.isInWorkout == false {
|
|
Button(action: {
|
|
bridgeModule.resetCurrentWorkout()
|
|
dismiss()
|
|
}, label: {
|
|
Image(systemName: "xmark.octagon.fill")
|
|
.font(.title)
|
|
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
|
})
|
|
.glassEffect(.regular.interactive())
|
|
.tint(WerkoutTheme.danger)
|
|
.accessibilityLabel("Close workout")
|
|
|
|
if showAddToCalendar {
|
|
Button(action: {
|
|
planWorkout?(workout)
|
|
}, label: {
|
|
Image(systemName: "calendar.badge.plus")
|
|
.font(.title)
|
|
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
|
})
|
|
.glassEffect(.regular.interactive())
|
|
.tint(WerkoutTheme.accent)
|
|
.accessibilityLabel("Plan workout")
|
|
}
|
|
|
|
Button(action: {
|
|
startWorkoutAction()
|
|
}, label: {
|
|
Image(systemName: "arrowtriangle.forward.fill")
|
|
.font(.title)
|
|
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
|
})
|
|
.glassEffect(.regular.interactive())
|
|
.tint(WerkoutTheme.success)
|
|
.accessibilityLabel("Start workout")
|
|
} else {
|
|
Button(action: {
|
|
showCompleteSheet.toggle()
|
|
}, label: {
|
|
Image(systemName: "checkmark")
|
|
.font(.title)
|
|
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
|
})
|
|
.glassEffect(.regular.interactive())
|
|
.tint(WerkoutTheme.accent)
|
|
.accessibilityLabel("Complete workout")
|
|
|
|
Button(action: {
|
|
AudioEngine.shared.playFinished()
|
|
bridgeModule.pauseWorkout()
|
|
}, label: {
|
|
Image(systemName: bridgeModule.isPaused ? "play.circle.fill" : "pause.circle.fill")
|
|
.font(.title)
|
|
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
|
})
|
|
.glassEffect(.regular.interactive())
|
|
.tint(bridgeModule.isPaused ? WerkoutTheme.success : WerkoutTheme.warning)
|
|
.accessibilityLabel(bridgeModule.isPaused ? "Resume workout" : "Pause workout")
|
|
|
|
Button(action: {
|
|
AudioEngine.shared.playFinished()
|
|
nextExercise()
|
|
}, label: {
|
|
Image(systemName: "arrow.forward")
|
|
.font(.title)
|
|
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
|
})
|
|
.glassEffect(.regular.interactive())
|
|
.tint(WerkoutTheme.success)
|
|
.accessibilityLabel("Next exercise")
|
|
}
|
|
}
|
|
.padding(.horizontal, WerkoutTheme.sm)
|
|
}
|
|
.alert("Complete Workout", isPresented: $showCompleteSheet) {
|
|
Button("Complete Workout", role: .destructive) {
|
|
AudioEngine.shared.playFinished()
|
|
completedWorkout?()
|
|
}
|
|
Button("Back to workout", role: .cancel) { }
|
|
}
|
|
}
|
|
|
|
func nextExercise() {
|
|
bridgeModule.nextExercise()
|
|
}
|
|
}
|
|
|
|
struct ActionsView_Previews: PreviewProvider {
|
|
static var previews: some View {
|
|
ActionsView(workout: PreviewData.workout(), showAddToCalendar: true, startWorkoutAction: {})
|
|
}
|
|
}
|