WIP

Werkout_ios/Views/ExternalWorkoutDetailView.swift

@@ -12,28 +12,52 @@ struct ExternalWorkoutDetailView: View {
     @StateObject var bridgeModule = BridgeModule.shared
     
     var body: some View {
-        if let workout = bridgeModule.currentWorkout {
-            GeometryReader { metrics in
-                VStack {
-                    Text(workout.name)
-                        .font(Font.system(size: 100))
-                        .frame(width: metrics.size.width, height: metrics.size.height * 0.1)
-                    
-                    HStack {
-                        if let currentExercise = bridgeModule.currentExercise {
-                            VideoPlayerView(currentExercise: currentExercise.exercise)
-                                .frame(width: metrics.size.width * 0.6, height: metrics.size.height * 0.7)
+        ZStack {
+            if let workout = bridgeModule.currentWorkout {
+                GeometryReader { metrics in
+                    VStack {
+                        HStack {
+                            if let currentExercise = bridgeModule.currentExercise {
+                                VideoPlayerView(currentExercise: currentExercise.exercise)
+                                    .frame(width: metrics.size.width * 0.6, height: metrics.size.height * 0.8)
+                            }
+                            
+                            ExtExerciseList(workout: workout,
+                                            currentExerciseIdx: bridgeModule.currentExerciseIdx)
+                            .frame(width: metrics.size.width * 0.4, height: metrics.size.height * 0.8)
                         }
                         
-                        ExtExerciseList(workout: workout,
-                                        currentExerciseIdx: bridgeModule.currentExerciseIdx)
-                            .frame(width: metrics.size.width * 0.4, height: metrics.size.height * 0.7)
+                        ExtCountdownView()
+                            .frame(width: metrics.size.width-50, height: metrics.size.height * 0.2)
+                            .padding([.leading, .trailing], 50)
+                            .background(Color(uiColor: UIColor.secondarySystemBackground))
                     }
-                    
-                    ExtCountdownView()
-                        .frame(width: metrics.size.width-50, height: metrics.size.height * 0.2)
-                        .padding([.leading, .trailing], 50)
                 }
+            } else {
+                Text("nothing here bro")
+            }
+        }
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
+        .background(.background)
+    }
+}
+
+struct TitleView: View {
+    @ObservedObject var bridgeModule = BridgeModule.shared
+    
+    var body: some View {
+        HStack {
+            if let workout = bridgeModule.currentWorkout {
+                Text(workout.name)
+                    .font(Font.system(size: 100))
+                    .frame(maxWidth: .infinity, alignment: .leading)
+            }
+            
+            if bridgeModule.currentWorkoutRunTimeInSeconds > -1 {
+                Text("\(bridgeModule.currentWorkoutRunTimeInSeconds)")
+                    .font(Font.system(size: 100))
+                    .frame(maxWidth: .infinity, alignment: .trailing)
+                    .padding(.trailing, 100)
             }
         }
     }
@@ -69,19 +93,29 @@ struct ExtCountdownView: View {
     var body: some View {
         VStack {
             if let currenExercise = bridgeModule.currentExercise {
-                Text(currenExercise.exercise.name)
-                    .font(Font.system(size: 100))
-                    .frame(maxWidth: .infinity, alignment: .leading)
-                
+                HStack {
+                    Text(currenExercise.exercise.name)
+                        .font(Font.system(size: 100))
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                    
+                    if bridgeModule.currentWorkoutRunTimeInSeconds > -1 {
+                        Text("\(bridgeModule.currentWorkoutRunTimeInSeconds)")
+                            .font(Font.system(size: 100))
+                            .frame(maxWidth: .infinity, alignment: .trailing)
+                            .padding(.trailing, 100)
+                    }
+                }
                 HStack {
                     if let duration = currenExercise.duration {
                         ProgressView(value: Float(bridgeModule.timeLeft), total: Float(duration))
                             .scaleEffect(x: 1, y: 6, anchor: .center)
                         Text("\(bridgeModule.timeLeft)")
                             .font(Font.system(size: 75))
-                            .padding(.leading)
+                            .padding([.leading, .trailing])
                     } else if let reps = currenExercise.reps {
                         Text("\(reps)")
+                            .font(Font.system(size: 75))
+                            .padding([.leading, .trailing])
                     }
                 }
             }
@@ -98,6 +132,11 @@ struct VideoPlayerView: View {
             .onAppear{
                 player = AVPlayer(url:  Bundle.main.url(forResource: "Straight_Leg_Sit_Up", withExtension: "mp4")!)
                 player.play()
+                
+                NotificationCenter.default.addObserver(forName: .AVPlayerItemDidPlayToEndTime, object: nil, queue: .main) { _ in
+                    player.seek(to: .zero)
+                    player.play()
+                }
             }
     }
 }

Werkout_ios/Views/WorkoutDetailView.swift

@@ -12,12 +12,6 @@ struct WorkoutDetailView: View {
     var bridgeModule = BridgeModule.shared
     @Environment(\.dismiss) var dismiss
     
-    @State var selectedIdx = 0 {
-        didSet {
-            runItemAt(idx: selectedIdx)
-        }
-    }
-    
     var body: some View {
         ZStack {
             switch viewModel.status {
@@ -25,53 +19,70 @@ struct WorkoutDetailView: View {
                 Text("Loading")
             case .showWorkout(let workout):
                 VStack {
-                    HStack {
-                        Button("i dont want to do this", action: {
-                            bridgeModule.currentWorkout = nil
-                            dismiss()
-                        })
-                        .frame(maxWidth: .infinity, maxHeight: .infinity)
-                        .background(.red)
-                        
-                        Button("ohhh lets do it", action: {
-                            bridgeModule.currentWorkout = workout
-                            runItemAt(idx: 0)
-                        })
-                        .frame(maxWidth: .infinity, maxHeight: .infinity)
-                        .background(.green)
-                    }
+                    TopButtonsView(workout: workout)
                     .frame(height: 88)
                    
+                    CurrentWorkoutElapsedTimeView()
                     ExerciseListView(workout: workout)
                     CountdownView()
                 }
-                .onAppear{
-                    bridgeModule.timerCompleted = {
-                        selectedIdx += 1
-                    }
-                }
                 .interactiveDismissDisabled()
             }
         }
     }
+}
 
-    func runItemAt(idx: Int) {
-        switch viewModel.status {
-        case .showWorkout(let workout):
-            if idx < workout.exercises.count {
-                let exercise = workout.exercises[idx]
-                bridgeModule.updateCurrent(exercise: exercise)
-                bridgeModule.currentExerciseIdx = idx
+struct TopButtonsView: View {
+    @ObservedObject var bridgeModule = BridgeModule.shared
+    var workout: Workout
+    @Environment(\.dismiss) var dismiss
+    
+    var body: some View {
+        HStack {
+            if bridgeModule.currentWorkoutRunTimeInSeconds == -1 {
+                Button(action: {
+                    bridgeModule.completeWorkout()
+                    dismiss()
+                }, label: {
+                    Image(systemName: "xmark.octagon.fill")
+                        .font(.title)
+                })
+                .frame(maxWidth: .infinity, maxHeight: .infinity)
+                .background(.red)
+                .foregroundColor(.white)
+                
+                Button(action: {
+                    bridgeModule.start(workout: workout)
+                }, label: {
+                    Image(systemName: "figure.golf")
+                        .font(.title)
+                })
+                .frame(maxWidth: .infinity, maxHeight: .infinity)
+                .background(.green)
+                .foregroundColor(.white)
             } else {
-                workoutComplete()
+                Button(action: {
+                    bridgeModule.completeWorkout()
+                    dismiss()
+                }, label: {
+                    Image(systemName: "checkmark")
+                        .font(.title)
+                })
+                .frame(maxWidth: .infinity, maxHeight: .infinity)
+                .background(.blue)
+                .foregroundColor(.white)
             }
-        default:
-            fatalError("no workout!!")
         }
     }
+}
+
+struct CurrentWorkoutElapsedTimeView: View {
+    @ObservedObject var bridgeModule = BridgeModule.shared
     
-    private func workoutComplete() {
-        
+    var body: some View {
+        if bridgeModule.currentWorkoutRunTimeInSeconds > -1 {
+            Text("\(bridgeModule.currentWorkoutRunTimeInSeconds)")
+        }
     }
 }
 
@@ -84,7 +95,9 @@ struct ExerciseListView: View {
             ForEach(workout.exercisesSortedByCreated_at.indices, id: \.self) { i in
                 let obj = workout.exercisesSortedByCreated_at[i]
                 Text(obj.exercise.name)
-                //                            .onTapGesture { selectedIdx = i }
+                    .onTapGesture {
+                        bridgeModule.start(workout: workout, atExerciseIndex: i)
+                    }
             }
         }
     }