diff --git a/Werkout_ios/BridgeModule.swift b/Werkout_ios/BridgeModule.swift index 057990a..3ad6633 100644 --- a/Werkout_ios/BridgeModule.swift +++ b/Werkout_ios/BridgeModule.swift @@ -30,10 +30,15 @@ class BridgeModule: NSObject, ObservableObject { public private(set) var workoutStartDate: Date? private var currentExerciseTimer: Timer? - public private(set) var currentExerciseIdx: Int = -1 + public private(set) var currentExerciseIdx: Int = -1 { + didSet { + self.currentExercisePositionString = "\(self.currentExerciseIdx+1)/\(self.currentWorkout?.exercises.count ?? 0)" + } + } @Published var currentExerciseTimeLeft: Int = 0 @Published var currentExercise: ExerciseElement? - + var currentExercisePositionString: String? + private var isWatchConnected = false // workoutEndDate fills out WatchPackageModel.workoutEndDate which // tells the watch app to stop the workout diff --git a/Werkout_ios/Views/ExternalWorkoutDetailView.swift b/Werkout_ios/Views/ExternalWorkoutDetailView.swift index 37aa9ee..b49e5ab 100644 --- a/Werkout_ios/Views/ExternalWorkoutDetailView.swift +++ b/Werkout_ios/Views/ExternalWorkoutDetailView.swift @@ -25,10 +25,19 @@ struct ExternalWorkoutDetailView: View { avPlayer.play() } - ExtExerciseList(workout: workout, - currentExerciseIdx: bridgeModule.currentExerciseIdx) + VStack { + if let currentExercisePositionString = bridgeModule.currentExercisePositionString { + Text(currentExercisePositionString) + .font(Font.system(size: 55)) + .scaledToFit() + .minimumScaleFactor(0.01) + .lineLimit(1) + .padding() + } + ExtExerciseList(workout: workout, + currentExerciseIdx: bridgeModule.currentExerciseIdx) + } .frame(width: metrics.size.width * 0.3, height: metrics.size.height * 0.8) - } ExtCountdownView()