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>
133 lines
4.9 KiB
Swift
133 lines
4.9 KiB
Swift
//
|
|
// AllExerciseView.swift
|
|
// Werkout_ios
|
|
//
|
|
// Created by Trey Tartt on 6/16/24.
|
|
//
|
|
|
|
import SwiftUI
|
|
import AVKit
|
|
|
|
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: BaseURLs.currentBaseURL + "/media/exercise_videos/2_Dumbbell_Lateral_Lunges.mp4") ?? URL(fileURLWithPath: "/dev/null"))
|
|
@State private var currentVideoURL: URL?
|
|
@State var videoExercise: Exercise? {
|
|
didSet {
|
|
if let viddd = self.videoExercise?.videoURL,
|
|
let url = URL(string: BaseURLs.currentBaseURL + viddd) {
|
|
updatePlayer(for: url)
|
|
}
|
|
}
|
|
}
|
|
|
|
var body: some View {
|
|
VStack(spacing: WerkoutTheme.sm) {
|
|
TextField("Filter", text: $searchString)
|
|
.werkoutTextField()
|
|
.padding(.horizontal, WerkoutTheme.md)
|
|
|
|
List() {
|
|
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 exercise.equipmentRequired?.isEmpty == false {
|
|
Text(exercise.spacedEquipmentRequired)
|
|
.font(WerkoutTheme.caption)
|
|
.foregroundStyle(WerkoutTheme.textSecondary)
|
|
.frame(maxWidth: .infinity, alignment: .leading)
|
|
}
|
|
|
|
if exercise.muscleGroups?.isEmpty == false {
|
|
Text(exercise.spacedMuscleGroups)
|
|
.font(WerkoutTheme.caption)
|
|
.foregroundStyle(WerkoutTheme.textSecondary)
|
|
.frame(maxWidth: .infinity, alignment: .leading)
|
|
}
|
|
}
|
|
.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)
|
|
.onAppear{
|
|
avPlayer.isMuted = true
|
|
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)
|
|
avPlayer.isMuted = true
|
|
avPlayer.play()
|
|
return
|
|
}
|
|
|
|
currentVideoURL = url
|
|
avPlayer = AVPlayer(url: url)
|
|
avPlayer.isMuted = true
|
|
avPlayer.play()
|
|
}
|
|
}
|
|
//
|
|
//#Preview {
|
|
// AllExerciseView()
|
|
//}
|