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>
224 lines
10 KiB
Swift
224 lines
10 KiB
Swift
//
|
|
// ExerciseListView.swift
|
|
// Werkout_ios
|
|
//
|
|
// Created by Trey Tartt on 7/7/23.
|
|
//
|
|
|
|
import SwiftUI
|
|
import AVKit
|
|
|
|
struct ExerciseListView: View {
|
|
@AppStorage(Constants.phoneThotStyle) private var phoneThotStyle: ThotStyle = .never
|
|
@State private var avPlayer = AVPlayer(url: URL(string: BaseURLs.currentBaseURL + "/media/exercise_videos/2_Dumbbell_Lateral_Lunges.mp4") ?? URL(fileURLWithPath: "/dev/null"))
|
|
@State private var previewVideoURL: URL?
|
|
var workout: Workout
|
|
@Binding var showExecersizeInfo: Bool
|
|
@AppStorage(Constants.thotGenderOption) private var thotGenderOption: String = "female"
|
|
|
|
let isInWorkout: Bool
|
|
let currentSupersetIndex: Int
|
|
let currentExerciseIndex: Int
|
|
let allSupersetExecerciseIndex: Int
|
|
let currentExercise: SupersetExercise?
|
|
let currentWorkout: Workout?
|
|
let goToExerciseAt: (Int, Int) -> Void
|
|
|
|
@State private var videoExercise: Exercise? {
|
|
didSet {
|
|
if let videoURL = VideoURLCreator.videoURL(
|
|
thotStyle: phoneThotStyle,
|
|
gender: thotGenderOption,
|
|
defaultVideoURLStr: self.videoExercise?.videoURL,
|
|
exerciseName: self.videoExercise?.name,
|
|
workout: currentWorkout) {
|
|
updatePreviewPlayer(for: videoURL)
|
|
}
|
|
}
|
|
}
|
|
|
|
var body: some View {
|
|
let supersets = workout.supersets?.sorted(by: { $0.order < $1.order }) ?? []
|
|
if supersets.isEmpty == false {
|
|
ScrollViewReader { proxy in
|
|
List() {
|
|
ForEach(Array(supersets.enumerated()), id: \.offset) { supersetIndex, superset in
|
|
Section(content: {
|
|
ForEach(Array(superset.exercises.enumerated()), id: \.offset) { exerciseIndex, supersetExecercise in
|
|
let rowID = rowIdentifier(
|
|
supersetIndex: supersetIndex,
|
|
exerciseIndex: exerciseIndex,
|
|
exercise: supersetExecercise
|
|
)
|
|
let isCurrentExercise = isInWorkout &&
|
|
supersetIndex == currentSupersetIndex &&
|
|
exerciseIndex == currentExerciseIndex
|
|
|
|
VStack {
|
|
Button(action: {
|
|
if isInWorkout {
|
|
goToExerciseAt(supersetIndex, exerciseIndex)
|
|
} else {
|
|
videoExercise = supersetExecercise.exercise
|
|
}
|
|
}, label: {
|
|
HStack {
|
|
if isCurrentExercise {
|
|
Image(systemName: "figure.run")
|
|
.foregroundStyle(WerkoutTheme.accent)
|
|
}
|
|
|
|
Text(supersetExecercise.exercise.extName)
|
|
.foregroundStyle(WerkoutTheme.textPrimary)
|
|
|
|
Spacer()
|
|
|
|
if let reps = supersetExecercise.reps,
|
|
reps > 0 {
|
|
HStack(spacing: 4) {
|
|
Image(systemName: "number")
|
|
Text("\(reps)")
|
|
}
|
|
.font(WerkoutTheme.caption)
|
|
.foregroundStyle(.white)
|
|
.padding(.horizontal, WerkoutTheme.sm)
|
|
.padding(.vertical, WerkoutTheme.xs)
|
|
.background(WerkoutTheme.accent)
|
|
.clipShape(Capsule())
|
|
}
|
|
|
|
if let duration = supersetExecercise.duration,
|
|
duration > 0 {
|
|
HStack(spacing: 4) {
|
|
Image(systemName: "stopwatch")
|
|
Text("\(duration)")
|
|
}
|
|
.font(WerkoutTheme.caption)
|
|
.foregroundStyle(.white)
|
|
.padding(.horizontal, WerkoutTheme.sm)
|
|
.padding(.vertical, WerkoutTheme.xs)
|
|
.background(WerkoutTheme.success)
|
|
.clipShape(Capsule())
|
|
}
|
|
}
|
|
.contentShape(Rectangle())
|
|
})
|
|
.buttonStyle(.plain)
|
|
.accessibilityLabel("Exercise \(supersetExecercise.exercise.extName)")
|
|
.accessibilityHint(isInWorkout ? "Jump to this exercise in the workout" : "Preview exercise video")
|
|
|
|
if isCurrentExercise && showExecersizeInfo {
|
|
detailView(forExercise: supersetExecercise)
|
|
}
|
|
}
|
|
.listRowBackground(
|
|
isCurrentExercise
|
|
? WerkoutTheme.accent.opacity(0.1)
|
|
: WerkoutTheme.surfaceCard
|
|
)
|
|
.id(rowID)
|
|
}
|
|
}, header: {
|
|
HStack {
|
|
Text(superset.name ?? "--")
|
|
.font(WerkoutTheme.sectionTitle)
|
|
.foregroundStyle(WerkoutTheme.accent)
|
|
Spacer()
|
|
Text("\(superset.rounds) rounds")
|
|
.font(WerkoutTheme.caption)
|
|
.foregroundStyle(WerkoutTheme.accent)
|
|
|
|
if let estimatedTime = superset.estimatedTime {
|
|
Text("@ " + estimatedTime.asString(style: .abbreviated))
|
|
.font(WerkoutTheme.caption)
|
|
.foregroundStyle(WerkoutTheme.accent)
|
|
}
|
|
}
|
|
})
|
|
}
|
|
}
|
|
.scrollContentBackground(.hidden)
|
|
.background(WerkoutTheme.background)
|
|
.onChange(of: allSupersetExecerciseIndex) { _, _ in
|
|
if let newCurrentExercise = currentExercise {
|
|
withAnimation {
|
|
proxy.scrollTo(
|
|
rowIdentifier(
|
|
supersetIndex: currentSupersetIndex,
|
|
exerciseIndex: currentExerciseIndex,
|
|
exercise: newCurrentExercise
|
|
),
|
|
anchor: .top
|
|
)
|
|
}
|
|
}
|
|
}
|
|
.sheet(item: $videoExercise) { exercise in
|
|
PlayerView(player: $avPlayer)
|
|
.onAppear{
|
|
avPlayer.isMuted = true
|
|
avPlayer.play()
|
|
}
|
|
}
|
|
.onDisappear {
|
|
avPlayer.pause()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
private func rowIdentifier(supersetIndex: Int, exerciseIndex: Int, exercise: SupersetExercise) -> String {
|
|
if let uniqueID = exercise.uniqueID, uniqueID.isEmpty == false {
|
|
return uniqueID
|
|
}
|
|
if let id = exercise.id {
|
|
return "exercise-\(id)"
|
|
}
|
|
return "superset-\(supersetIndex)-exercise-\(exerciseIndex)"
|
|
}
|
|
|
|
private func updatePreviewPlayer(for url: URL) {
|
|
if previewVideoURL == url {
|
|
avPlayer.seek(to: .zero)
|
|
avPlayer.isMuted = true
|
|
avPlayer.play()
|
|
return
|
|
}
|
|
|
|
previewVideoURL = url
|
|
avPlayer = AVPlayer(url: url)
|
|
avPlayer.isMuted = true
|
|
avPlayer.play()
|
|
}
|
|
|
|
func detailView(forExercise supersetExecercise: SupersetExercise) -> some View {
|
|
VStack(spacing: WerkoutTheme.sm) {
|
|
Text(supersetExecercise.exercise.description)
|
|
.font(WerkoutTheme.bodyText)
|
|
.foregroundStyle(WerkoutTheme.textSecondary)
|
|
.frame(maxWidth: .infinity, alignment: .leading)
|
|
WerkoutTheme.divider.frame(height: 0.5)
|
|
Text(supersetExecercise.exercise.muscles.map({ $0.name }).joined(separator: ", "))
|
|
.font(WerkoutTheme.caption)
|
|
.foregroundStyle(WerkoutTheme.accent)
|
|
.frame(maxWidth: .infinity, alignment: .leading)
|
|
}
|
|
}
|
|
}
|
|
|
|
struct ExerciseListView_Previews: PreviewProvider {
|
|
static var previews: some View {
|
|
ExerciseListView(
|
|
workout: PreviewData.workout(),
|
|
showExecersizeInfo: .constant(true),
|
|
isInWorkout: false,
|
|
currentSupersetIndex: 0,
|
|
currentExerciseIndex: 0,
|
|
allSupersetExecerciseIndex: 0,
|
|
currentExercise: nil,
|
|
currentWorkout: nil,
|
|
goToExerciseAt: { _, _ in }
|
|
)
|
|
}
|
|
}
|