Merge pull request Yummypets#471 from sanderdekoning/hideGrid

Add overlay type

Author: s4cha

Source/Configuration/YPImagePickerConfiguration.swift

@@ -214,6 +214,9 @@ public struct YPConfigLibrary {
 
     /// Allow to preselected media items
     public var preselectedItems: [YPMediaItem]?
+    
+    /// Set the overlay type shown on top of the selected library item
+    public var itemOverlayType: YPItemOverlayType = .grid
 }
 
 /// Encapsulates video specific settings.
@@ -268,6 +271,11 @@ public struct YPConfigSelectionsGallery {
     public var hidesRemoveButton = true
 }
 
+public enum YPItemOverlayType {
+    case none
+    case grid
+}
+
 public enum YPlibraryMediaType {
     case photo
     case video

Source/Pages/Gallery/YPAssetViewContainer.swift

@@ -14,7 +14,7 @@ import AVFoundation
 /// The container for asset (video or image). It containts the YPGridView and YPAssetZoomableView.
 class YPAssetViewContainer: UIView {
     public var zoomableView: YPAssetZoomableView?
-    public let grid = YPGridView()
+    public var itemOverlay: UIView?
     public let curtain = UIView()
     public let spinnerView = UIView()
     public let squareCropButton = UIButton()
@@ -26,12 +26,25 @@ class YPAssetViewContainer: UIView {
     private var shouldCropToSquare = YPConfig.library.isSquareByDefault
     private var isMultipleSelection = false
 
+    public var itemOverlayType = YPConfig.library.itemOverlayType
+    
     override func awakeFromNib() {
         super.awakeFromNib()
 
-        addSubview(grid)
-        grid.frame = frame
-        clipsToBounds = true
+        switch itemOverlayType {
+        case .grid:
+            itemOverlay = YPGridView()
+        default:
+            break
+        }
+        
+        if let itemOverlay = itemOverlay {
+            addSubview(itemOverlay)
+            itemOverlay.frame = frame
+            clipsToBounds = true
+            
+            itemOverlay.alpha = 0
+        }
 
         for sv in subviews {
             if let cv = sv as? YPAssetZoomableView {
@@ -40,8 +53,6 @@ class YPAssetViewContainer: UIView {
             }
         }
 
-        grid.alpha = 0
-        
         let touchDownGR = UILongPressGestureRecognizer(target: self,
                                                        action: #selector(handleTouchDown))
         touchDownGR.minimumPressDuration = 0
@@ -126,9 +137,11 @@ extension YPAssetViewContainer: YPAssetZoomableViewDelegate {
     public func ypAssetZoomableViewDidLayoutSubviews(_ zoomableView: YPAssetZoomableView) {
         let newFrame = zoomableView.assetImageView.convert(zoomableView.assetImageView.bounds, to: self)
 
-        // update grid position
-        grid.frame = frame.intersection(newFrame)
-        grid.layoutIfNeeded()
+        if let itemOverlay = itemOverlay {
+            // update grid position
+            itemOverlay.frame = frame.intersection(newFrame)
+            itemOverlay.layoutIfNeeded()
+        }
 
         // Update play imageView position - bringing the playImageView from the videoView to assetViewContainer,
         // but the controll for appearing it still in videoView.
@@ -139,16 +152,22 @@ extension YPAssetViewContainer: YPAssetZoomableViewDelegate {
     }
 
     public func ypAssetZoomableViewScrollViewDidZoom() {
+        guard let itemOverlay = itemOverlay else {
+            return
+        }
         if isShown {
             UIView.animate(withDuration: 0.1) {
-                self.grid.alpha = 1
+                itemOverlay.alpha = 1
             }
         }
     }
 
     public func ypAssetZoomableViewScrollViewDidEndZooming() {
+        guard let itemOverlay = itemOverlay else {
+            return
+        }
         UIView.animate(withDuration: 0.3) {
-            self.grid.alpha = 0
+            itemOverlay.alpha = 0
         }
     }
 }
@@ -166,16 +185,19 @@ extension YPAssetViewContainer: UIGestureRecognizerDelegate {
 
     @objc
     private func handleTouchDown(sender: UILongPressGestureRecognizer) {
+        guard let itemOverlay = itemOverlay else {
+            return
+        }
         switch sender.state {
         case .began:
             if isShown {
                 UIView.animate(withDuration: 0.1) {
-                    self.grid.alpha = 1
+                    itemOverlay.alpha = 1
                 }
             }
         case .ended:
             UIView.animate(withDuration: 0.3) {
-                self.grid.alpha = 0
+                itemOverlay.alpha = 0
             }
         default: ()
         }

Source/Pages/Gallery/YPLibraryVC.swift

@@ -313,7 +313,7 @@ public class YPLibraryVC: UIViewController, YPPermissionCheckable {
         delegate?.libraryViewStartedLoadingImage()
 
         let completion = { (isLowResIntermediaryImage: Bool) in
-            self.v.hideGrid()
+            self.v.hideOverlayView()
             self.v.assetViewContainer.refreshSquareCropButton()
             self.updateCropInfo()
             if !isLowResIntermediaryImage {

Source/Pages/Gallery/YPLibraryView.swift

@@ -97,10 +97,10 @@ extension YPLibraryView {
         return xibView
     }
 
-    // MARK: - Grid
+    // MARK: - Overlay view
 
-    func hideGrid() {
-        assetViewContainer.grid.alpha = 0
+    func hideOverlayView() {
+        assetViewContainer.itemOverlay?.alpha = 0
     }
 
     // MARK: - Loader and progress

YPImagePickerExample/YPImagePickerExample/ExampleViewController.swift

@@ -81,7 +81,7 @@ class ExampleViewController: UIViewController {
 
         /* Choose what media types are available in the library. Defaults to `.photo` */
         config.library.mediaType = .photoAndVideo
-
+      config.library.itemOverlayType = .grid
         /* Enables selecting the front camera by default, useful for avatars. Defaults to false */
         // config.usesFrontCamera = true