WIP

Werkout_ios/Views/WorkoutDetailView.swift

@@ -8,11 +8,11 @@
 import SwiftUI
 
 struct WorkoutDetailView: View {
-    @ObservedObject var viewModel:  WorkoutDetailViewModel
-    @EnvironmentObject var bridgeModule: BridgeModule
+    @StateObject var viewModel:  WorkoutDetailViewModel
+    var bridgeModule = BridgeModule.shared
     @Environment(\.dismiss) var dismiss
     
-    @State var selectedIdx = -1 {
+    @State var selectedIdx = 0 {
         didSet {
             runItemAt(idx: selectedIdx)
         }
@@ -34,26 +34,16 @@ struct WorkoutDetailView: View {
                         .background(.red)
                         
                         Button("ohhh lets do it", action: {
+                            bridgeModule.currentWorkout = workout
                             runItemAt(idx: 0)
                         })
                         .frame(maxWidth: .infinity, maxHeight: .infinity)
                         .background(.green)
                     }
                     .frame(height: 88)
-                    List() {
-                        ForEach(workout.exercisesSortedByCreated_at.indices, id: \.self) { i in
-                            let obj = workout.exercisesSortedByCreated_at[i]
-                            Text(obj.exercise.name ?? "")
-                                .onTapGesture { selectedIdx = i }
-                        }
-                    }
-                    
-                    if let duration = bridgeModule.currentExercise?.duration {
-                        HStack {
-                            ProgressView(value: Float(bridgeModule.timeLeft), total: Float(duration))
-                            Text("\(bridgeModule.timeLeft)")
-                        }.padding(16)
-                    }
+                   
+                    ExerciseListView(workout: workout)
+                    CountdownView()
                 }
                 .onAppear{
                     bridgeModule.timerCompleted = {
@@ -63,9 +53,8 @@ struct WorkoutDetailView: View {
                 .interactiveDismissDisabled()
             }
         }
-       
     }
-    
+
     func runItemAt(idx: Int) {
         switch viewModel.status {
         case .showWorkout(let workout):
@@ -86,6 +75,36 @@ struct WorkoutDetailView: View {
     }
 }
 
+struct ExerciseListView: View {
+    @ObservedObject var bridgeModule = BridgeModule.shared
+    var workout: Workout
+    
+    var body: some View {
+        List() {
+            ForEach(workout.exercisesSortedByCreated_at.indices, id: \.self) { i in
+                let obj = workout.exercisesSortedByCreated_at[i]
+                Text(obj.exercise.name)
+                //                            .onTapGesture { selectedIdx = i }
+            }
+        }
+    }
+}
+
+struct CountdownView: View {
+    @StateObject var bridgeModule = BridgeModule.shared
+    
+    var body: some View {
+        VStack {
+            if let duration = bridgeModule.currentExercise?.duration {
+                HStack {
+                    ProgressView(value: Float(bridgeModule.timeLeft), total: Float(duration))
+                    Text("\(bridgeModule.timeLeft)")
+                }.padding(16)
+            }
+        }
+    }
+}
+
 struct WorkoutDetailView_Previews: PreviewProvider {
     static var previews: some View {
         WorkoutDetailView(viewModel: WorkoutDetailViewModel(workout: PreviewWorkout.workout()))