mikaoj · huylv-teko · Oct 8, 2020 · Oct 21, 2020
diff --git a/Example/Base.lproj/Main.storyboard b/Example/Base.lproj/Main.storyboard
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -19,7 +20,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GFw-cP-rmQ">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GFw-cP-rmQ">
                                 <rect key="frame" x="143.5" y="318.5" width="88" height="30"/>
                                 <state key="normal" title="Image picker">
                                     <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -28,7 +29,7 @@
                                     <action selector="showImagePicker:" destination="BYZ-38-t0r" eventType="touchUpInside" id="LaC-Tl-d1J"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DzO-ex-PdY">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DzO-ex-PdY">
                                 <rect key="frame" x="114.5" y="356.5" width="146" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="146" id="Cd2-rJ-ekE"/>
@@ -41,7 +42,7 @@
                                     <action selector="showCustomImagePicker:" destination="BYZ-38-t0r" eventType="touchUpInside" id="GKA-nS-l2H"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zgs-tU-5p9">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zgs-tU-5p9">
                                 <rect key="frame" x="71.5" y="394.5" width="232" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="232" id="IRj-9r-lbP"/>
@@ -52,12 +53,21 @@
                                     <action selector="showImagePickerWithSelectedAssets:" destination="BYZ-38-t0r" eventType="touchUpInside" id="m00-0a-bkf"/>
                                 </connections>
                             </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ywf-iF-6QR">
+                                <rect key="frame" x="66" y="432.5" width="243" height="30"/>
+                                <state key="normal" title="Image picker limit 2 images, 1 video"/>
+                                <connections>
+                                    <action selector="showImagePickerWithLimit:" destination="BYZ-38-t0r" eventType="touchUpInside" id="chb-F8-vjn"/>
+                                </connections>
+                            </button>
                         </subviews>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="zgs-tU-5p9" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="0A6-aX-1jb"/>
                             <constraint firstAttribute="centerX" secondItem="DzO-ex-PdY" secondAttribute="centerX" id="EZn-Ed-pHh"/>
                             <constraint firstItem="zgs-tU-5p9" firstAttribute="top" secondItem="DzO-ex-PdY" secondAttribute="bottom" constant="8" id="GUE-MX-lLP"/>
+                            <constraint firstItem="Ywf-iF-6QR" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="JYd-Ph-njS"/>
+                            <constraint firstItem="Ywf-iF-6QR" firstAttribute="top" secondItem="zgs-tU-5p9" secondAttribute="bottom" constant="8" id="VjK-Iu-ymf"/>
                             <constraint firstAttribute="centerY" secondItem="GFw-cP-rmQ" secondAttribute="centerY" id="XmI-RH-XSN"/>
                             <constraint firstItem="DzO-ex-PdY" firstAttribute="top" secondItem="GFw-cP-rmQ" secondAttribute="bottom" constant="8" id="j2M-qn-wIK"/>
                             <constraint firstAttribute="centerX" secondItem="GFw-cP-rmQ" secondAttribute="centerX" id="vJT-bW-R2W"/>
@@ -69,4 +79,9 @@
             <point key="canvasLocation" x="138" y="134"/>
         </scene>
     </scenes>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
 </document>
diff --git a/Example/ViewController.swift b/Example/ViewController.swift
@@ -30,7 +30,7 @@ class ViewController: UIViewController {
         let imagePicker = ImagePickerController()
         imagePicker.settings.selection.max = 5
         imagePicker.settings.theme.selectionStyle = .numbered
-        imagePicker.settings.fetch.assets.supportedMediaTypes = [.image, .video]
+        imagePicker.settings.fetch.assets.supportedMediaTypes = [.image(), .video()]
         imagePicker.settings.selection.unselectOnReachingMax = true
 
         let start = Date()
@@ -52,7 +52,7 @@ class ViewController: UIViewController {
         let imagePicker = ImagePickerController()
         imagePicker.settings.selection.max = 1
         imagePicker.settings.selection.unselectOnReachingMax = true
-        imagePicker.settings.fetch.assets.supportedMediaTypes = [.image, .video]
+        imagePicker.settings.fetch.assets.supportedMediaTypes = [.image(), .video()]
         imagePicker.albumButton.tintColor = UIColor.green
         imagePicker.cancelButton.tintColor = UIColor.red
         imagePicker.doneButton.tintColor = UIColor.purple
@@ -99,7 +99,7 @@ class ViewController: UIViewController {
         })
 
         let imagePicker = ImagePickerController(selectedAssets: evenAssets)
-        imagePicker.settings.fetch.assets.supportedMediaTypes = [.image]
+        imagePicker.settings.fetch.assets.supportedMediaTypes = [.image()]
 
         self.presentImagePicker(imagePicker, select: { (asset) in
             print("Selected: \(asset)")
@@ -111,5 +111,57 @@ class ViewController: UIViewController {
             print("Finished with selections: \(assets)")
         })
     }
+
+    @IBAction func showImagePickerWithLimit(_ sender: Any) {
+        let imagePicker = ImagePickerController()
+        imagePicker.settings.selection.max = 5
+        imagePicker.settings.theme.selectionStyle = .numbered
+        imagePicker.settings.fetch.assets.supportedMediaTypes = [
+            .image(max: 2),
+            .video(max: 1)
+        ]
+
+        let start = Date()
+        imagePicker.imagePickerDelegate = self
+        self.presentImagePicker(imagePicker, select: { (asset) in
+            print("Selected: \(asset)")
+        }, deselect: { (asset) in
+            print("Deselected: \(asset)")
+        }, cancel: { (assets) in
+            print("Canceled with selections: \(assets)")
+        }, finish: { (assets) in
+            print("Finished with selections: \(assets)")
+        }, completion: {
+            let finish = Date()
+            print(finish.timeIntervalSince(start))
+        })
+
+    }
+}
+
+extension ViewController: ImagePickerControllerDelegate {
+    func imagePicker(_ imagePicker: ImagePickerController, didSelectAsset asset: PHAsset) {
+        print("Selected: \(asset)")
+    }
+
+    func imagePicker(_ imagePicker: ImagePickerController, didDeselectAsset asset: PHAsset) {
+        print("Deselected: \(asset)")
+    }
+
+    func imagePicker(_ imagePicker: ImagePickerController, didFinishWithAssets assets: [PHAsset]) {
+        print("Canceled with selections: \(assets)")
+    }
+
+    func imagePicker(_ imagePicker: ImagePickerController, didCancelWithAssets assets: [PHAsset]) {
+        print("Finished with selections: \(assets)")
+    }
+
+    func imagePicker(_ imagePicker: ImagePickerController, didReachSelectionLimit count: Int) {
+        print("didReachSelectionLimit with count: ", count)
+    }
+
+    func imagePicker(_ imagePicker: ImagePickerController, didReachSelectionLimitForType type: PHAssetMediaType) {
+        print("didReachSelectionLimitForType: ", type.rawValue)
+    }
 }
 
diff --git a/Sources/Controller/ImagePickerController+Assets.swift b/Sources/Controller/ImagePickerController+Assets.swift
@@ -52,4 +52,8 @@ extension ImagePickerController: AssetsViewControllerDelegate {
 
         pushViewController(previewViewController, animated: true)
     }
+
+    func assetsViewController(_ assetsViewController: AssetsViewController, didReachSelectionLimit asset: PHAsset) {
+        imagePickerDelegate?.imagePicker(self, didReachSelectionLimitForType: asset.mediaType)
+    }
 }
diff --git a/Sources/Controller/ImagePickerController+Closure.swift b/Sources/Controller/ImagePickerController+Closure.swift
@@ -45,9 +45,6 @@ import Photos
             imagePicker.onCancel = cancel
             imagePicker.onFinish = finish
 
-            // And since we are using the blocks api. Set ourselfs as delegate
-            imagePicker.imagePickerDelegate = imagePicker
-
             // Present
             self.present(imagePicker, animated: animated, completion: completion)
         }
@@ -70,26 +67,3 @@ extension ImagePickerController {
         return PHPhotoLibrary.authorizationStatus()
     }
 }
-
-/// ImagePickerControllerDelegate closure wrapper
-extension ImagePickerController: ImagePickerControllerDelegate {
-    public func imagePicker(_ imagePicker: ImagePickerController, didSelectAsset asset: PHAsset) {
-        onSelection?(asset)
-    }
-
-    public func imagePicker(_ imagePicker: ImagePickerController, didDeselectAsset asset: PHAsset) {
-        onDeselection?(asset)
-    }
-
-    public func imagePicker(_ imagePicker: ImagePickerController, didFinishWithAssets assets: [PHAsset]) {
-        onFinish?(assets)
-    }
-
-    public func imagePicker(_ imagePicker: ImagePickerController, didCancelWithAssets assets: [PHAsset]) {
-        onCancel?(assets)
-    }
-
-    public func imagePicker(_ imagePicker: ImagePickerController, didReachSelectionLimit count: Int) {
-
-    }
-}
diff --git a/Sources/Controller/ImagePickerControllerDelegate.swift b/Sources/Controller/ImagePickerControllerDelegate.swift
@@ -49,4 +49,9 @@ public protocol ImagePickerControllerDelegate: class {
     /// - Parameter imagePicker: The image picker that selection limit was reached in.
     /// - Parameter count: Number of selected assets.
     func imagePicker(_ imagePicker: ImagePickerController, didReachSelectionLimit count: Int)
+
+    /// Selection limit reach by type
+    /// - Parameter imagePicker: The image picker that selection limit was reached in.
+    /// - Parameter type: Type of media which reaches limit.
+    func imagePicker(_ imagePicker: ImagePickerController, didReachSelectionLimitForType type: PHAssetMediaType)
 }
diff --git a/Sources/Model/AssetStore.swift b/Sources/Model/AssetStore.swift
@@ -55,4 +55,8 @@ import Photos
     func index(of asset: PHAsset) -> Int? {
         return assets.firstIndex(of: asset)
     }
+
+    func getCountByType(_ type: PHAssetMediaType) -> Int {
+        return assets.filter { $0.mediaType == type }.count
+    }
 }
diff --git a/Sources/Model/Settings.swift b/Sources/Model/Settings.swift
@@ -124,11 +124,11 @@ import Photos
             /// Fetch options for assets
 
             /// Simple wrapper around PHAssetMediaType to ensure we only expose the supported types.
-            public enum MediaTypes {
-                case image
-                case video
+            public enum MediaTypes: Hashable {
+                case image(max: Int = Int.max)
+                case video(max: Int = Int.max)
 
-                fileprivate var assetMediaType: PHAssetMediaType {
+                var assetMediaType: PHAssetMediaType {
                     switch self {
                     case .image:
                         return .image
@@ -137,7 +137,7 @@ import Photos
                     }
                 }
             }
-            public lazy var supportedMediaTypes: Set<MediaTypes> = [.image]
+            public lazy var supportedMediaTypes: Set<MediaTypes> = [.image()]
 
             public lazy var options: PHFetchOptions = {
                 let fetchOptions = PHFetchOptions()

diff --git a/Sources/Scene/Assets/AssetsViewController.swift b/Sources/Scene/Assets/AssetsViewController.swift
@@ -27,6 +27,7 @@ protocol AssetsViewControllerDelegate: class {
     func assetsViewController(_ assetsViewController: AssetsViewController, didSelectAsset asset: PHAsset)
     func assetsViewController(_ assetsViewController: AssetsViewController, didDeselectAsset asset: PHAsset)
     func assetsViewController(_ assetsViewController: AssetsViewController, didLongPressCell cell: AssetCollectionViewCell, displayingAsset asset: PHAsset)
+    func assetsViewController(_ assetsViewController: AssetsViewController, didReachSelectionLimit asset: PHAsset)
 }
 
 class AssetsViewController: UIViewController {
@@ -195,7 +196,22 @@ extension AssetsViewController: UICollectionViewDelegate {
     }
 
     func collectionView(_ collectionView: UICollectionView, shouldSelectItemAt indexPath: IndexPath) -> Bool {
-        guard store.count < settings.selection.max || settings.selection.unselectOnReachingMax else { return false }
+        let asset = fetchResult.object(at: indexPath.row)
+        for type in settings.fetch.assets.supportedMediaTypes {
+            switch type {
+            case .image(let max), .video(let max):
+                if asset.mediaType == type.assetMediaType {
+                    if max <= store.getCountByType(type.assetMediaType) {
+                        self.delegate?.assetsViewController(self, didReachSelectionLimit: asset)
+                        return false
+                    }
+                }
+            }
+        }
+
+        guard store.count < settings.selection.max || settings.selection.unselectOnReachingMax else {
+            return false
+        }
         selectionFeedback.prepare()
 
         return true