fix bugs:

text 2 speech
exercise selection

Author: dvolkhonskiy

FitCount/ContentView.swift

@@ -7,6 +7,16 @@
 
 import SwiftUI
 
+
+class SessionConfig: ObservableObject {
+    @Published var nReps : Int = 1
+    @Published var nMinutes : Int = 0
+    @Published var nSeconds : Int = 1
+    
+    @Published var useReps: Bool = true
+    @Published var exercise: Exercise = exercises[0] // use first exercise by default but change in the ExerciseDetailsView
+}
+
 struct ContentView: View {
     @StateObject var viewModel = ViewModel()
     @StateObject var sessionConfig: SessionConfig = SessionConfig()

FitCount/Workout/ExerciseDetailsView.swift

@@ -21,15 +21,6 @@ struct TitleNavBarItem: View {
     }
 }
 
-class SessionConfig: ObservableObject {
-    @Published var nReps : Int = 1
-    @Published var nMinutes : Int = 0
-    @Published var nSeconds : Int = 1
-    
-    @Published var useReps: Bool = true
-}
-
-
 struct ExerciseDetailsView: View {
     @EnvironmentObject var viewModel: ViewModel
     @EnvironmentObject var sessionConfig: SessionConfig
@@ -131,11 +122,15 @@ struct ExerciseDetailsView: View {
 
             }
             .navigationDestination(for: String.self) { _ in
-                WorkoutView(exercise: exercise).environmentObject(viewModel).environmentObject(sessionConfig)
+                WorkoutView().environmentObject(viewModel).environmentObject(sessionConfig)
             }
 
 
         }
         .navigationBarTitle(Text(exercise.name))
+        .onAppear() {
+            sessionConfig.exercise = exercise
+            sessionConfig.useReps = selection == 1
+        }
     }
 }

FitCount/Workout/QuickPoseBasicView.swift

@@ -10,7 +10,7 @@ import QuickPoseCore
 import QuickPoseSwiftUI
 
 struct VoiceCommands {
-    public static let standInsideBBox = Text2Speech(text: "Stand so that your whole body is inside the bounding box")
+    public static let standInsideBBox = "Stand so that your whole body is inside the bounding box"
 }
 
 class SessionData: ObservableObject {
@@ -30,8 +30,6 @@ struct QuickPoseBasicView: View {
     @EnvironmentObject var viewModel: ViewModel
     @EnvironmentObject var sessionConfig: SessionConfig
 
-    private var exercise: Exercise
-    
     @State private var overlayImage: UIImage?
 
     @State private var feedbackText: String? = nil
@@ -55,10 +53,6 @@ struct QuickPoseBasicView: View {
 
     let bboxTimer = TimerManager()
 
-    init(exercise: Exercise) {
-        self.exercise = exercise
-    }
-    
     func goToResults() {
         DispatchQueue.main.async {
             sessionData.seconds = Int(exerciseTimer.getTotalSeconds())
@@ -104,7 +98,7 @@ struct QuickPoseBasicView: View {
                         InstructionsView().overlay(alignment: .bottom) {
                             Button (action: {
                                 state = WorkoutState.bbox
-                                VoiceCommands.standInsideBBox.say()
+                                Text2Speech(text: VoiceCommands.standInsideBBox).say()
                             }) {
                                 Text("Start Workout").foregroundColor(.white)
                                     .padding()
@@ -156,7 +150,7 @@ struct QuickPoseBasicView: View {
                     }
                 }
                 .onAppear {
-                    quickPose.start(features: exercise.features, onFrame: { status, image, features, feedback, landmarks in
+                    quickPose.start(features: sessionConfig.exercise.features, onFrame: { status, image, features, feedback, landmarks in
 
 
 
@@ -204,7 +198,7 @@ struct QuickPoseBasicView: View {
                         }
 
                         if (state == WorkoutState.exercise && !exerciseTimer.isRunning()) {
-                            Text2Speech(text: "Now let's start the \(exercise.name) exercise").say()
+                            Text2Speech(text: "Now let's start the \(sessionConfig.exercise.name) exercise").say()
                             exerciseTimer.start()
                         }
 
@@ -217,7 +211,7 @@ struct QuickPoseBasicView: View {
                                 feedbackText = nil
                             }
 
-                            if case .fitness = exercise.features.first, let result = features[exercise.features.first!]{
+                            if case .fitness = sessionConfig.exercise.features.first, let result = features[sessionConfig.exercise.features.first!]{
                                 counter.count(probability: result.value)
                                 if (counter.getCount() > count) {
                                     Text2Speech(text: String(counter.getCount())).say()
@@ -248,7 +242,7 @@ struct QuickPoseBasicView: View {
                     UIApplication.shared.isIdleTimerDisabled = true
                 }
                 .onDisappear {
-                    let sessionDataDump = SessionDataModel(exercise: exercise.name, count: Int(counter.getCount()), seconds: Int(exerciseTimer.getTotalSeconds()), date: Date())
+                    let sessionDataDump = SessionDataModel(exercise: sessionConfig.exercise.name, count: Int(counter.getCount()), seconds: Int(exerciseTimer.getTotalSeconds()), date: Date())
                     appendToJson(sessionData: sessionDataDump)
 
                     quickPose.stop()

FitCount/Workout/WorkoutView.swift

@@ -13,12 +13,11 @@ struct WorkoutView: View {
     @EnvironmentObject var sessionConfig: SessionConfig
 
     @State var cameraPermissionGranted = false
-    var exercise: Exercise
 
     var body: some View {
         GeometryReader { geometry in
             if cameraPermissionGranted {
-                QuickPoseBasicView(exercise: exercise).environmentObject(viewModel).environmentObject(sessionConfig)
+                QuickPoseBasicView().environmentObject(viewModel).environmentObject(sessionConfig)
             }
         }.onAppear {
             AVCaptureDevice.requestAccess(for: .video) { accessGranted in