First

.swift-version

@@ -0,0 +1 @@
+3.0

AKImagePickerController.podspec

@@ -0,0 +1,27 @@
+
+Pod::Spec.new do |s|
+
+  s.name         = "AKImagePickerController"
+  s.version      = "1.1.2"
+  s.summary      = "A short description of AKImagePickerController."
+
+  s.description  = "This is an ImagePickerController"
+
+  s.homepage     = "https://github.com/alexsanderkhitev/AKImagePickerController"
+
+  s.license      = "MIT"
+
+  s.author             = { "Alexsander Khitev" => "alexsanderskywork@gmail.com" }
+  s.social_media_url   = "https://twitter.com/devkhitev"
+
+  s.platform     = :ios, "10.0"
+
+  s.source       = { :git => "https://github.com/alexsanderkhitev/AKImagePickerController.git", :tag => s.version }
+
+  s.source_files  = 'AKImagePickerController/**/*.{h,m,swift}'
+
+  s.resources = "AKImagePickerController/**/*.{png,jpeg,jpg,storyboard,xib,xcassets}"
+
+  s.requires_arc = true
+
+end

ImagePicker/ImagePickerController.h → AKImagePickerController/AKImagePickerController.h

@@ -9,10 +9,10 @@
 #import <UIKit/UIKit.h>
 
 //! Project version number for ImagePicker.
-FOUNDATION_EXPORT double ImagePickerVersionNumber;
+FOUNDATION_EXPORT double AKImagePickerVersionNumber;
 
 //! Project version string for ImagePicker.
-FOUNDATION_EXPORT const unsigned char ImagePickerVersionString[];
+FOUNDATION_EXPORT const unsigned char AKImagePickerVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <ImagePicker/PublicHeader.h>
 

ImagePicker/CemaraGroup/CameraViewController.swift → AKImagePickerController/CemaraGroup/CameraViewController.swift

@@ -60,8 +60,8 @@ class CameraViewController: UIViewController {
     // MARK: - Images
 
     fileprivate struct FlashImage {
-        let turnedOn = UIImage(named: "FlashTurnedOn", in: Bundle(identifier: "com.alexsander-khitev.ImageControllerPicker"), compatibleWith: nil)
-        let turnedOff = UIImage(named: "FlashTurnedOff", in: Bundle(identifier: "com.alexsander-khitev.ImageControllerPicker"), compatibleWith: nil)
+        let turnedOn = UIImage(named: "FlashTurnedOn", in: Bundle(identifier: "org.cocoapods.AKImagePickerController"), compatibleWith: nil)
+        let turnedOff = UIImage(named: "FlashTurnedOff", in: Bundle(identifier: "org.cocoapods.AKImagePickerController"), compatibleWith: nil)
     }
 
     // MARK: - Managers
@@ -281,7 +281,7 @@ class CameraViewController: UIViewController {
     }
 
     private func setupButtonsSettings() {
-        let bundle = Bundle(identifier: "com.alexsander-khitev.ImageControllerPicker")
+        let bundle = Bundle(identifier: "org.cocoapods.AKImagePickerController")
         let shotImage = UIImage(named: "ShotCameraIcon", in: bundle, compatibleWith: nil)
         shotButton.setImage(shotImage, for: .normal)
 

ImagePicker/ImagePickerGroup/ImagePickerController.swift → AKImagePickerController/ImagePickerGroup/AKImagePickerController.swift

@@ -9,16 +9,14 @@
 import Foundation
 import Photos
 
-//let previewInset: CGFloat = 5
-
 /// The media type an instance of ImagePickerSheetController can display
 public enum ImagePickerMediaType {
     case image
     case video
     case imageAndVideo
 }
 
-open class ImagePickerController: UIViewController {
+open class AKImagePickerController: UIViewController {
 
     fileprivate lazy var sheetController: SheetController = {
         let controller = SheetController(previewCollectionView: self.previewPhotoCollectionView)
@@ -66,7 +64,7 @@ open class ImagePickerController: UIViewController {
         return view
     }()
 
-    open var delegate: ImagePickerControllerDelegate?
+    open var delegate: AKImagePickerControllerDelegate?
 
     /// All the actions. The first action is shown at the top.
     open var actions: [ImagePickerAction] {
@@ -185,6 +183,16 @@ open class ImagePickerController: UIViewController {
         checkPhotoLibraryAccess()
     }
 
+    open override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        delegate?.akImagePickerControllerWillDisappear?()
+    }
+
+    open override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        delegate?.akImagePickerControllerDidDisappear?()
+    }
+
     // MARK: - Camera
 
     // MARK: - Actions
@@ -285,7 +293,7 @@ open class ImagePickerController: UIViewController {
 
 // MARK: - UICollection view 
 
-extension ImagePickerController {
+extension AKImagePickerController {
 
     fileprivate func setupCollectionViewSettings() {
         previewPhotoCollectionView.dataSource = self
@@ -295,17 +303,17 @@ extension ImagePickerController {
 
     private func registerCollectionViewElements() {
         // cells
-        let photoNib = UINib(nibName: "ImagePickerCollectionCell", bundle: Bundle(identifier: "com.alexsander-khitev.ImageControllerPicker"))
+        let photoNib = UINib(nibName: "ImagePickerCollectionCell", bundle: Bundle(identifier: "org.cocoapods.AKImagePickerController"))
         previewPhotoCollectionView.register(photoNib, forCellWithReuseIdentifier: imagePickerCollectionCellIdentifier)
-        let liveNib = UINib(nibName: "ImagePickerLiveCameraCollectionCell", bundle: Bundle(identifier: "com.alexsander-khitev.ImageControllerPicker"))
+        let liveNib = UINib(nibName: "ImagePickerLiveCameraCollectionCell", bundle: Bundle(identifier: "org.cocoapods.AKImagePickerController"))
         previewPhotoCollectionView.register(liveNib, forCellWithReuseIdentifier: imagePickerLiveCameraCollectionCellIdentifier)
     }
 
 }
 
 // MARK: - UICollectionViewDataSource
 
-extension ImagePickerController: UICollectionViewDataSource {
+extension AKImagePickerController: UICollectionViewDataSource {
 
     public func numberOfSections(in collectionView: UICollectionView) -> Int {
         guard fetchResult != nil else { return 1 }
@@ -334,7 +342,7 @@ extension ImagePickerController: UICollectionViewDataSource {
 
 // MARK: - UICollectionViewDelegate
 
-extension ImagePickerController: UICollectionViewDelegate {
+extension AKImagePickerController: UICollectionViewDelegate {
 
     public func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         if indexPath.row == 0 {
@@ -361,7 +369,7 @@ extension ImagePickerController: UICollectionViewDelegate {
 
 // MARK: - UICollectionViewDelegateFlowLayout
 
-extension ImagePickerController: UICollectionViewDelegateFlowLayout {
+extension AKImagePickerController: UICollectionViewDelegateFlowLayout {
 
     public func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
         return CGSize(width: 95, height: 95)
@@ -376,7 +384,7 @@ extension ImagePickerController: UICollectionViewDelegateFlowLayout {
 
 // MARK: - UICollectionView cells 
 
-extension ImagePickerController {
+extension AKImagePickerController {
 
     fileprivate func imagePickerCollectionCell(_ collectionView: UICollectionView, indexPath: IndexPath) -> ImagePickerCollectionCell {
         let cell = collectionView.dequeueReusableCell(withReuseIdentifier: imagePickerCollectionCellIdentifier, for: indexPath) as! ImagePickerCollectionCell
@@ -423,7 +431,7 @@ extension ImagePickerController {
 
 // MARK: - UIViewControllerTransitioningDelegate
 
-extension ImagePickerController: UIViewControllerTransitioningDelegate {
+extension AKImagePickerController: UIViewControllerTransitioningDelegate {
 
     public func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
         return AnimationController(imagePickerSheetController: self, presenting: true)
@@ -437,7 +445,7 @@ extension ImagePickerController: UIViewControllerTransitioningDelegate {
 
 // MARK: - Camera
 
-extension ImagePickerController {
+extension AKImagePickerController {
 
     fileprivate func setupCameraEngineSettings() {
         // Camera
@@ -478,7 +486,7 @@ extension ImagePickerController {
 
 // MARK: - CameraViewControllerDelegate Delegate
 
-extension ImagePickerController: CameraViewControllerDelegate {
+extension AKImagePickerController: CameraViewControllerDelegate {
 
     func willHide() {
         returnCameraLayerToCell()
@@ -498,7 +506,7 @@ extension ImagePickerController: CameraViewControllerDelegate {
 
 // MARK: - Image picker
 
-extension ImagePickerController: UIImagePickerControllerDelegate, UINavigationControllerDelegate {
+extension AKImagePickerController: UIImagePickerControllerDelegate, UINavigationControllerDelegate {
 
     fileprivate func showPhotoLibraryController() {
         present(photoLibraryController, animated: true, completion: nil)
@@ -526,7 +534,7 @@ extension ImagePickerController: UIImagePickerControllerDelegate, UINavigationCo
 
 // MARK: - TOCropViewController Delegate 
 
-extension ImagePickerController: TOCropViewControllerDelegate {
+extension AKImagePickerController: TOCropViewControllerDelegate {
 
     public func cropViewController(_ cropViewController: TOCropViewController, didFinishCancelled cancelled: Bool) {
         cropViewController.dismiss(animated: true, completion: nil)
@@ -535,7 +543,7 @@ extension ImagePickerController: TOCropViewControllerDelegate {
     public func cropViewController(_ cropViewController: TOCropViewController, didCropToCircularImage image: UIImage, with cropRect: CGRect, angle: Int) {
 
         if delegate != nil {
-            delegate?.imagePickerController!(image, with: cropRect, angle: angle)
+            delegate?.akImagePickerController!(image, with: cropRect, angle: angle)
         }
 
         // TODO: - Think how to make it different
@@ -563,7 +571,7 @@ extension ImagePickerController: TOCropViewControllerDelegate {
 
 }
 
-extension ImagePickerController {
+extension AKImagePickerController {
 
     fileprivate func presentCropControllerFromCell(_ indexPath: IndexPath) {
         let asset = fetchResult[indexPath.row - 1]

ImagePicker/ImagePickerGroup/AnimationController.swift → AKImagePickerController/ImagePickerGroup/AnimationController.swift

@@ -10,12 +10,12 @@ import UIKit
 
 class AnimationController: NSObject {
 
-    let imagePickerSheetController: ImagePickerController
+    let imagePickerSheetController: AKImagePickerController
     let presenting: Bool
 
     // MARK: - Initialization
 
-    init(imagePickerSheetController: ImagePickerController, presenting: Bool) {
+    init(imagePickerSheetController: AKImagePickerController, presenting: Bool) {
         self.imagePickerSheetController = imagePickerSheetController
         self.presenting = presenting
     }

AKImagePickerController/ImagePickerGroup/Delegates/ImagePickerControllerDelegate.swift

@@ -0,0 +1,22 @@
+//
+//  ImagePickerControllerDelegate.swift
+//  ImagePickerController
+//
+//  Created by Alexsander Khitev on 2/27/17.
+//  Copyright © 2017 Alexsander Khitev. All rights reserved.
+//
+
+import Foundation
+import Photos
+
+@objc public protocol AKImagePickerControllerDelegate {
+
+    @objc optional func akImagePickerController(_ image: UIImage, with cropRect: CGRect, angle: Int)
+
+    // MARK: - Lifecycle 
+
+    @objc optional func akImagePickerControllerDidDisappear()
+    @objc optional func akImagePickerControllerWillDisappear()
+
+
+}

ImagePickerGroup/Info.plist → AKImagePickerController/Info.plist

@@ -2,10 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSCameraUsageDescription</key>
-	<string>Privacy - Camera Usage Description</string>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -19,10 +15,14 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.1.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSCameraUsageDescription</key>
+	<string>Privacy - Camera Usage Description</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<true/>
 </dict>
 </plist>

ImagePicker/SheetGroup/Preview/PreviewCollectionViewCell.swift → AKImagePickerController/SheetGroup/Preview/PreviewCollectionViewCell.swift

@@ -26,7 +26,7 @@ class PreviewCollectionViewCell: UICollectionViewCell {
     }()
 
     fileprivate class var videoImage: UIImage? {
-        let bundle = Bundle(for: ImagePickerController.self)
+        let bundle = Bundle(for: AKImagePickerController.self)
         let image = UIImage(named: "PreviewCollectionViewCell-video", in: bundle, compatibleWith: nil)
 
         return image

ImagePicker/SheetGroup/Preview/PreviewSupplementaryView.swift → AKImagePickerController/SheetGroup/Preview/PreviewSupplementaryView.swift

@@ -30,14 +30,14 @@ class PreviewSupplementaryView: UICollectionReusableView {
     }
 
     class var checkmarkImage: UIImage? {
-        let bundle = Bundle(for: ImagePickerController.self)
+        let bundle = Bundle(for: AKImagePickerController.self)
         let image = UIImage(named: "PreviewSupplementaryView-Checkmark", in: bundle, compatibleWith: nil)
 
         return image?.withRenderingMode(.alwaysTemplate)
     }
 
     class var selectedCheckmarkImage: UIImage? {
-        let bundle = Bundle(for: ImagePickerController.self)
+        let bundle = Bundle(for: AKImagePickerController.self)
         let image = UIImage(named: "PreviewSupplementaryView-Checkmark-Selected", in: bundle, compatibleWith: nil)
 
         return image?.withRenderingMode(.alwaysTemplate)