diff --git a/Werkout_ios/BridgeModule.swift b/Werkout_ios/BridgeModule.swift index 33865bd..26dd06e 100644 --- a/Werkout_ios/BridgeModule.swift +++ b/Werkout_ios/BridgeModule.swift @@ -15,6 +15,7 @@ enum WatchActions: Codable { case restartExercise case previousExercise case stopWorkout + case pauseWorkout case workoutComplete(Data) } @@ -318,6 +319,8 @@ extension BridgeModule: WCSessionDelegate { previousExercise() case .stopWorkout: completeWorkout() + case .pauseWorkout: + pauseWorkout() } } } diff --git a/Werkout_watch Watch App/ContentView.swift b/Werkout_watch Watch App/ContentView.swift index 7de7484..55b1b47 100644 --- a/Werkout_watch Watch App/ContentView.swift +++ b/Werkout_watch Watch App/ContentView.swift @@ -14,7 +14,6 @@ struct ContentView: View { MainWatchView() WatchControlView() } - .padding() .tabViewStyle(PageTabViewStyle()) } } diff --git a/Werkout_watch Watch App/MainWatchView.swift b/Werkout_watch Watch App/MainWatchView.swift index 314e9f5..ec1107d 100644 --- a/Werkout_watch Watch App/MainWatchView.swift +++ b/Werkout_watch Watch App/MainWatchView.swift @@ -66,8 +66,8 @@ struct MainWatchView: View { } } -//struct MainView_Previews: PreviewProvider { -// static var previews: some View { -// MainView() -// } -//} +struct MainView_Previews: PreviewProvider { + static var previews: some View { + MainWatchView() + } +} diff --git a/Werkout_watch Watch App/WatchControlView.swift b/Werkout_watch Watch App/WatchControlView.swift index d8e96c4..6870351 100644 --- a/Werkout_watch Watch App/WatchControlView.swift +++ b/Werkout_watch Watch App/WatchControlView.swift @@ -30,8 +30,7 @@ struct WatchControlView: View { .frame(maxWidth: .infinity, maxHeight: .infinity) }) .buttonStyle(BorderedButtonStyle(tint: .yellow)) - } - VStack { + Button(action: { vm.previousExercise() }, label: { @@ -40,6 +39,16 @@ struct WatchControlView: View { .frame(maxWidth: .infinity, maxHeight: .infinity) }) .buttonStyle(BorderedButtonStyle(tint: .blue)) + } + VStack { + Button(action: { + vm.pauseWorkout() + }, label: { + Image(systemName: "pause") + .font(.title) + .frame(maxWidth: .infinity, maxHeight: .infinity) + }) + .buttonStyle(BorderedButtonStyle(tint: .blue)) Button(action: { vm.nextExercise() @@ -54,8 +63,8 @@ struct WatchControlView: View { } } -//struct WatchControlView_Previews: PreviewProvider { -// static var previews: some View { -// WatchControlView(vm: WatchMainViewModel()) -// } -//} +struct WatchControlView_Previews: PreviewProvider { + static var previews: some View { + WatchControlView(vm: WatchMainViewModel()) + } +} diff --git a/Werkout_watch Watch App/WatchMainViewModel.swift b/Werkout_watch Watch App/WatchMainViewModel.swift index 4676d3c..5e6ca49 100644 --- a/Werkout_watch Watch App/WatchMainViewModel.swift +++ b/Werkout_watch Watch App/WatchMainViewModel.swift @@ -88,6 +88,12 @@ class WatchMainViewModel: NSObject, ObservableObject { let data = try! JSONEncoder().encode(nextExerciseAction) send(data) } + + func pauseWorkout() { + let nextExerciseAction = WatchActions.pauseWorkout + let data = try! JSONEncoder().encode(nextExerciseAction) + send(data) + } } extension WatchMainViewModel {