Feature: flag to autoplay videos (#70)

* Include flag to autoplay videos

* Improve autoplay behaviour

Author: 3lvis

Source/VideoView.swift

@@ -23,6 +23,8 @@ class VideoView: UIView {
 
     var image: UIImage?
 
+    var autoplay = false
+
     private lazy var loadingIndicator: UIActivityIndicatorView = {
         let view = UIActivityIndicatorView(activityIndicatorStyle: .whiteLarge)
         view.autoresizingMask = [.flexibleLeftMargin, .flexibleTopMargin]
@@ -78,8 +80,11 @@ class VideoView: UIView {
 
         if player.status == .readyToPlay {
             self.stopPlayerAndRemoveObserverIfNecessary()
-            player.play()
-            self.viewDelegate?.videoViewDidStartPlaying(self)
+
+            if self.autoplay {
+                player.play()
+                self.viewDelegate?.videoViewDidStartPlaying(self)
+            }
         }
     }
 
@@ -96,7 +101,9 @@ class VideoView: UIView {
 
     var timeObserver: Any?
 
-    func start(_ viewerItem: ViewerItem) {
+    func start(_ viewerItem: ViewerItem, autoplay: Bool) {
+        self.autoplay = autoplay
+
         if let assetID = viewerItem.assetID {
             #if os(iOS)
                 let result = PHAsset.fetchAssets(withLocalIdentifiers: [assetID], options: nil)
@@ -152,12 +159,14 @@ class VideoView: UIView {
             self.updateProgressBar(forDuration: duration, currentTime: currentTime)
         }
 
-        self.playerLayer.isHidden = false
+        if self.autoplay {
+            self.playerLayer.isHidden = false
+        }
 
         if self.shouldRegisterForNotifications {
             guard let player = self.playerLayer.player else { fatalError("No player item was found") }
 
-            if player.status == .unknown {
+            if self.autoplay && player.status == .unknown {
                 self.loadingIndicator.startAnimating()
                 self.loadingIndicatorBackground.alpha = 1
             }

Source/ViewerController.swift

@@ -51,6 +51,11 @@ public class ViewerController: UIViewController {
     public weak var controllerDelegate: ViewerControllerDelegate?
     public weak var controllerDataSource: ViewerControllerDataSource?
 
+    /**
+     Flag that tells the viewer controller to autoplay videos on focus
+     */
+    public var autoplayVideos: Bool = false
+
     /**
      Cache for the reused ViewerItemControllers
      */
@@ -439,6 +444,10 @@ extension ViewerController: ViewerItemControllerDataSource {
 
         return viewerItemController == focusedViewerItemController
     }
+
+    func viewerItemControllerShouldAutoplayVideo(_ viewerItemController: ViewerItemController) -> Bool {
+        return self.autoplayVideos
+    }
 }
 
 extension ViewerController: UIGestureRecognizerDelegate {

Source/ViewerItemController.swift

@@ -13,6 +13,7 @@ protocol ViewerItemControllerDelegate: class {
 protocol ViewerItemControllerDataSource: class {
     func isViewerItemControllerOverlayHidden(_ viewerItemController: ViewerItemController) -> Bool
     func viewerItemControllerIsFocused(_ viewerItemController: ViewerItemController) -> Bool
+    func viewerItemControllerShouldAutoplayVideo(_ viewerItemController: ViewerItemController) -> Bool
 }
 
 class ViewerItemController: UIViewController {
@@ -209,16 +210,21 @@ class ViewerItemController: UIViewController {
     func didFocus() {
         guard let viewerItem = self.viewerItem else { return }
 
-        if viewerItem.type == .Video {
-            self.videoView.start(viewerItem)
-            NotificationCenter.default.addObserver(self, selector: #selector(ViewerItemController.videoFinishedPlaying), name: NSNotification.Name.AVPlayerItemDidPlayToEndTime, object: nil)
-        } else {
-            viewerItem.media({ image, error in
+        switch viewerItem.type {
+        case .image:
+            viewerItem.media { image, error in
                 if let image = image {
                     self.imageView.image = image
                     self.zoomingScrollView.maximumZoomScale = self.maxZoomScale()
                 }
-            })
+            }
+        case .video:
+            let autoplayVideo = self.controllerDataSource?.viewerItemControllerShouldAutoplayVideo(self) ?? false
+            self.videoView.start(viewerItem, autoplay: autoplayVideo)
+            NotificationCenter.default.addObserver(self, selector: #selector(ViewerItemController.videoFinishedPlaying), name: NSNotification.Name.AVPlayerItemDidPlayToEndTime, object: nil)
+            if autoplayVideo == false {
+                self.playButton.alpha = 1
+            }
         }
     }