admin/WerkoutIOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 28 issues from deep audit and UI audit + redesign changes
Some checks failed
Apple Platform CI / smoke-and-tests (push) Has been cancelled
Details

Browse Source 
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>
This commit is contained in:
Trey t
2026-02-23 10:24:06 -06:00
parent 921829f2c3
commit 5d39dcb66f
60 changed files with 1783 additions and 1346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
iphone/Werkout_ios/subview/AllExerciseView.swift
View File

@@ -12,9 +12,10 @@ struct AllExerciseView: View {
@Environment(\.dismiss) var dismiss
@State var searchString: String = ""
@Binding var filteredExercises: [Exercise]
@State private var displayedExercises: [Exercise] = []
var selectedExercise: ((Exercise) -> Void)
@State var avPlayer = AVPlayer(url: URL(string: "https://dev.werkout.fitness/media/exercise_videos/2_Dumbbell_Lateral_Lunges.mp4") ?? URL(fileURLWithPath: "/dev/null"))
@State var avPlayer = AVPlayer(url: URL(string: BaseURLs.currentBaseURL + "/media/exercise_videos/2_Dumbbell_Lateral_Lunges.mp4") ?? URL(fileURLWithPath: "/dev/null"))
@State private var currentVideoURL: URL?
@State var videoExercise: Exercise? {
didSet {
@@ -24,62 +25,68 @@ struct AllExerciseView: View {
}
}
}
var body: some View {
VStack {
VStack(spacing: WerkoutTheme.sm) {
TextField("Filter", text: $searchString)
.padding(.horizontal)
.textFieldStyle(.roundedBorder)
.werkoutTextField()
.padding(.horizontal, WerkoutTheme.md)
List() {
ForEach(filteredExercises, id: \.self) { exercise in
if searchString.isEmpty || exercise.name.lowercased().contains(searchString.lowercased()) {
HStack {
VStack {
Text(exercise.name)
ForEach(displayedExercises, id: \.self) { exercise in
HStack {
VStack(spacing: WerkoutTheme.xs) {
Text(exercise.name)
.font(WerkoutTheme.bodyText)
.foregroundStyle(WerkoutTheme.textPrimary)
.frame(maxWidth: .infinity, alignment: .leading)
if let side = exercise.side,
side.isEmpty == false {
Text(side)
.font(WerkoutTheme.caption)
.foregroundStyle(WerkoutTheme.textSecondary)
.frame(maxWidth: .infinity, alignment: .leading)
if let side = exercise.side,
side.isEmpty == false {
Text(side)
.font(.footnote)
.frame(maxWidth: .infinity, alignment: .leading)
}
if exercise.equipmentRequired?.isEmpty == false {
Text(exercise.spacedEquipmentRequired)
.font(.footnote)
.frame(maxWidth: .infinity, alignment: .leading)
}
if exercise.muscleGroups?.isEmpty == false {
Text(exercise.spacedMuscleGroups)
.font(.footnote)
.frame(maxWidth: .infinity, alignment: .leading)
}
}
.contentShape(Rectangle())
.onTapGesture {
selectedExercise(exercise)
dismiss()
if exercise.equipmentRequired?.isEmpty == false {
Text(exercise.spacedEquipmentRequired)
.font(WerkoutTheme.caption)
.foregroundStyle(WerkoutTheme.textSecondary)
.frame(maxWidth: .infinity, alignment: .leading)
}
Button(action: {
videoExercise = exercise
}) {
ZStack {
Circle()
.fill(.blue)
.frame(width: 33, height: 33)
Image(systemName: "video.fill")
.frame(width: 33, height: 33)
.foregroundColor(.white )
}
if exercise.muscleGroups?.isEmpty == false {
Text(exercise.spacedMuscleGroups)
.font(WerkoutTheme.caption)
.foregroundStyle(WerkoutTheme.textSecondary)
.frame(maxWidth: .infinity, alignment: .leading)
}
.frame(width: 33, height: 33)
}
.contentShape(Rectangle())
.onTapGesture {
selectedExercise(exercise)
dismiss()
}
Button(action: {
videoExercise = exercise
}) {
ZStack {
Circle()
.fill(WerkoutTheme.accent)
.frame(width: 33, height: 33)
Image(systemName: "video.fill")
.frame(width: 33, height: 33)
.foregroundStyle(WerkoutTheme.textPrimary)
}
}
.frame(width: 33, height: 33)
}
.listRowBackground(WerkoutTheme.surfaceCard)
}
}
.scrollContentBackground(.hidden)
.background(WerkoutTheme.background)
}
.sheet(item: $videoExercise) { exercise in
PlayerView(player: $avPlayer)
@@ -88,11 +95,23 @@ struct AllExerciseView: View {
avPlayer.play()
}
}
.onAppear { applySearch() }
.onChange(of: searchString) { _, _ in applySearch() }
.onChange(of: filteredExercises) { _, _ in applySearch() }
.onDisappear {
avPlayer.pause()
}
}
private func applySearch() {
if searchString.isEmpty {
displayedExercises = filteredExercises
} else {
let query = searchString.lowercased()
displayedExercises = filteredExercises.filter { $0.name.lowercased().contains(query) }
}
}
private func updatePlayer(for url: URL) {
if currentVideoURL == url {
avPlayer.seek(to: .zero)