Merge branch 'diehappy-master'

mikaoj · Jan 7, 2017 · 96b7f86 · 96b7f86
2 parents cbde13c + 28b8002
commit 96b7f86
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 29 deletions.
diff --git a/Example/BSImagePicker.xcodeproj/project.pbxproj b/Example/BSImagePicker.xcodeproj/project.pbxproj
@@ -272,7 +272,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0710;
-				LastUpgradeCheck = 0810;
+				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					55E273E71BE004F2006006A7 = {

diff --git a/Example/BSImagePicker.xcodeproj/xcshareddata/xcschemes/BSImagePicker-Example.xcscheme b/Example/BSImagePicker.xcodeproj/xcshareddata/xcschemes/BSImagePicker-Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Example/BSImagePicker/ViewController.swift b/Example/BSImagePicker/ViewController.swift
@@ -81,31 +81,30 @@ class ViewController: UIViewController {
     }
 
     @IBAction func showImagePickerWithSelectedAssets(_ sender: UIButton) {
-        // FIXME:
-//        let allAssets = PHAsset.fetchAssets(with: PHAssetMediaType.image, options: nil)
-//        var evenAssetIds = [String]()
-//
-//        allAssets.enumerateObjects { (asset, idx, stop) -> Void in
-//          if let asset = asset as? PHAsset , idx % 2 == 0 {
-//            evenAssetIds.append(asset.localIdentifier)
-//          }
-//        }
-//      
-//        let evenAssets = PHAsset.fetchAssets(withLocalIdentifiers: evenAssetIds, options: nil)
-//      
-//        let vc = BSImagePickerViewController()
-//        vc.defaultSelections = evenAssets
-//      
-//        bs_presentImagePickerController(vc, animated: true,
-//          select: { (asset: PHAsset) -> Void in
-//            print("Selected: \(asset)")
-//          }, deselect: { (asset: PHAsset) -> Void in
-//            print("Deselected: \(asset)")
-//          }, cancel: { (assets: [PHAsset]) -> Void in
-//            print("Cancel: \(assets)")
-//          }, finish: { (assets: [PHAsset]) -> Void in
-//            print("Finish: \(assets)")
-//          }, completion: nil)
+        let allAssets = PHAsset.fetchAssets(with: PHAssetMediaType.image, options: nil)
+        var evenAssetIds = [String]()
+
+        allAssets.enumerateObjects({ (asset, idx, stop) -> Void in
+            if idx % 2 == 0 {
+                evenAssetIds.append(asset.localIdentifier)
+            }
+        })
+
+        let evenAssets = PHAsset.fetchAssets(withLocalIdentifiers: evenAssetIds, options: nil)
+
+        let vc = BSImagePickerViewController()
+        vc.defaultSelections = evenAssets
+
+        bs_presentImagePickerController(vc, animated: true,
+          select: { (asset: PHAsset) -> Void in
+            print("Selected: \(asset)")
+          }, deselect: { (asset: PHAsset) -> Void in
+            print("Deselected: \(asset)")
+          }, cancel: { (assets: [PHAsset]) -> Void in
+            print("Cancel: \(assets)")
+          }, finish: { (assets: [PHAsset]) -> Void in
+            print("Finish: \(assets)")
+          }, completion: nil)
     }
 }
 
diff --git a/Pod/Classes/Controller/BSImagePickerViewController.swift b/Pod/Classes/Controller/BSImagePickerViewController.swift
@@ -46,12 +46,12 @@ open class BSImagePickerViewController : UINavigationController {
     /**
      Default selections
      */
-    private var defaultSelections: PHFetchResult<PHAsset>?
+    open var defaultSelections: PHFetchResult<PHAsset>?
 
     /**
      Fetch results.
      */
-    private lazy var fetchResults: [PHFetchResult] = { () -> [PHFetchResult<PHAssetCollection>] in
+    open lazy var fetchResults: [PHFetchResult] = { () -> [PHFetchResult<PHAssetCollection>] in
         let fetchOptions = PHFetchOptions()
 
         // Camera roll fetch result