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>
60 lines
2.2 KiB
Swift
60 lines
2.2 KiB
Swift
//
|
|
// AllEquipmentview.swift
|
|
// Werkout_ios
|
|
//
|
|
// Created by Trey Tartt on 6/16/24.
|
|
//
|
|
|
|
import SwiftUI
|
|
|
|
struct AllEquipmentView: View {
|
|
@Binding var selectedEquipment: [Equipment]
|
|
@State var createWorkoutItemPickerViewModel: CreateWorkoutItemPickerViewModel?
|
|
|
|
var body: some View {
|
|
VStack(spacing: WerkoutTheme.xs) {
|
|
if let _ = DataStore.shared.allEquipment {
|
|
Text("Select Equipment")
|
|
.font(WerkoutTheme.caption)
|
|
.foregroundStyle(WerkoutTheme.accent)
|
|
Text("\(selectedEquipment.count) Selected")
|
|
.font(WerkoutTheme.caption)
|
|
.foregroundStyle(WerkoutTheme.textSecondary)
|
|
}
|
|
}
|
|
.onTapGesture {
|
|
if let equipment = DataStore.shared.allEquipment {
|
|
var createWorkoutItemPickerModels = [CreateWorkoutItemPickerModel]()
|
|
equipment.forEach({
|
|
let model = CreateWorkoutItemPickerModel(id: $0.id,
|
|
name: $0.name.lowercased())
|
|
createWorkoutItemPickerModels.append(model)
|
|
})
|
|
createWorkoutItemPickerModels = createWorkoutItemPickerModels.sorted(by: {
|
|
$0.name < $1.name
|
|
})
|
|
let selectedIds = selectedEquipment.map { $0.id }
|
|
createWorkoutItemPickerViewModel = CreateWorkoutItemPickerViewModel(allValues: createWorkoutItemPickerModels, selectedIds: selectedIds)
|
|
}
|
|
}
|
|
.sheet(item: $createWorkoutItemPickerViewModel) { item in
|
|
CreateWorkoutItemPickerView(viewModel: item, completed: { selectedids in
|
|
if let equipment = DataStore.shared.allEquipment {
|
|
selectedEquipment.removeAll()
|
|
for id in selectedids {
|
|
if let equipment = equipment.first(where: {
|
|
$0.id == id
|
|
}) {
|
|
selectedEquipment.append(equipment)
|
|
}
|
|
}
|
|
}
|
|
})
|
|
}
|
|
}
|
|
}
|
|
|
|
//#Preview {
|
|
// AllEquipmentview()
|
|
//}
|