Feature/orientationanimation-zoom-exif-errorhandling-scaling

ALCameraViewController.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name               = "ALCameraViewController"
-  spec.version            = "3.0.2"
+  spec.version            = "3.0.5"
   spec.summary            = "A camera view controller with custom image picker and image cropping."
   spec.source             = { :git => "https://github.com/AlexLittlejohn/ALCameraViewController.git", :tag => spec.version.to_s }
   spec.requires_arc       = true
@@ -10,5 +10,5 @@ Pod::Spec.new do |spec|
   spec.resources          = ["ALCameraViewController/ViewController/ConfirmViewController.xib", "ALCameraViewController/CameraViewAssets.xcassets", "ALCameraViewController/CameraView.strings"]
   spec.homepage           = "https://github.com/AlexLittlejohn/ALCameraViewController"
   spec.author             = { "Alex Littlejohn" => "[email protected]" }
-  spec.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.0' }
+  spec.pod_target_xcconfig = { 'SWIFT_VERSION' => '3.2' }
 end

ALCameraViewController.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		1D4BC6A7CE46F52C503BE81A /* Pods_ALCameraViewController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5EA3B6D5F07E9E32F0AF2A75 /* Pods_ALCameraViewController.framework */; };
 		1F3C56291F701CA7009667E9 /* CroppingParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AC96FA11F5B5166003E53F4 /* CroppingParameters.swift */; };
 		7AC96FA21F5B5166003E53F4 /* CroppingParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AC96FA11F5B5166003E53F4 /* CroppingParameters.swift */; };
 		7C6AF41F1FB340CA006CB4ED /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7C6AF41E1FB340CA006CB4ED /* LaunchScreen.xib */; };
@@ -61,6 +62,8 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		30992D3B789B4F8CA8705055 /* Pods-ALCameraViewController.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ALCameraViewController.release.xcconfig"; path = "Pods/Target Support Files/Pods-ALCameraViewController/Pods-ALCameraViewController.release.xcconfig"; sourceTree = "<group>"; };
+		5EA3B6D5F07E9E32F0AF2A75 /* Pods_ALCameraViewController.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ALCameraViewController.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		7AC96FA11F5B5166003E53F4 /* CroppingParameters.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CroppingParameters.swift; sourceTree = "<group>"; };
 		7C6AF41E1FB340CA006CB4ED /* LaunchScreen.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = "<group>"; };
 		C40665431C73A47C00EB9751 /* SingleImageSaver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SingleImageSaver.swift; sourceTree = "<group>"; };
@@ -73,6 +76,7 @@
 		C4829FFF1CAEB16C00541D08 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		C4D9BA441CA7224B004F70F7 /* PhotoLibraryAuthorizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotoLibraryAuthorizer.swift; sourceTree = "<group>"; };
 		C4D9BA461CA73163004F70F7 /* UIButtonExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIButtonExtensions.swift; sourceTree = "<group>"; };
+		D4AD3E148CB26CAF275AC0AC /* Pods-ALCameraViewController.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ALCameraViewController.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ALCameraViewController/Pods-ALCameraViewController.debug.xcconfig"; sourceTree = "<group>"; };
 		EBF7829B1CB2C04300DE3E63 /* CameraViewControllerConstraint.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = CameraViewControllerConstraint.swift; sourceTree = "<group>"; tabWidth = 4; };
 		EBFE097C1CAF1D1A00A8C637 /* UIViewExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIViewExtensions.swift; sourceTree = "<group>"; };
 		FA52EE0A1B44129B00E16B6F /* ViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ViewController.xib; sourceTree = "<group>"; };
@@ -108,12 +112,22 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				1D4BC6A7CE46F52C503BE81A /* Pods_ALCameraViewController.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		43256C8F415F4382CB1B01FE /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				D4AD3E148CB26CAF275AC0AC /* Pods-ALCameraViewController.debug.xcconfig */,
+				30992D3B789B4F8CA8705055 /* Pods-ALCameraViewController.release.xcconfig */,
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
 		C4829FFC1CAEB16C00541D08 /* CameraViewController */ = {
 			isa = PBXGroup;
 			children = (
@@ -123,6 +137,14 @@
 			path = CameraViewController;
 			sourceTree = "<group>";
 		};
+		FA87334AA8FE91546E22FE97 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				5EA3B6D5F07E9E32F0AF2A75 /* Pods_ALCameraViewController.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		FAB50BEA1B413E41009905B9 /* ViewController */ = {
 			isa = PBXGroup;
 			children = (
@@ -171,6 +193,8 @@
 				FAF058411B31618D008E5592 /* ALCameraViewController */,
 				C4829FFC1CAEB16C00541D08 /* CameraViewController */,
 				FAF058401B31618D008E5592 /* Products */,
+				43256C8F415F4382CB1B01FE /* Pods */,
+				FA87334AA8FE91546E22FE97 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -253,9 +277,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = FAF0585E1B31618D008E5592 /* Build configuration list for PBXNativeTarget "ALCameraViewController" */;
 			buildPhases = (
+				B7EE613AF2C8F9F3F680AD43 /* [CP] Check Pods Manifest.lock */,
 				FAF0583B1B31618D008E5592 /* Sources */,
 				FAF0583C1B31618D008E5592 /* Frameworks */,
 				FAF0583D1B31618D008E5592 /* Resources */,
+				18CD297EA4D45E5795E3F66F /* [CP] Embed Pods Frameworks */,
+				52854F814B04225D8FBC2683 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -283,7 +310,7 @@
 					};
 					FAF0583E1B31618D008E5592 = {
 						CreatedOnToolsVersion = 6.3.2;
-						DevelopmentTeam = 2466624KEK;
+						DevelopmentTeam = 4L5389GUUE;
 						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
@@ -335,6 +362,60 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		18CD297EA4D45E5795E3F66F /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-ALCameraViewController/Pods-ALCameraViewController-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/ALCameraViewController/ALCameraViewController.framework",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ALCameraViewController.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ALCameraViewController/Pods-ALCameraViewController-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		52854F814B04225D8FBC2683 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ALCameraViewController/Pods-ALCameraViewController-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		B7EE613AF2C8F9F3F680AD43 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-ALCameraViewController-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		C4829FF61CAEB16C00541D08 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -545,10 +626,12 @@
 		};
 		FAF0585F1B31618D008E5592 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = D4AD3E148CB26CAF275AC0AC /* Pods-ALCameraViewController.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = 2466624KEK;
+				DEVELOPMENT_TEAM = 4L5389GUUE;
+				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "Example/Supporting Files/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -561,10 +644,12 @@
 		};
 		FAF058601B31618D008E5592 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 30992D3B789B4F8CA8705055 /* Pods-ALCameraViewController.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = 2466624KEK;
+				DEVELOPMENT_TEAM = 4L5389GUUE;
+				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "Example/Supporting Files/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

ALCameraViewController/Utilities/ALCameraViewController-Bridging-Header.h

@@ -0,0 +1,5 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+
+//#import <Cordova/CDV.h>

ALCameraViewController/Utilities/CameraGlobals.swift

@@ -11,12 +11,12 @@ import AVFoundation
 
 internal let itemSpacing: CGFloat = 1
 internal let columns: CGFloat = 4
-internal let thumbnailDimension = (UIScreen.main.bounds.width - ((columns * itemSpacing) - itemSpacing))/columns
+internal let thumbnailDimension = (UIScreen.main.bounds.width - ((columns * itemSpacing) - itemSpacing)) / columns
 internal let scale = UIScreen.main.scale
 
 public class CameraGlobals {
     public static let shared = CameraGlobals()
-    
+
     public var bundle = Bundle(for: CameraViewController.self)
     public var stringsTable = "CameraView"
     public var photoLibraryThumbnailSize = CGSize(width: thumbnailDimension, height: thumbnailDimension)

ALCameraViewController/Utilities/CameraShot.swift

@@ -9,48 +9,62 @@
 import UIKit
 import AVFoundation
 
-public typealias CameraShotCompletion = (UIImage?) -> Void
+public typealias CameraShotCompletion = (Data?, UIImage?, String?, String?) -> Void
+
+public func takePhoto(_ stillImageOutput: AVCaptureStillImageOutput, videoOrientation: AVCaptureVideoOrientation, cameraPosition: AVCaptureDevice.Position, cropSize _: CGSize, outputScale: CGFloat, completion: @escaping CameraShotCompletion) {
 
-public func takePhoto(_ stillImageOutput: AVCaptureStillImageOutput, videoOrientation: AVCaptureVideoOrientation, cameraPosition: AVCaptureDevice.Position, cropSize: CGSize, completion: @escaping CameraShotCompletion) {
-
     guard let videoConnection: AVCaptureConnection = stillImageOutput.connection(with: AVMediaType.video) else {
-        completion(nil)
+        completion(nil, nil, nil, nil)
         return
     }
-    
+
     videoConnection.videoOrientation = videoOrientation
-
-    stillImageOutput.captureStillImageAsynchronously(from: videoConnection, completionHandler: { buffer, error in
-
-        guard let buffer = buffer,
-            let imageData = AVCaptureStillImageOutput.jpegStillImageNSDataRepresentation(buffer),
-            var image = UIImage(data: imageData) else {
-            completion(nil)
-            return
-        }
-
-        // flip the image to match the orientation of the preview
-        if cameraPosition == .front, let cgImage = image.cgImage {
-            switch image.imageOrientation {
-            case .leftMirrored:
-                image = UIImage(cgImage: cgImage, scale: image.scale, orientation: .right)
-            case .left:
-                image = UIImage(cgImage: cgImage, scale: image.scale, orientation: .rightMirrored)
-            case .rightMirrored:
-                image = UIImage(cgImage: cgImage, scale: image.scale, orientation: .left)
-            case .right:
-                image = UIImage(cgImage: cgImage, scale: image.scale, orientation: .leftMirrored)
-            case .up:
-                image = UIImage(cgImage: cgImage, scale: image.scale, orientation: .upMirrored)
-            case .upMirrored:
-                image = UIImage(cgImage: cgImage, scale: image.scale, orientation: .up)
-            case .down:
-                image = UIImage(cgImage: cgImage, scale: image.scale, orientation: .downMirrored)
-            case .downMirrored:
-                image = UIImage(cgImage: cgImage, scale: image.scale, orientation: .down)
+
+    if !stillImageOutput.isCapturingStillImage {
+        stillImageOutput.captureStillImageAsynchronously(from: videoConnection, completionHandler: { buffer, error in
+
+            if let error = error {
+                completion(nil, nil, "Error in image capture: \(error.localizedDescription)", nil)
+            }
+
+            guard let buffer = buffer,
+                let exifAttachments = CMGetAttachment(buffer, kCGImagePropertyExifDictionary, nil),
+                let imageData = AVCaptureStillImageOutput.jpegStillImageNSDataRepresentation(buffer),
+                var image = UIImage(data: imageData),
+                let cgImage = image.cgImage else {
+                DispatchQueue.main.async {
+                    completion(nil, nil, "Error capture, NULL image buffer or NULL EXIF data", nil)
+                    return
+                }
+                return
+            }
+
+            // flip the image to match the orientation of the preview
+            // Half size is large for now
+            if cameraPosition == .front {
+                switch image.imageOrientation {
+                case .leftMirrored:
+                    image = UIImage(cgImage: cgImage, scale: outputScale, orientation: .right)
+                case .left:
+                    image = UIImage(cgImage: cgImage, scale: outputScale, orientation: .rightMirrored)
+                case .rightMirrored:
+                    image = UIImage(cgImage: cgImage, scale: outputScale, orientation: .left)
+                case .right:
+                    image = UIImage(cgImage: cgImage, scale: outputScale, orientation: .leftMirrored)
+                case .up:
+                    image = UIImage(cgImage: cgImage, scale: outputScale, orientation: .upMirrored)
+                case .upMirrored:
+                    image = UIImage(cgImage: cgImage, scale: outputScale, orientation: .up)
+                case .down:
+                    image = UIImage(cgImage: cgImage, scale: outputScale, orientation: .downMirrored)
+                case .downMirrored:
+                    image = UIImage(cgImage: cgImage, scale: outputScale, orientation: .down)
+                }
+            } else {
+                image = UIImage(cgImage: cgImage, scale: outputScale, orientation: image.imageOrientation)
             }
-        }
-        
-        completion(image)
-    })
+            completion(imageData, image, nil, "EXIF \(exifAttachments)")
+
+        })
+    }
 }

ALCameraViewController/Utilities/CroppingParameters.swift

@@ -29,7 +29,7 @@ public struct CroppingParameters {
     public init(isEnabled: Bool = false,
                 allowResizing: Bool = true,
                 allowMoving: Bool = true,
-         minimumSize: CGSize = CGSize(width: 60, height: 60)) {
+                minimumSize: CGSize = CGSize(width: 60, height: 60)) {
 
         self.isEnabled = isEnabled
         self.allowResizing = allowResizing

ALCameraViewController/Utilities/ImageFetcher.swift

@@ -9,37 +9,37 @@
 import UIKit
 import Photos
 
-public typealias ImageFetcherSuccess = (PHFetchResult<PHAsset>) -> ()
-public typealias ImageFetcherFailure = (NSError) -> ()
+public typealias ImageFetcherSuccess = (PHFetchResult<PHAsset>) -> Void
+public typealias ImageFetcherFailure = (NSError) -> Void
 
-//extension PHFetchResult: Sequence {
+// extension PHFetchResult: Sequence {
 //    public func makeIterator() -> NSFastEnumerationIterator {
 //        return NSFastEnumerationIterator(self)
 //    }
-//}
+// }
 
 public class ImageFetcher {
 
     private var success: ImageFetcherSuccess?
     private var failure: ImageFetcherFailure?
-    
+
     private var authRequested = false
     private let errorDomain = "com.zero.imageFetcher"
-    
-    let libraryQueue = DispatchQueue(label: "com.zero.ALCameraViewController.LibraryQueue");
-    
-    public init() { }
-    
+
+    let libraryQueue = DispatchQueue(label: "com.zero.ALCameraViewController.LibraryQueue")
+
+    public init() {}
+
     public func onSuccess(_ success: @escaping ImageFetcherSuccess) -> Self {
         self.success = success
         return self
     }
-    
+
     public func onFailure(_ failure: @escaping ImageFetcherFailure) -> Self {
         self.failure = failure
         return self
     }
-    
+
     public func fetch() -> Self {
         _ = PhotoLibraryAuthorizer { error in
             if error == nil {
@@ -50,7 +50,7 @@ public class ImageFetcher {
         }
         return self
     }
-    
+
     private func onAuthorized() {
         let options = PHFetchOptions()
         options.sortDescriptors = [NSSortDescriptor(key: "creationDate", ascending: false)]