WIP

Werkout_ios/Views/WorkoutDetail/WorkoutDetailView.swift

@@ -40,8 +40,11 @@ struct WorkoutDetailView: View {
                         .padding()
                         
                         GeometryReader { metrics in
-                            WorkoutDetailVideoPlayerView(avPlayer: $avPlayer)
+                            PlayerView(player: $avPlayer)
                                 .frame(width: metrics.size.width * 1, height: metrics.size.height * 1)
+                                .onAppear{
+                                    avPlayer.play()
+                                }
                         }
                     }
                     InfoView(workout: workout)
@@ -75,17 +78,22 @@ struct WorkoutDetailView: View {
             }
         }
         .onChange(of: bridgeModule.currentExercise, perform: { newValue in
+            var _url: URL?
             if showNSFWVideos {
                 if let viddd = newValue?.exercise.nsfwVideoURL,
                    let url = URL(string: BaseURLs.currentBaseURL + viddd) {
-                    avPlayer = AVPlayer(url: url)
+                    _url = url
                 }
             } else {
                 if let viddd = newValue?.exercise.videoURL,
                    let url = URL(string: BaseURLs.currentBaseURL + viddd) {
-                    avPlayer = AVPlayer(url: url)
+                    _url = url
                 }
             }
+            if let __url = _url {
+                avPlayer = AVPlayer(url: __url)
+                avPlayer.play()
+            }
         })
         .onAppear{
             bridgeModule.completedWorkout = {
@@ -118,15 +126,6 @@ struct WorkoutDetailView: View {
     }
 }
 
-struct WorkoutDetailVideoPlayerView: View {
-    @ObservedObject var bridgeModule = BridgeModule.shared
-    @Binding var avPlayer: AVPlayer
-    
-    var body: some View {
-        VideoPlayerView(avPlayer: $avPlayer, showDoneButton: false)
-    }
-}
-
 struct InfoView: View {
     @ObservedObject var bridgeModule = BridgeModule.shared
     var workout: Workout
@@ -306,7 +305,10 @@ struct ExerciseListView: View {
                 }
             }
         .sheet(item: $videoExercise) { exercise in
-            VideoPlayerView(avPlayer: $avPlayer)
+            PlayerView(player: $avPlayer)
+                .onAppear{
+                    avPlayer.play()
+                }
         }
     }
 }