refactoring

Author: swiftuiux

Sources/swiftui-loop-videoplayer/protocol/LoopPlayerViewProtocol.swift

@@ -15,14 +15,22 @@ import SwiftUI
 public protocol LoopPlayerViewProtocol {
 
     #if os(iOS) || os(tvOS)
-    associatedtype View :UIView
+    associatedtype View : UIView
     #elseif os(macOS)
     associatedtype View : NSView
     #else
     associatedtype View : CustomView
     #endif
 
     associatedtype ErrorView
+
+    #if os(iOS) || os(tvOS)
+        associatedtype PlayerView: LoopingPlayerProtocol, UIView
+    #elseif os(macOS)
+        associatedtype PlayerView: LoopingPlayerProtocol, NSView
+    #else
+        associatedtype PlayerView: LoopingPlayerProtocol, CustomView
+    #endif
 
     /// Settings for configuring the video player.
     var settings: Settings { get }
@@ -58,62 +66,24 @@ public extension LoopPlayerViewProtocol{
             activateFullScreenConstraints(for: errorView, in: view)
         }
     }
-
-    /// Adds a subview to a given view and activates full-screen constraints on the subview within the parent view.
-    /// - Parameters:
-    ///   - view: The parent view to which the subview will be added.
-    ///   - subView: The subview that will be added to the parent view.
-    @MainActor
-    func compose(_ view: View, _ subView: View) {
-        view.addSubview(subView)
-        activateFullScreenConstraints(for: subView, in: view)
-    }
-}
-
-#if os(iOS) || os(tvOS)
-@available(iOS 14, tvOS 14, *)
-public extension LoopPlayerViewProtocol where Self: UIViewRepresentable, Context == UIViewRepresentableContext<Self> {
 
     /// Creates a player view for looping video content.
     /// - Parameters:
     ///   - context: The UIViewRepresentable context providing environment data and coordinator.
     ///   - asset: The AVURLAsset to be used for video playback.
     /// - Returns: A PlayerView instance conforming to LoopingPlayerProtocol.
     @MainActor
-    func createPlayerView<PlayerView: LoopingPlayerProtocol>(
-        context: Context,
-        asset: AVURLAsset) -> PlayerView {
+    func makePlayerView(
+        _ container: View,
+        asset: AVURLAsset?) -> PlayerView? {
 
+        if let asset{
+            let player = PlayerView(asset: asset, gravity: settings.gravity)
+            container.addSubview(player)
+            activateFullScreenConstraints(for: player, in: container)
+            return player
+        }
 
-        let player = PlayerView(asset: asset, gravity: settings.gravity)
-
-        player.delegate = context.coordinator as? PlayerErrorDelegate
-        return player
-    }
-}
-
-#endif
-
-#if os(macOS)
-@available(macOS 11, *)
-public extension LoopPlayerViewProtocol where Self: NSViewRepresentable, Context == NSViewRepresentableContext<Self> {
-    
-    /// Creates a player view for looping video content.
-    /// - Parameters:
-    ///   - context: The NSViewRepresentable context providing environment data and coordinator.
-    ///   - asset: The AVURLAsset to be used for video playback.
-    /// - Returns: A PlayerView instance conforming to LoopingPlayerProtocol.
-    @MainActor
-    func createPlayerView<PlayerView: LoopingPlayerProtocol>(
-        context: Context,
-        asset: AVURLAsset) -> PlayerView {
-        
-        let player = PlayerView(asset: asset, gravity: settings.gravity)
-
-            player.delegate = context.coordinator as? PlayerErrorDelegate
-        return player
+        return nil
     }
 }
-#endif
-
-

Sources/swiftui-loop-videoplayer/view/loop/ios/LoopPlayerViewIOS.swift

@@ -23,6 +23,7 @@ struct LoopPlayerViewIOS: UIViewRepresentable, LoopPlayerViewProtocol {
 
     typealias ErrorView = ErrorMsgViewIOS
 
+    typealias PlayerView = LoopingPlayerUIView
 
     /// Settings for the player view
     public let settings: Settings
@@ -45,12 +46,13 @@ struct LoopPlayerViewIOS: UIViewRepresentable, LoopPlayerViewProtocol {
     /// - Parameter context: The context for the view
     /// - Returns: A configured UIView
     func makeUIView(context: Context) -> UIView {
-        let container = UIView()
-        
-        if let asset{
-            let player: LoopingPlayerUIView = createPlayerView(context: context, asset: asset)
-            compose(container, player)
-        }
+       let container = UIView()
+   
+       if let player: PlayerView = makePlayerView(
+            container,
+            asset: asset){
+           player.delegate = context.coordinator
+       }
 
         makeErrorView(container, error: error)
 
@@ -67,8 +69,8 @@ struct LoopPlayerViewIOS: UIViewRepresentable, LoopPlayerViewProtocol {
         updateView(uiView, error: error)
     }
 
-    /// Creates the coordinator for handling player errors
-    /// - Returns: A configured Coordinator
+    /// Creates a coordinator that handles error-related updates and interactions between the SwiftUI view and its underlying model.
+    /// - Returns: An instance of PlayerErrorCoordinator that can be used to manage error states and communicate between the view and model.
     func makeCoordinator() -> PlayerErrorCoordinator {
         PlayerErrorCoordinator($error)
     }

Sources/swiftui-loop-videoplayer/view/loop/mac/LoopPlayerViewMacOS.swift

@@ -22,6 +22,8 @@ struct LoopPlayerViewMacOS: NSViewRepresentable, LoopPlayerViewProtocol {
 
     typealias ErrorView = ErrorMsgViewMacOS
 
+    typealias PlayerView = LoopingPlayerNSView
+    
     /// Settings for the player view
     public let settings: Settings
 
@@ -39,25 +41,35 @@ struct LoopPlayerViewMacOS: NSViewRepresentable, LoopPlayerViewProtocol {
         self._error = State(initialValue: detectError(settings: settings, asset: self.asset))
     }
 
+    /// Creates the NSView for the representable component. It initializes the view, configures it with a player if available, and adds an error view if necessary.
+    /// - Parameter context: The context containing environment and state information used during view creation.
+    /// - Returns: A fully configured NSView containing both the media player and potentially an error message display.
     func makeNSView(context: Context) -> NSView {
         let container = NSView()
-        
-        if let asset{
-            let player: LoopingPlayerNSView = createPlayerView(context: context, asset: asset)
-            compose(container, player)
+    
+        if let player: PlayerView = makePlayerView(
+             container,
+             asset: asset){
+            player.delegate = context.coordinator
         }
-        
-        makeErrorView(container, error: error)
-        
-        return container
+         
+         makeErrorView(container, error: error)
+         
+         return container
     }
 
+    /// Updates the specified NSView during the view's lifecycle in response to state changes.
+    /// - Parameters:
+    ///   - nsView: The NSView that needs updating.
+    ///   - context: The context containing environment and state information used during the view update.
     func updateNSView(_ nsView: NSView, context: Context) {
         nsView.subviews.filter { $0 is ErrorView }.forEach { $0.removeFromSuperview() }
 
         updateView(nsView, error: error)
     }
 
+    /// Creates a coordinator that handles error-related updates and interactions between the SwiftUI view and its underlying model.
+    /// - Returns: An instance of PlayerErrorCoordinator that can be used to manage error states and communicate between the view and model.
     func makeCoordinator() -> PlayerErrorCoordinator {
         PlayerErrorCoordinator($error)
     }