WIP
This commit is contained in:
@@ -48,7 +48,6 @@ struct WorkoutDetailView: View {
|
|||||||
.onAppear{
|
.onAppear{
|
||||||
avPlayer.play()
|
avPlayer.play()
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
Button(action: {
|
Button(action: {
|
||||||
if let assetURL = ((avPlayer.currentItem?.asset) as? AVURLAsset)?.url,
|
if let assetURL = ((avPlayer.currentItem?.asset) as? AVURLAsset)?.url,
|
||||||
@@ -85,13 +84,19 @@ struct WorkoutDetailView: View {
|
|||||||
.position(x: 22, y: metrics.size.height - 30)
|
.position(x: 22, y: metrics.size.height - 30)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.padding([.top, .bottom])
|
||||||
|
.background(Color(uiColor: .tertiarySystemBackground))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if !bridgeModule.isInWorkout {
|
||||||
InfoView(workout: workout)
|
InfoView(workout: workout)
|
||||||
.padding(.bottom)
|
.padding(.bottom)
|
||||||
|
}
|
||||||
|
|
||||||
if bridgeModule.isInWorkout {
|
if bridgeModule.isInWorkout {
|
||||||
Divider()
|
Divider()
|
||||||
|
.background(Color(uiColor: .secondaryLabel))
|
||||||
HStack {
|
HStack {
|
||||||
Text("\(bridgeModule.currentExerciseInfo.currentRound) of \(bridgeModule.currentExerciseInfo.numberOfRoundsInCurrentSuperSet)")
|
Text("\(bridgeModule.currentExerciseInfo.currentRound) of \(bridgeModule.currentExerciseInfo.numberOfRoundsInCurrentSuperSet)")
|
||||||
.font(.title3)
|
.font(.title3)
|
||||||
@@ -109,11 +114,15 @@ struct WorkoutDetailView: View {
|
|||||||
.padding(.trailing, 10)
|
.padding(.trailing, 10)
|
||||||
}
|
}
|
||||||
.padding([.top, .bottom])
|
.padding([.top, .bottom])
|
||||||
|
.background(Color(uiColor: .tertiarySystemBackground))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Divider()
|
||||||
|
.background(Color(uiColor: .secondaryLabel))
|
||||||
|
|
||||||
ExerciseListView(workout: workout, showExecersizeInfo: $showExecersizeInfo)
|
ExerciseListView(workout: workout, showExecersizeInfo: $showExecersizeInfo)
|
||||||
.padding([.top, .bottom], 10)
|
.padding([.top, .bottom], 10)
|
||||||
.background(Color(uiColor: .secondarySystemBackground))
|
.background(Color(uiColor: .systemGroupedBackground))
|
||||||
|
|
||||||
ActionsView(completedWorkout: {
|
ActionsView(completedWorkout: {
|
||||||
bridgeModule.completeWorkout()
|
bridgeModule.completeWorkout()
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ struct InfoView: View {
|
|||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
VStack {
|
VStack {
|
||||||
if bridgeModule.isInWorkout == false {
|
|
||||||
Text(workout.name)
|
Text(workout.name)
|
||||||
.frame(maxWidth: .infinity, alignment: .leading)
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
.font(.title3)
|
.font(.title3)
|
||||||
@@ -35,7 +34,6 @@ struct InfoView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
struct InfoView_Previews: PreviewProvider {
|
struct InfoView_Previews: PreviewProvider {
|
||||||
static var previews: some View {
|
static var previews: some View {
|
||||||
|
|||||||
Reference in New Issue
Block a user