Files
WerkoutIOS/iphone/Werkout_ios/Views/CreateWorkout/CreateWorkoutMainView.swift
Trey t 5d39dcb66f
Some checks failed
Apple Platform CI / smoke-and-tests (push) Has been cancelled
Fix 28 issues from deep audit and UI audit + redesign changes
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>
2026-02-23 10:24:52 -06:00

132 lines
5.1 KiB
Swift

//
// CreateWorkoutView.swift
// Werkout_ios
//
// Created by Trey Tartt on 6/15/23.
//
import SwiftUI
struct CreateWorkoutMainView: View {
@StateObject var viewModel = WorkoutViewModel()
@State var selectedCreateWorkoutSuperSet: CreateWorkoutSuperSet?
@State private var showAddExercise = false
private var canSubmit: Bool {
viewModel.title.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false &&
viewModel.isUploading == false
}
var body: some View {
VStack(spacing: 0) {
VStack(spacing: WerkoutTheme.sm) {
TextField("Title", text: $viewModel.title)
.werkoutTextField()
.padding(.horizontal, WerkoutTheme.md)
TextField("Description", text: $viewModel.description)
.werkoutTextField()
.padding(.horizontal, WerkoutTheme.md)
}
.padding(.vertical, WerkoutTheme.md)
.background(WerkoutTheme.surfaceCard)
ScrollViewReader { proxy in
List() {
ForEach(viewModel.superSets) { superset in
CreateWorkoutSupersetView(
selectedCreateWorkoutSuperSet: $selectedCreateWorkoutSuperSet,
showAddExercise: $showAddExercise,
superset: superset,
viewModel: viewModel)
}
.listRowBackground(WerkoutTheme.surfaceCard)
// after adding new exercise we have to scroll to the bottom
// where the new exercise is sooo keep this so we can scroll
// to id 999
Color.clear
.frame(height: 1)
.accessibilityHidden(true)
.id(999)
.listRowSeparator(.hidden)
.listRowBackground(Color.clear)
}
.scrollContentBackground(.hidden)
.background(WerkoutTheme.background)
.onChange(of: viewModel.randomValueForUpdatingValue) { _, _ in
withAnimation {
proxy.scrollTo(999, anchor: .bottom)
}
}
}
.sheet(isPresented: $showAddExercise) {
AddExerciseView(selectedExercise: { exercise in
if let superset = selectedCreateWorkoutSuperSet {
viewModel.addExercise(exercise, to: superset)
}
selectedCreateWorkoutSuperSet = nil
})
}
Divider()
.overlay(WerkoutTheme.divider)
GlassEffectContainer {
HStack(spacing: WerkoutTheme.md) {
Button(action: {
viewModel.addNewSuperset()
}) {
Label("Add Superset", systemImage: "plus.circle.fill")
.font(.system(size: 15, weight: .bold))
.foregroundStyle(WerkoutTheme.textPrimary)
.frame(maxWidth: .infinity)
.frame(height: 44)
}
.glassEffect(.regular.interactive())
.tint(WerkoutTheme.accent)
.accessibilityLabel("Add superset")
.accessibilityHint("Adds a new superset section to this workout")
Button(action: {
viewModel.uploadWorkout()
}, label: {
if viewModel.isUploading {
ProgressView()
.progressViewStyle(.circular)
.tint(WerkoutTheme.textPrimary)
} else {
Text("Done")
.font(.system(size: 15, weight: .bold))
.foregroundStyle(WerkoutTheme.textPrimary)
}
})
.frame(maxWidth: .infinity)
.frame(height: 44)
.glassEffect(.regular.interactive())
.tint(WerkoutTheme.success)
.disabled(canSubmit == false)
.accessibilityLabel("Upload workout")
.accessibilityHint("Uploads this workout to your account")
}
.padding(.horizontal, WerkoutTheme.md)
.padding(.vertical, WerkoutTheme.sm)
}
}
.background(WerkoutTheme.background)
.alert("Create Workout", isPresented: Binding<Bool>(
get: { viewModel.validationError != nil },
set: { _ in viewModel.validationError = nil }
)) {
Button("OK", role: .cancel) {}
} message: {
Text(viewModel.validationError ?? "")
}
}
}
//struct CreateWorkoutView_Previews: PreviewProvider {
// static var previews: some View {
// CreateWorkoutView()
// }
//}