Fix 28 issues from deep audit and UI audit + redesign changes
Some checks failed
Apple Platform CI / smoke-and-tests (push) Has been cancelled
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>
This commit is contained in:
Trey t
@@ -10,138 +10,138 @@ import AVKit
|
||||
|
||||
struct ExerciseListView: View {
|
||||
@AppStorage(Constants.phoneThotStyle) private var phoneThotStyle: ThotStyle = .never
|
||||
@ObservedObject var bridgeModule = BridgeModule.shared
|
||||
@State var avPlayer = AVPlayer(url: URL(string: "https://dev.werkout.fitness/media/exercise_videos/2_Dumbbell_Lateral_Lunges.mp4") ?? URL(fileURLWithPath: "/dev/null"))
|
||||
@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"
|
||||
|
||||
@State var videoExercise: Exercise? {
|
||||
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: bridgeModule.currentWorkoutInfo.workout) {
|
||||
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(supersets.indices, id: \.self) { supersetIndex in
|
||||
let superset = supersets[supersetIndex]
|
||||
ForEach(Array(supersets.enumerated()), id: \.offset) { supersetIndex, superset in
|
||||
Section(content: {
|
||||
ForEach(superset.exercises.indices, id: \.self) { exerciseIndex in
|
||||
let supersetExecercise = superset.exercises[exerciseIndex]
|
||||
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 bridgeModule.isInWorkout {
|
||||
bridgeModule.currentWorkoutInfo.goToExerciseAt(
|
||||
supersetIndex: supersetIndex,
|
||||
exerciseIndex: exerciseIndex)
|
||||
if isInWorkout {
|
||||
goToExerciseAt(supersetIndex, exerciseIndex)
|
||||
} else {
|
||||
videoExercise = supersetExecercise.exercise
|
||||
}
|
||||
}, label: {
|
||||
HStack {
|
||||
if bridgeModule.isInWorkout &&
|
||||
supersetIndex == bridgeModule.currentWorkoutInfo.supersetIndex &&
|
||||
exerciseIndex == bridgeModule.currentWorkoutInfo.exerciseIndex {
|
||||
if isCurrentExercise {
|
||||
Image(systemName: "figure.run")
|
||||
.foregroundColor(Color("appColor"))
|
||||
.foregroundStyle(WerkoutTheme.accent)
|
||||
}
|
||||
|
||||
|
||||
Text(supersetExecercise.exercise.extName)
|
||||
|
||||
.foregroundStyle(WerkoutTheme.textPrimary)
|
||||
|
||||
Spacer()
|
||||
|
||||
|
||||
if let reps = supersetExecercise.reps,
|
||||
reps > 0 {
|
||||
HStack {
|
||||
HStack(spacing: 4) {
|
||||
Image(systemName: "number")
|
||||
.foregroundColor(.white)
|
||||
.frame(width: 20, alignment: .leading)
|
||||
Text("\(reps)")
|
||||
.foregroundColor(.white)
|
||||
.frame(width: 30, alignment: .trailing)
|
||||
|
||||
}
|
||||
.padding([.top, .bottom], 5)
|
||||
.padding([.leading], 10)
|
||||
.padding([.trailing], 15)
|
||||
.background(.blue)
|
||||
.cornerRadius(5, corners: [.topLeft, .bottomLeft])
|
||||
.frame(alignment: .trailing)
|
||||
.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 {
|
||||
HStack(spacing: 4) {
|
||||
Image(systemName: "stopwatch")
|
||||
.foregroundColor(.white)
|
||||
.frame(width: 20, alignment: .leading)
|
||||
Text("\(duration)")
|
||||
.foregroundColor(.white)
|
||||
.frame(width: 30, alignment: .trailing)
|
||||
}
|
||||
.padding([.top, .bottom], 5)
|
||||
.padding([.leading], 10)
|
||||
.padding([.trailing], 15)
|
||||
.background(.green)
|
||||
.cornerRadius(5, corners: [.topLeft, .bottomLeft])
|
||||
.font(WerkoutTheme.caption)
|
||||
.foregroundStyle(.white)
|
||||
.padding(.horizontal, WerkoutTheme.sm)
|
||||
.padding(.vertical, WerkoutTheme.xs)
|
||||
.background(WerkoutTheme.success)
|
||||
.clipShape(Capsule())
|
||||
}
|
||||
}
|
||||
.padding(.trailing, -20)
|
||||
.contentShape(Rectangle())
|
||||
})
|
||||
.buttonStyle(.plain)
|
||||
.accessibilityLabel("Exercise \(supersetExecercise.exercise.extName)")
|
||||
.accessibilityHint(bridgeModule.isInWorkout ? "Jump to this exercise in the workout" : "Preview exercise video")
|
||||
|
||||
if bridgeModule.isInWorkout &&
|
||||
supersetIndex == bridgeModule.currentWorkoutInfo.supersetIndex &&
|
||||
exerciseIndex == bridgeModule.currentWorkoutInfo.exerciseIndex &&
|
||||
showExecersizeInfo {
|
||||
.accessibilityHint(isInWorkout ? "Jump to this exercise in the workout" : "Preview exercise video")
|
||||
|
||||
if isCurrentExercise && showExecersizeInfo {
|
||||
detailView(forExercise: supersetExecercise)
|
||||
}
|
||||
}.id(rowID)
|
||||
}
|
||||
.listRowBackground(
|
||||
isCurrentExercise
|
||||
? WerkoutTheme.accent.opacity(0.1)
|
||||
: WerkoutTheme.surfaceCard
|
||||
)
|
||||
.id(rowID)
|
||||
}
|
||||
}, header: {
|
||||
HStack {
|
||||
Text(superset.name ?? "--")
|
||||
.foregroundColor(Color("appColor"))
|
||||
.bold()
|
||||
.font(WerkoutTheme.sectionTitle)
|
||||
.foregroundStyle(WerkoutTheme.accent)
|
||||
Spacer()
|
||||
Text("\(superset.rounds) rounds")
|
||||
.foregroundColor(Color("appColor"))
|
||||
.bold()
|
||||
|
||||
.font(WerkoutTheme.caption)
|
||||
.foregroundStyle(WerkoutTheme.accent)
|
||||
|
||||
if let estimatedTime = superset.estimatedTime {
|
||||
Text("@ " + estimatedTime.asString(style: .abbreviated))
|
||||
.foregroundColor(Color("appColor"))
|
||||
.bold()
|
||||
.font(WerkoutTheme.caption)
|
||||
.foregroundStyle(WerkoutTheme.accent)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
.onChange(of: bridgeModule.currentWorkoutInfo.allSupersetExecerciseIndex, perform: { newValue in
|
||||
if let newCurrentExercise = bridgeModule.currentWorkoutInfo.currentExercise {
|
||||
.scrollContentBackground(.hidden)
|
||||
.background(WerkoutTheme.background)
|
||||
.onChange(of: allSupersetExecerciseIndex) { _, _ in
|
||||
if let newCurrentExercise = currentExercise {
|
||||
withAnimation {
|
||||
let currentSupersetIndex = bridgeModule.currentWorkoutInfo.supersetIndex
|
||||
let currentExerciseIndex = bridgeModule.currentWorkoutInfo.exerciseIndex
|
||||
proxy.scrollTo(
|
||||
rowIdentifier(
|
||||
supersetIndex: currentSupersetIndex,
|
||||
@@ -152,7 +152,7 @@ struct ExerciseListView: View {
|
||||
)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
.sheet(item: $videoExercise) { exercise in
|
||||
PlayerView(player: $avPlayer)
|
||||
.onAppear{
|
||||
@@ -190,20 +190,34 @@ struct ExerciseListView: View {
|
||||
avPlayer.isMuted = true
|
||||
avPlayer.play()
|
||||
}
|
||||
|
||||
|
||||
func detailView(forExercise supersetExecercise: SupersetExercise) -> some View {
|
||||
VStack {
|
||||
VStack(spacing: WerkoutTheme.sm) {
|
||||
Text(supersetExecercise.exercise.description)
|
||||
.frame(alignment: .leading)
|
||||
Divider()
|
||||
.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: ", "))
|
||||
.frame(alignment: .leading)
|
||||
.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))
|
||||
ExerciseListView(
|
||||
workout: PreviewData.workout(),
|
||||
showExecersizeInfo: .constant(true),
|
||||
isInWorkout: false,
|
||||
currentSupersetIndex: 0,
|
||||
currentExerciseIndex: 0,
|
||||
allSupersetExecerciseIndex: 0,
|
||||
currentExercise: nil,
|
||||
currentWorkout: nil,
|
||||
goToExerciseAt: { _, _ in }
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user