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>
82 lines
2.4 KiB
Swift
82 lines
2.4 KiB
Swift
//
|
|
// CreateWorkout.swift
|
|
// Werkout_ios
|
|
//
|
|
// Created by Trey Tartt on 6/15/23.
|
|
//
|
|
|
|
import Foundation
|
|
import SwiftUI
|
|
import Combine
|
|
|
|
struct AddExerciseView: View {
|
|
enum CreateWorkoutItemPickerViewType {
|
|
case muscles
|
|
case equipment
|
|
}
|
|
|
|
@State var selectedMuscles = [Muscle]()
|
|
@State var selectedEquipment = [Equipment]()
|
|
@State var filteredExercises = [Exercise]()
|
|
|
|
@ObservedObject var bridgeModule = BridgeModule.shared
|
|
let selectedExercise: ((Exercise) -> Void)
|
|
|
|
var body: some View {
|
|
VStack(spacing: 0) {
|
|
AllExerciseView(filteredExercises: $filteredExercises,
|
|
selectedExercise: { excercise in
|
|
selectedExercise(excercise)
|
|
})
|
|
.padding(.top, WerkoutTheme.md)
|
|
|
|
Divider()
|
|
.overlay(WerkoutTheme.divider)
|
|
|
|
HStack {
|
|
AllMusclesView(selectedMuscles: $selectedMuscles)
|
|
.frame(maxWidth: .infinity)
|
|
|
|
Divider()
|
|
.overlay(WerkoutTheme.divider)
|
|
|
|
AllEquipmentView(selectedEquipment: $selectedEquipment)
|
|
.frame(maxWidth: .infinity)
|
|
}
|
|
.padding(.top, WerkoutTheme.sm)
|
|
.frame(height: 44)
|
|
}
|
|
.background(WerkoutTheme.background)
|
|
.onChange(of: selectedMuscles) { _, _ in
|
|
filterExercises()
|
|
}
|
|
.onChange(of: selectedEquipment) { _, _ in
|
|
filterExercises()
|
|
}
|
|
}
|
|
|
|
func filterExercises() {
|
|
guard let exercises = DataStore.shared.allExercise else {
|
|
filteredExercises = []
|
|
return
|
|
}
|
|
|
|
let selectedMuscleIds = Set(selectedMuscles.map { $0.id })
|
|
let selectedEquipmentIds = Set(selectedEquipment.map { $0.id })
|
|
|
|
filteredExercises = exercises.filter { exercise in
|
|
let muscleOK = selectedMuscleIds.isEmpty ||
|
|
exercise.muscles.contains(where: { selectedMuscleIds.contains($0.muscle ?? -1) })
|
|
let equipmentOK = selectedEquipmentIds.isEmpty ||
|
|
exercise.equipment.contains(where: { selectedEquipmentIds.contains($0.equipment ?? -1) })
|
|
return muscleOK && equipmentOK
|
|
}
|
|
}
|
|
}
|
|
|
|
//struct AddExerciseView_Previews: PreviewProvider {
|
|
// static var previews: some View {
|
|
// AddExerciseView(selectedExercise: { _ in })
|
|
// }
|
|
//}
|