Add multiple selection settings

floriangbh · Jun 22, 2017 · 6e08e55 · 6e08e55
1 parent a5c223e
commit 6e08e55
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/...agePicker.xcworkspace/xcuserdata/floriangabach.xcuserdatad/UserInterfaceState.xcuserstate b/...agePicker.xcworkspace/xcuserdata/floriangabach.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Example/GBHFacebookImagePicker/ViewController.swift b/Example/GBHFacebookImagePicker/ViewController.swift
@@ -89,6 +89,9 @@ class ViewController: UIViewController {
 
         // Selected border width 
         GBHFacebookImagePicker.pickerConfig.uiConfig.selectedBorderWidth = 4.0
+
+        // Maximum selected pictures 
+        GBHFacebookImagePicker.pickerConfig.maximumSelectedPictures = 4
     }
 
     // MARK: - Action
@@ -101,9 +104,10 @@ class ViewController: UIViewController {
 
         // Allow multiple selection (false by default)
         GBHFacebookImagePicker.pickerConfig.allowMultipleSelection = true
+        GBHFacebookImagePicker.pickerConfig.maximumSelectedPictures = 4
 
         // Make some customisation
-        //self.someCustomisation()
+        // self.someCustomisation()
 
         // Present picker 
         picker.presentFacebookAlbumImagePicker(from: self,

diff --git a/GBHFacebookImagePicker/Classes/Controller/GBHPhotoPickerViewController.swift b/GBHFacebookImagePicker/Classes/Controller/GBHPhotoPickerViewController.swift
@@ -260,7 +260,8 @@ extension GBHPhotoPickerViewController: UICollectionViewDataSource, UICollection
             if GBHFacebookImagePicker.pickerConfig.maximumSelectedPictures == nil {
                 self.selectedImages.append(imageModel)
             } else {
-                if self.selectedImages.count < GBHFacebookImagePicker.pickerConfig.maximumSelectedPictures! {
+                let maximum = GBHFacebookImagePicker.pickerConfig.maximumSelectedPictures ?? 1
+                if self.selectedImages.count < maximum {
                     self.selectedImages.append(imageModel)
                 } else {
                     if let cell = collectionView.cellForItem(at: indexPath) as? GBHPhotoCollectionViewCell {

diff --git a/GBHFacebookImagePicker/Classes/Model/GBHFacebookPickerConfig.swift b/GBHFacebookImagePicker/Classes/Model/GBHFacebookPickerConfig.swift
@@ -44,13 +44,13 @@ public struct GBHFacebookPickerConfig {
     public var title: String = NSLocalizedString("Album(s)",
                                                  comment: "")
 
-    // The picture corner radius. Used for display album cover and album's picture.
+    /// The picture corner radius. Used for display album cover and album's picture.
     public var pictureCornerRadius: CGFloat = 2.0
 
-    // Allow multiple pictures selection
+    /// Allow multiple pictures selection
     public var allowMultipleSelection: Bool = false
-    
-    // Maximum selected pictures
+
+    /// Maximum selected pictures
     public var maximumSelectedPictures: Int?
 
     /// UI-specific configuration.

diff --git a/README.md b/README.md
@@ -166,6 +166,9 @@ GBHFacebookImagePicker.pickerConfig.uiConfig.selectedBorderColor = UIColor.red
 
 // Selected border width 
 GBHFacebookImagePicker.pickerConfig.uiConfig.selectedBorderWidth = 4.0
+
+// Maximum selected pictures 
+GBHFacebookImagePicker.pickerConfig.maximumSelectedPictures = 4
 ```