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>
69 lines
2.6 KiB
Swift
69 lines
2.6 KiB
Swift
//
|
|
// ExtExerciseList.swift
|
|
// Werkout_ios
|
|
//
|
|
// Created by Trey Tartt on 6/17/24.
|
|
//
|
|
|
|
import SwiftUI
|
|
|
|
struct ExtExerciseList: View {
|
|
var workout: Workout
|
|
var allSupersetExecerciseIndex: Int
|
|
|
|
var body: some View {
|
|
if let allSupersetExecercise = workout.allSupersetExecercise {
|
|
ZStack {
|
|
ScrollViewReader { proxy in
|
|
List() {
|
|
ForEach(allSupersetExecercise.indices, id: \.self) { supersetExecerciseIdx in
|
|
let supersetExecercise = allSupersetExecercise[supersetExecerciseIdx]
|
|
HStack {
|
|
if supersetExecerciseIdx == allSupersetExecerciseIndex {
|
|
Image(systemName: "figure.run")
|
|
.foregroundColor(WerkoutTheme.accent)
|
|
.font(Font.system(size: 55))
|
|
.minimumScaleFactor(0.01)
|
|
.lineLimit(1)
|
|
}
|
|
|
|
Text(supersetExecercise.exercise.name)
|
|
.font(Font.system(size: 55, weight: supersetExecerciseIdx == allSupersetExecerciseIndex ? .bold : .medium))
|
|
.foregroundColor(supersetExecerciseIdx == allSupersetExecerciseIndex ? WerkoutTheme.textPrimary : WerkoutTheme.textSecondary)
|
|
.minimumScaleFactor(0.01)
|
|
.lineLimit(3)
|
|
.padding()
|
|
|
|
Spacer()
|
|
}
|
|
.id(supersetExecerciseIdx)
|
|
}
|
|
}
|
|
.onChange(of: allSupersetExecerciseIndex) {
|
|
withAnimation {
|
|
proxy.scrollTo(allSupersetExecerciseIndex, anchor: .top)
|
|
}
|
|
}
|
|
|
|
}
|
|
VStack {
|
|
Text("\(allSupersetExecerciseIndex+1)/\(workout.allSupersetExecercise?.count ?? 0)")
|
|
.font(Font.system(size: 55, weight: .bold, design: .monospaced))
|
|
.minimumScaleFactor(0.01)
|
|
.lineLimit(1)
|
|
.padding()
|
|
.foregroundColor(WerkoutTheme.textPrimary)
|
|
.glassEffect(.regular.interactive())
|
|
.tint(WerkoutTheme.accent)
|
|
|
|
Spacer()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
//#Preview {
|
|
// ExtExerciseList()
|
|
//}
|