Added Storyboard support. Some other improvements.

tilltue · May 31, 2018 · 75ab30e · 75ab30e
1 parent 196d575
commit 75ab30e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/TLPhotoPicker/Classes/TLAssetsCollection.swift b/TLPhotoPicker/Classes/TLAssetsCollection.swift
@@ -265,7 +265,7 @@ public struct TLAssetsCollection {
     func getTLAsset(at index: Int) -> TLPHAsset? {
         if self.useCameraButton && index == 0 { return nil }
         let index = index - (self.useCameraButton ? 1 : 0)
-        if let assets = self.customAssets {
+        if let assets = self.customAssets, index < assets.count {
             return assets[index]
         } else {
             guard let result = self.fetchResult, index < result.count else { return nil }

diff --git a/TLPhotoPicker/Classes/TLPhotosPickerViewController.swift b/TLPhotoPicker/Classes/TLPhotosPickerViewController.swift
@@ -127,7 +127,18 @@ open class TLPhotosPickerViewController: UIViewController {
     fileprivate var didCancel: (() -> Void)? = nil
 
     fileprivate var collections = [TLAssetsCollection]()
-    fileprivate var customCollection: TLAssetsCollection? = nil
+    open var customCollection: TLAssetsCollection? = nil {
+        didSet {
+            if let oldValue = oldValue,
+                let index = collections.index(where: { $0.customAssets != nil }) {
+                collections.remove(at: index)
+            }
+            if let newValue = customCollection {
+                collections.insert(newValue, at: 0)
+                focusCollection(collection: newValue)
+            }
+        }
+    }
     fileprivate var focusedCollection: TLAssetsCollection? = nil
     fileprivate var requestIds = [IndexPath:PHImageRequestID]()
     fileprivate var cloudRequestIds = [IndexPath:PHImageRequestID]()
@@ -149,7 +160,12 @@ open class TLPhotosPickerViewController: UIViewController {
     }
 
     required public init?(coder aDecoder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
+        super.init(coder: aDecoder)
+        if PHPhotoLibrary.authorizationStatus() != .authorized {
+            PHPhotoLibrary.requestAuthorization { [weak self] status in
+                self?.initPhotoLibrary()
+            }
+        }
     }
 
     public init() {
@@ -486,6 +502,7 @@ extension TLPhotosPickerViewController: TLPhotoLibraryDelegate {
     public func focusCollection(collection: TLAssetsCollection?) {
         self.focusedCollection = collection
         self.updateTitle()
+        self.reloadCollectionView()
     }
 }