admin/WerkoutIOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Trey t
2023-07-05 17:36:20 -05:00
parent 648ef93d23
commit 52ab089c12
6 changed files with 158 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
Werkout_ios/Views/WorkoutDetail/WorkoutDetailView.swift
View File

@@ -20,7 +20,7 @@ struct WorkoutDetailView: View {
case completedWorkout([String: Any])
var id: String { return UUID().uuidString }
}
@State var presentedSheet: Sheet?
@State var workoutToPlan: Workout?
var showAddToCalendar = true
@@ -49,14 +49,14 @@ struct WorkoutDetailView: View {
}
InfoView(workout: workout)
Divider()
.padding([.leading, .trailing])
.padding([.leading, .trailing])
ExerciseListView(workout: workout)
ActionsView(completedWorkout: {
bridgeModule.completeWorkout()
}, planWorkout: { workout in
workoutToPlan = workout
}, workout: workout, showAddToCalendar: showAddToCalendar)
.frame(height: 44)
.frame(height: 44)
}
.sheet(item: $presentedSheet) { item in
@@ -186,7 +186,7 @@ struct ActionsView: View {
}
Button(action: {
startWorkout()
startWorkout()
}, label: {
Image(systemName: "arrowtriangle.forward.fill")
.font(.title)
@@ -204,6 +204,17 @@ struct ActionsView: View {
.frame(maxWidth: .infinity, maxHeight: .infinity)
})
.frame(maxWidth: .infinity, maxHeight: .infinity)
.background(.green)
.foregroundColor(.white)
Button(action: {
bridgeModule.pauseWorkout()
}, label: {
Image(systemName: "pause.circle.fill")
.font(.title)
.frame(maxWidth: .infinity, maxHeight: .infinity)
})
.frame(maxWidth: .infinity, maxHeight: .infinity)
.background(.yellow)
.foregroundColor(.white)
@@ -263,47 +274,70 @@ struct ExerciseListView: View {
}
var body: some View {
List() {
ScrollViewReader { proxy in
List() {
ForEach(workout.exercisesSortedByCreated_at.indices, id: \.self) { i in
let obj = workout.exercisesSortedByCreated_at[i]
VStack {
HStack {
if i == bridgeModule.currentExerciseIdx {
Image(systemName: "checkmark")
.foregroundColor(.green)
}
Text(obj.exercise.name)
Spacer()
}
.contentShape(Rectangle())
.onTapGesture {
if bridgeModule.isInWorkout {
bridgeModule.goToExerciseAt(index: i)
} else {
videoExercise = obj.exercise
}
HStack {
if i == bridgeModule.currentExerciseIdx {
Image(systemName: "checkmark")
.foregroundColor(.green)
}
if i == bridgeModule.currentExerciseIdx {
HStack {
if obj.exercise.isReps {
Text("is reps")
.frame(maxWidth: .infinity, maxHeight: .infinity)
}
if obj.exercise.isWeight {
Text("is weight")
.frame(maxWidth: .infinity, maxHeight: .infinity)
}
if obj.exercise.isDuration {
Text("is duration")
.frame(maxWidth: .infinity, maxHeight: .infinity)
}
Text(obj.exercise.name)
.id(i)
if let reps = obj.reps,
reps > 0 {
Text("Reps: \(reps)")
.frame(maxWidth: .infinity, alignment: .trailing)
}
if let weight = obj.weight,
weight > 0 {
Text(" - Weight: \(weight)")
.frame(maxWidth: .infinity, alignment: .trailing)
}
if let duration = obj.duration,
duration > 0 {
Text("Duration: \(duration)")
.frame(maxWidth: .infinity, alignment: .trailing)
}
Spacer()
}
.contentShape(Rectangle())
.onTapGesture {
if bridgeModule.isInWorkout {
bridgeModule.goToExerciseAt(index: i)
} else {
videoExercise = obj.exercise
}
}
if i == bridgeModule.currentExerciseIdx {
HStack {
if obj.exercise.isReps {
Text("is reps")
.frame(maxWidth: .infinity, maxHeight: .infinity)
}
if obj.exercise.isWeight {
Text("is weight")
.frame(maxWidth: .infinity, maxHeight: .infinity)
}
if obj.exercise.isDuration {
Text("is duration")
.frame(maxWidth: .infinity, maxHeight: .infinity)
}
}
}
}
}
.onChange(of: bridgeModule.currentExerciseIdx, perform: { newValue in
withAnimation {
proxy.scrollTo(newValue, anchor: .top)
}
})
}
.sheet(item: $videoExercise) { exercise in
PlayerView(player: $avPlayer)
.onAppear{
@@ -317,7 +351,8 @@ struct CountdownView: View {
@StateObject var bridgeModule = BridgeModule.shared
var body: some View {
if let duration = bridgeModule.currentExercise?.duration {
if let duration = bridgeModule.currentExercise?.duration,
duration > 0 {
HStack {
ProgressView(value: Float(bridgeModule.currentExerciseTimeLeft), total: Float(duration))
Text("\(bridgeModule.currentExerciseTimeLeft)")