Support pick video from ImagePicker

Author: hoangtaiki

Example/Source/MessageViewController.swift

@@ -92,6 +92,14 @@ class MessageViewController: ChatViewController {
 
  imagePickerHelper?.takeOrChoosePhoto()
  }
+ 
+ override func didSelectVideo(url: URL?) {
+ print("URL \(url!)")
+ }
+ 
+ override func didSelectImage(url: URL?) {
+ print("URL \(url!)")
+ }
 }
 
 extension MessageViewController {
@@ -155,19 +163,7 @@ extension MessageViewController {
  }
 
  private func bindViewModel() {
- /// Image Picker Result closure
- imagePickerView?.pickImageResult = { image, url, error in
- if error != nil {
- return
- }
-
- guard let _ = image, let _ = url else {
- return
- }
-
- print("Pick image successfully")
- }
-
+ 
  }
 
  private func setupData() {
@@ -247,18 +243,3 @@ extension MessageViewController {
  tableView.endUpdates()
  }
 }
-
-extension ChatViewController: ImagePickerHelperResultDelegate {
- 
- public func didFinishPickingMediaWithInfo(_ image: UIImage?, _ imagePath: URL?, _ error: Error?) {
- if error != nil {
- return
- }
- 
- guard let _ = image, let _ = imagePath else {
- return
- }
- 
- print("Pick image successfully")
- }
-}

Example/iOS Example.xcodeproj/project.pbxproj

@@ -522,14 +522,14 @@
 buildSettings = {
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CODE_SIGN_IDENTITY = "iPhone Developer";
-CODE_SIGN_STYLE = Manual;
-DEVELOPMENT_TEAM = "";
+CODE_SIGN_STYLE = Automatic;
+DEVELOPMENT_TEAM = BZ938KC628;
 INFOPLIST_FILE = "$(SRCROOT)/Resources/Info.plist";
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/Frameworks",
 );
-PRODUCT_BUNDLE_IDENTIFIER = "org.toprating.iOS-Example";
+PRODUCT_BUNDLE_IDENTIFIER = org.toprating.iOSExample;
 PRODUCT_NAME = "$(TARGET_NAME)";
 PROVISIONING_PROFILE_SPECIFIER = "";
 SWIFT_VERSION = 4.2;
@@ -543,14 +543,14 @@
 buildSettings = {
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CODE_SIGN_IDENTITY = "iPhone Developer";
-CODE_SIGN_STYLE = Manual;
-DEVELOPMENT_TEAM = "";
+CODE_SIGN_STYLE = Automatic;
+DEVELOPMENT_TEAM = BZ938KC628;
 INFOPLIST_FILE = "$(SRCROOT)/Resources/Info.plist";
 LD_RUNPATH_SEARCH_PATHS = (
 "$(inherited)",
 "@executable_path/Frameworks",
 );
-PRODUCT_BUNDLE_IDENTIFIER = "org.toprating.iOS-Example";
+PRODUCT_BUNDLE_IDENTIFIER = org.toprating.iOSExample;
 PRODUCT_NAME = "$(TARGET_NAME)";
 PROVISIONING_PROFILE_SPECIFIER = "";
 SWIFT_VERSION = 4.2;

Source/Core/ChatViewController+Subviews.swift

@@ -175,6 +175,7 @@ extension ChatViewController {
  func initImagePickerView() {
  imagePickerView = ImagePickerView()
  imagePickerView!.isHidden = true
+ imagePickerView!.pickerDelegate = self
  imagePickerView!.parentViewController = self
  imagePickerView!.translatesAutoresizingMaskIntoConstraints = false
  view.addSubview(imagePickerView!)

Source/Core/ChatViewController.swift

@@ -14,7 +14,7 @@ public enum KeyboardType {
  case none
 }
 
-open class ChatViewController: UIViewController, UITableViewDataSource, UITableViewDelegate, UITextViewDelegate {
+open class ChatViewController: UIViewController, UITableViewDataSource, UITableViewDelegate, UITextViewDelegate, ImagePickerResultDelegate {
 
  open var minimumChatBarHeight: CGFloat = 50
  open var customKeyboardHeight: CGFloat = 0
@@ -311,6 +311,14 @@ open class ChatViewController: UIViewController, UITableViewDataSource, UITableV
  return true
  }
 
+ open func didSelectImage(url: URL?) {
+ 
+ }
+ 
+ open func didSelectVideo(url: URL?) {
+ 
+ }
+ 
  deinit {
  removeObserverKeyboardEvents()
  }

Source/ImagePicker/ImagePickerCollectionView.swift

@@ -9,16 +9,18 @@
 import UIKit
 import Photos
 
-@objc protocol ImagePickerCollectionViewDelegate {
- @objc optional func didSelectImage(with localIdentifer: String)
+/// Image picker result
+@objc public protocol ImagePickerResultDelegate {
+ @objc optional func didSelectImage(url: URL?)
+ @objc optional func didSelectVideo(url: URL?)
 }
 
 public final class ImagePickerCollectionView: UICollectionView {
 
  var takePhoto: (() -> ())?
  var showCollection: (() -> ())?
 
- weak var pickerDelegate: ImagePickerCollectionViewDelegate?
+ weak var pickerDelegate: ImagePickerResultDelegate?
 
  fileprivate var nColumns = 1
  fileprivate var spacing: CGFloat = 2
@@ -120,11 +122,29 @@ extension ImagePickerCollectionView: UICollectionViewDataSource {
  }
 
  public func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
- photoDataManager.requestImage(for: indexPath) { (image, indexPath) in
- guard let image = image else { return }
- guard let cell = collectionView.cellForItem(at: indexPath) as? ImagePickerCollectionCell else { return }
-
- cell.imageView.image = image
+ guard let asset = photoDataManager.getAsset(for: indexPath) else {
+ return
+ }
+ 
+ DispatchQueue.main.async {
+ self.photoDataManager.requestImage(for: asset, at: indexPath) { (image, indexPath) in
+ guard let image = image else { return }
+ guard let cell = collectionView.cellForItem(at: indexPath) as? ImagePickerCollectionCell else { return }
+ 
+ cell.imageView.image = image
+ }
+ }
+ 
+ switch asset.mediaType {
+ case .video:
+ DispatchQueue.main.async {
+ MediaProcesser.getVideoLength(videoAsset: asset) { (length, error) in
+ if let videoLength = length {
+ print("Video length = \(videoLength)")
+ }
+ }
+ }
+ default: break
  }
  }
 
@@ -152,10 +172,22 @@ extension ImagePickerCollectionView: UICollectionViewDelegateFlowLayout {
 
 extension ImagePickerCollectionView: UICollectionViewDelegate {
 
- private func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
- let localIdentifer = photoDataManager.photoIdentifier(for: indexPath.row)
-
- pickerDelegate?.didSelectImage?(with: localIdentifer)
+ public func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+ guard let asset = photoDataManager.getAsset(for: indexPath) else {
+ return
+ }
+ 
+ switch asset.mediaType {
+ case .video:
+ MediaProcesser.storeVideoToURL(videoAsset: asset) { [weak self] (url, error) in
+ self?.pickerDelegate?.didSelectVideo?(url: url)
+ }
+ case .image:
+ MediaProcesser.storeImage(imageAsset: asset) { [weak self] (url, error) in
+ self?.pickerDelegate?.didSelectImage?(url: url)
+ }
+ default: break
+ }
  }
 
 }
@@ -187,13 +219,13 @@ extension ImagePickerCollectionView {
 
 extension ImagePickerCollectionView: PhotoDataManagerDelegate {
 
- func photoDataManagerDidUpdate() {
+ public func photoDataManagerDidUpdate() {
  performBatchUpdates({ [weak self] in
  self?.reloadSections(IndexSet(integer: 0))
  }, completion: nil)
  }
 
- func targetSize(for indexPath: IndexPath) -> CGSize {
+ public func targetSize(for indexPath: IndexPath) -> CGSize {
  let cell = cellForItem(at: indexPath)
  let height = cell?.bounds.size.height ?? bounds.height
  return CGSize(width: height * UIScreen.main.scale,

Source/ImagePicker/ImagePickerHelper.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import MobileCoreServices
 
 /// Protocol use to specify standard for ImagePickerHelper
 public protocol ImagePickerHelperable {
@@ -18,21 +19,17 @@ public protocol ImagePickerHelperable {
  func accessLibrary()
 }
 
-/// Image picker result
-public protocol ImagePickerHelperResultDelegate {
- func didFinishPickingMediaWithInfo(_ image: UIImage?, _ imagePath: URL?, _ error: Error?)
-}
-
 public class ImagePickerHelper: NSObject, ImagePickerHelperable, UIImagePickerControllerDelegate, UINavigationControllerDelegate {
 
  public weak var parentViewController: UIViewController?
- public var delegate: ImagePickerHelperResultDelegate?
+ public weak var delegate: ImagePickerResultDelegate?
 
  public func accessPhoto(from sourceType: UIImagePickerController.SourceType) {
  let imagePicker = UIImagePickerController()
  imagePicker.delegate = self
  imagePicker.allowsEditing = false
  imagePicker.sourceType = sourceType
+ imagePicker.mediaTypes = [kUTTypeImage as String, kUTTypeMovie as String]
 
  parentViewController?.present(imagePicker, animated: true, completion: nil)
  }
@@ -60,18 +57,34 @@ public class ImagePickerHelper: NSObject, ImagePickerHelperable, UIImagePickerCo
  picker.dismiss(animated: true, completion: nil)
  }
 
- DispatchQueue.global(qos: .userInitiated).async {
+ let mediaType = info[UIImagePickerController.InfoKey.mediaType] as! CFString
+ switch mediaType {
+ case kUTTypeImage:
  guard let originalImage = info[UIImagePickerController.InfoKey.originalImage] as? UIImage else {
  return
  }
-
- originalImage.storeToTemporaryDirectory(completion: { [weak self] (imagePath, error) in
- if error != nil {
- self?.delegate?.didFinishPickingMediaWithInfo(nil, nil, error!)
+ if #available(iOS 11.0, *) {
+ guard let imagePath = info[UIImagePickerController.InfoKey.imageURL] as? String else {
  return
  }
- self?.delegate?.didFinishPickingMediaWithInfo(originalImage, imagePath!, nil)
- })
+ delegate?.didSelectImage?(url: URL(string: imagePath))
+ } else {
+ DispatchQueue.main.async {
+ originalImage.storeToTemporaryDirectory(completion: { [weak self] (imagePath, error) in
+ guard let imageURL = imagePath else {
+ return
+ }
+ self?.delegate?.didSelectImage?(url: imageURL)
+ })
+ }
+ }
+ 
+ case kUTTypeMovie:
+ guard let videoPath = info[UIImagePickerController.InfoKey.mediaURL] as? String else {
+ return
+ }
+ delegate?.didSelectVideo?(url: URL(string: videoPath))
+ default: break
  }
  }
 
@@ -86,4 +99,5 @@ public class ImagePickerHelper: NSObject, ImagePickerHelperable, UIImagePickerCo
  accessPhoto(from: .photoLibrary)
  }
  }
+ 
 }

Source/ImagePicker/ImagePickerView.swift

@@ -19,10 +19,10 @@ open class ImagePickerView: UIView {
  return imagePickerHelper
  }()
 
- public var pickImageResult: ((_ image: UIImage?, _ imagePath: URL?, _ error: Error?) -> ())?
-
  public var collectionView: ImagePickerCollectionView!
 
+ public weak var pickerDelegate: ImagePickerResultDelegate?
+
  /// Parent View Controller
  weak var parentViewController: UIViewController? {
  didSet {
@@ -75,32 +75,13 @@ open class ImagePickerView: UIView {
  }
 }
 
-extension ImagePickerView: ImagePickerCollectionViewDelegate {
-
- func didSelectImage(with localIdentifer: String) {
- guard let asset = PhotoDataManager.fetchAsset(with: localIdentifer) else { return }
-
- PhotoDataManager.requestImage(with: asset) { [weak self] image in
- DispatchQueue.global().async {
- image?.storeToTemporaryDirectory(completion: { (imagePath, error) in
- if error != nil {
- self?.pickImageResult?(nil, nil, error!)
- return
- }
- self?.pickImageResult?(image, imagePath!, nil)
- })
- }
- }
+extension ImagePickerView: ImagePickerResultDelegate {
+ 
+ public func didSelectImage(url: URL?) {
+ pickerDelegate?.didSelectImage?(url: url)
  }
-}
-
-extension ImagePickerView: ImagePickerHelperResultDelegate {
 
- public func didFinishPickingMediaWithInfo(_ image: UIImage?, _ imagePath: URL?, _ error: Error?) {
- if error != nil {
- pickImageResult?(nil, nil, error!)
- return
- }
- pickImageResult?(image, imagePath!, nil)
+ public func didSelectVideo(url: URL?) {
+ pickerDelegate?.didSelectVideo?(url: url)
  }
 }