This commit is contained in:
Trey t
2023-07-02 21:03:54 -05:00
parent 2344bcbd6a
commit 5c66ceff9f
6 changed files with 117 additions and 69 deletions

View File

@@ -35,8 +35,7 @@ struct WorkoutDetailView: View {
CountdownView()
ExerciseListView(workout: workout)
ActionsView(completedWorkout: {
bridgeModule.workoutEndDate = Date()
bridgeModule.sendWorkoutCompleteToWatch()
bridgeModule.completeWorkout()
}, planWorkout: { workout in
workoutToPlan = workout
}, workout: workout, showAddToCalendar: showAddToCalendar)
@@ -62,7 +61,7 @@ struct WorkoutDetailView: View {
}
}
.onAppear{
bridgeModule.completedWorkoutFromWatch = {
bridgeModule.completedWorkout = {
if let workoutData = createWorkoutData() {
presentedSheet = .completedWorkout(workoutData)
bridgeModule.resetCurrentWorkout()
@@ -223,7 +222,7 @@ struct ExerciseListView: View {
Text(obj.exercise.name)
.onTapGesture {
bridgeModule.start(workout: workout, atExerciseIndex: i)
bridgeModule.goToExerciseAt(index: i)
}
Spacer()
@@ -257,8 +256,8 @@ struct CountdownView: View {
VStack {
if let duration = bridgeModule.currentExercise?.duration {
HStack {
ProgressView(value: Float(bridgeModule.timeLeft), total: Float(duration))
Text("\(bridgeModule.timeLeft)")
ProgressView(value: Float(bridgeModule.currentExerciseTimeLeft), total: Float(duration))
Text("\(bridgeModule.currentExerciseTimeLeft)")
}.padding(16)
}
}