WIP
This commit is contained in:
@@ -78,12 +78,18 @@ class BridgeModule: ObservableObject {
|
|||||||
timer?.invalidate()
|
timer?.invalidate()
|
||||||
timer = nil
|
timer = nil
|
||||||
|
|
||||||
currentExerciseIdx += 1
|
nextExercise()
|
||||||
if let currentWorkout = currentWorkout {
|
}
|
||||||
if currentExerciseIdx < currentWorkout.exercises.count {
|
}
|
||||||
let nextExercise = currentWorkout.exercises[currentExerciseIdx]
|
|
||||||
updateCurrent(exercise: nextExercise)
|
func nextExercise() {
|
||||||
}
|
currentExerciseIdx += 1
|
||||||
|
if let currentWorkout = currentWorkout {
|
||||||
|
if currentExerciseIdx < currentWorkout.exercises.count {
|
||||||
|
let nextExercise = currentWorkout.exercises[currentExerciseIdx]
|
||||||
|
updateCurrent(exercise: nextExercise)
|
||||||
|
} else {
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,17 +19,18 @@ struct WorkoutDetailView: View {
|
|||||||
Text("Loading")
|
Text("Loading")
|
||||||
case .showWorkout(let workout):
|
case .showWorkout(let workout):
|
||||||
VStack {
|
VStack {
|
||||||
TopButtonsView(workout: workout)
|
|
||||||
.frame(height: 88)
|
|
||||||
|
|
||||||
Text(workout.name)
|
Text(workout.name)
|
||||||
.font(.title3)
|
.font(.title3)
|
||||||
|
.padding()
|
||||||
if let desc = workout.description {
|
if let desc = workout.description {
|
||||||
Text(desc)
|
Text(desc)
|
||||||
.font(.body)
|
.font(.body)
|
||||||
}
|
}
|
||||||
CurrentWorkoutElapsedTimeView()
|
CurrentWorkoutElapsedTimeView()
|
||||||
ExerciseListView(workout: workout)
|
ExerciseListView(workout: workout)
|
||||||
|
ActionsView(workout: workout)
|
||||||
|
.frame(height: 44)
|
||||||
CountdownView()
|
CountdownView()
|
||||||
}
|
}
|
||||||
.interactiveDismissDisabled()
|
.interactiveDismissDisabled()
|
||||||
@@ -38,7 +39,7 @@ struct WorkoutDetailView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
struct TopButtonsView: View {
|
struct ActionsView: View {
|
||||||
@ObservedObject var bridgeModule = BridgeModule.shared
|
@ObservedObject var bridgeModule = BridgeModule.shared
|
||||||
var workout: Workout
|
var workout: Workout
|
||||||
@Environment(\.dismiss) var dismiss
|
@Environment(\.dismiss) var dismiss
|
||||||
@@ -69,6 +70,17 @@ struct TopButtonsView: View {
|
|||||||
.background(.green)
|
.background(.green)
|
||||||
.foregroundColor(.white)
|
.foregroundColor(.white)
|
||||||
} else {
|
} else {
|
||||||
|
Button(action: {
|
||||||
|
bridgeModule.nextExercise()
|
||||||
|
}, label: {
|
||||||
|
Image(systemName: "arrow.forward")
|
||||||
|
.font(.title)
|
||||||
|
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
||||||
|
})
|
||||||
|
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
||||||
|
.background(.yellow)
|
||||||
|
.foregroundColor(.white)
|
||||||
|
|
||||||
Button(action: {
|
Button(action: {
|
||||||
bridgeModule.completeWorkout()
|
bridgeModule.completeWorkout()
|
||||||
dismiss()
|
dismiss()
|
||||||
|
|||||||
Reference in New Issue
Block a user