more Swift 3.0 changes

update for Swift 3.0

CHANGELOG.md

@@ -0,0 +1,214 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [3.0.0](https://github.com/imaginary-cloud/CameraManager/tree/3.0.0) - 2016-09-16
+### Changed
+
+- Syntax update for Swift 3.0.
+
+## [2.2.4](https://github.com/imaginary-cloud/CameraManager/tree/2.2.4) - 2016-07-06
+### Added
+
+- Add error checking.
+
+### Changed
+
+- Fixes completion typos and suggests renamed functions.
+
+
+## [2.2.3](https://github.com/imaginary-cloud/CameraManager/tree/2.2.3) - 2016-05-12
+### Changed
+
+- Fixed zoom in StillImage Mode.
+
+- Minor refactoring
+
+## [2.2.2](https://github.com/imaginary-cloud/CameraManager/tree/2.2.2) - 2016-03-07
+### Added
+
+- `CHANGELOG.md` file.
+
+## [2.2.1](https://github.com/imaginary-cloud/CameraManager/tree/2.2.1) - 2016-03-02
+### Added
+
+- Initial support for the Swift Package Manager.
+
+## [2.2.0](https://github.com/imaginary-cloud/CameraManager/tree/2.2.0) - 2016-02-19
+### Added
+
+- Zoom support.
+
+### Changed
+
+- Fixed spelling of `embeddingView`.
+
+## [2.1.3](https://github.com/imaginary-cloud/CameraManager/tree/2.1.3) - 2016-01-08
+### Changed
+
+- No sound in video with more than 10 seconds fixed.
+
+- Fixed `NewCameraOutputMode` not passed during init.
+
+## [2.1.2](https://github.com/imaginary-cloud/CameraManager/tree/2.1.2) - 2015-12-24
+### Added
+
+- Property `cameraIsReady`.
+
+- Completion block `addPreviewLayerToView`.
+
+## [2.1.1](https://github.com/imaginary-cloud/CameraManager/tree/2.1.1) - 2015-12-11
+### Added
+
+- Ability to disable responding to device orientation changes.
+
+## [2.1.0](https://github.com/imaginary-cloud/CameraManager/tree/2.1) - 2015-11-20
+### Added
+
+- Properties `recordedDuration` and `recordedFileSize`.
+
+## [2.0.2](https://github.com/imaginary-cloud/CameraManager/tree/2.0.2) - 2015-11-17
+### Fixed
+
+- iOS 9.0.1 bug.
+
+## [2.0.1](https://github.com/imaginary-cloud/CameraManager/tree/2.0.1) - 2015-09-17
+### Changed
+
+- Syntax updates.
+
+## [2.0.0](https://github.com/imaginary-cloud/CameraManager/tree/2.0.0) - 2015-07-30
+### Changed
+
+- Syntax update for Swift 2.0.
+
+## [1.0.14](https://github.com/imaginary-cloud/CameraManager/tree/1.0.14) - 2015-07-17
+### Changed
+
+- Small fixes.
+
+## [1.0.13](https://github.com/imaginary-cloud/CameraManager/tree/1.0.13) - 2015-05-12
+### Added
+
+- Support for installing via Carthage.
+
+- Property `hasFlash`.
+
+### Changed
+
+- Syntax update for Swift 1.2.
+
+## [1.0.12](https://github.com/imaginary-cloud/CameraManager/tree/1.0.12) - 2015-03-23
+### Added
+
+- Incremental flash mode.
+
+- Content localization.
+
+### Changed
+
+- Torch is set to correct state according to the current flash mode.
+
+- `README.md` update.
+
+## [1.0.11](https://github.com/imaginary-cloud/CameraManager/tree/1.0.11) - 2015-03-20
+### Added
+
+- Property `showAccessPermissionPopupAutomatically`, to determine if you want the user to be asked about camera permissions automatically or manually.
+
+- Error handling in capture completion blocks.
+
+## [1.0.10](https://github.com/imaginary-cloud/CameraManager/tree/1.0.10) - 2015-03-19
+### Added
+
+- Camera state returned when adding the preview layer.
+
+### Changed
+
+- `README.md` update.
+
+## [1.0.9](https://github.com/imaginary-cloud/CameraManager/tree/1.0.9) - 2015-03-10
+### Changed
+
+- CameraManager class made public.
+
+## [1.0.8](https://github.com/imaginary-cloud/CameraManager/tree/1.0.8) - 2015-02-24
+### Fixed
+
+- Wrong orientation when camera preview starts in landscape mode.
+
+- Crash when trying to capture a still image.
+
+- Orientation detection failure after stop and resume of a capture session.
+
+- Bug which prevented from recording audio.
+
+## [1.0.7](https://github.com/imaginary-cloud/CameraManager/tree/1.0.7) - 2014-10-30
+### Added
+
+- Version compatible with XCode 6.1.
+
+### Changed
+
+- `README.md` update.
+
+- Swift syntax updates to resolve compile errors.
+
+## [1.0.6](https://github.com/imaginary-cloud/CameraManager/tree/1.0.6) - 2014-10-28
+### Added
+
+- Check for valid capture session.
+
+### Changed
+
+- Fixed video orientation change.
+
+## [1.0.5](https://github.com/imaginary-cloud/CameraManager/tree/1.0.5) - 2014-10-22
+### Changed
+
+- Enhanced Camera lifecyle.
+
+- Orientation observers only added if needed.
+
+## [1.0.4](https://github.com/imaginary-cloud/CameraManager/tree/1.0.4) - 2014-10-16
+### Added
+
+- Restart session.
+
+### Changed
+
+- `README.md` update.
+
+## [1.0.3](https://github.com/imaginary-cloud/CameraManager/tree/1.0.3) - 2014-10-15
+### Added
+
+-  Property `writeFilesToPhoneLibrary` to conditionally write to user library.
+
+### Changed
+
+- Resources only recreated when needed.
+
+- `README.md` update.
+
+## [1.0.2](https://github.com/imaginary-cloud/CameraManager/tree/1.0.2) - 2014-10-15
+### Added
+
+- `CameraManager.podspec` file.
+
+## [1.0.1](https://github.com/imaginary-cloud/CameraManager/tree/1.0.1) - 2014-10-15
+### Changed
+
+- Optional initializer for `addPreviewLayerToView`.
+
+## [1.0.0](https://github.com/imaginary-cloud/CameraManager/tree/1.0.0) - 2014-10-15
+### Added
+
+- Front and back camera selection.
+
+- Support for multiple flash modes.
+
+- Video recording, with or without mic.
+
+- Support for multiple camera output quality.
+
+- Preview layer follows interface orientation changes.

CameraManager.podspec

@@ -1,13 +1,13 @@
 Pod::Spec.new do |s|
   s.name             = "CameraManager"
-  s.version          = "2.0.1"
+  s.version          = "3.0.0"
   s.summary          = "This is a simple Swift class to provide all the configurations you need to create custom camera view in your app. Just drag, drop and use."
+  s.requires_arc     = true
   s.homepage         = "https://github.com/imaginary-cloud/CameraManager"
   s.license          = 'MIT'
-  s.author           = { "nelanelanela" => "nterlecka@imaginarycloud.com" }
+  s.author           = { "torrao" => "rtorrao@imaginarycloud.com" }
-  s.source           = { :git => "https://github.com/imaginary-cloud/CameraManager.git", :tag => "2.0.1" }
+  s.source           = { :git => "https://github.com/imaginary-cloud/CameraManager.git", :tag => "3.0.0" }
   s.social_media_url = 'http://www.imaginarycloud.com/'
   s.platform         = :ios, '8.0'
-  s.requires_arc     = true
   s.source_files     = 'camera/CameraManager.swift'
 end

Package.swift

@@ -0,0 +1,12 @@
+// Package.swift
+//
+// Copyright © 2016 ImaginaryCloud, imaginarycloud.com. This library is licensed under the MIT license.
+
+import PackageDescription
+
+let package = Package(
+  name: "CameraManager",
+  targets: [
+        Target(name: "camera", dependencies: [.Target(name: "CameraManager")])
+    ]
+)

README.md

@@ -2,24 +2,32 @@
 # Camera Manager
 [![CocoaPods](https://img.shields.io/cocoapods/v/CameraManager.svg)](https://github.com/imaginary-cloud/CameraManager) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 
-This is a simple Swift class to provide all the configurations you need to create custom camera view in your app. 
+This is a simple Swift class to provide all the configurations you need to create custom camera view in your app.
-It follows orientation change and updates UI accordingly, supports front and rear camera selection, different flash modes, inputs and outputs.
+It follows orientation change and updates UI accordingly, supports front and rear camera selection, pinch to zoom, different flash modes, inputs and outputs.
-Just drag, drop and use. 
+Just drag, drop and use.
 
-Now it's compatibile with latest Swift syntax if you're using any Swift version prior to 2.0 make sure to use one of the previously tagged releases.
+Now it's compatible with latest Swift syntax if you're using any Swift version prior to 2.0 make sure to use one of the previously tagged releases.
 
 ## Installation with CocoaPods
 
-The easiest way to install the CameraManager is with: [CocoaPods](http://cocoapods.org) 
+The easiest way to install the CameraManager is with: [CocoaPods](http://cocoapods.org)
 
 ### Podfile
 
+If you want Swift 3.0 syntax use:
+
+```ruby
+use_frameworks!
+
+pod 'CameraManager', '~> 3.0'
+```
+
 If you want Swift 2.0 syntax use:
 
 ```ruby
 use_frameworks!
 
-pod 'CameraManager', '~> 2.0’
+pod 'CameraManager', '~> 2.2'
 ```
 
 If you want Swift 1.2 syntax use:
@@ -30,16 +38,38 @@ use_frameworks!
 pod 'CameraManager', '~> 1.0.14'
 ```
 
+## Installation with Swift Package Manager
+
+The [Swift Package Manager](https://swift.org/package-manager/) is a tool for managing the distribution of Swift code.
+
+Add `CameraManager` as a dependency in your `Package.swift` file:
+
+```
+import PackageDescription
+
+let package = Package(
+    dependencies: [
+        .Package(url: "https://github.com/imaginary-cloud/CameraManager", majorVersion: 2, minor: 2)
+    ]
+)
+```
+
 ## Installation with Carthage
 
 [Carthage](https://github.com/Carthage/Carthage) is another dependency management tool written in Swift.
 
 Add the following line to your Cartfile:
 
+If you want Swift 3.0 syntax use:
+
+```
+github "imaginary-cloud/CameraManager" >= 3.0
+```
+
 If you want Swift 2.0 syntax use:
 
 ```
-github "imaginary-cloud/CameraManager" >= 2.0
+github "imaginary-cloud/CameraManager" >= 2.2
 ```
 
 If you want Swift 1.2 syntax use:
@@ -51,68 +81,69 @@ github "imaginary-cloud/CameraManager" >= 1.0
 And run `carthage update` to build the dynamic framework.
 
 ## How to use
-To use it you just add the preview layer to your desired view, you'll get back the state of the camera if it's unavailable, ready or the user denied assess to it.
+To use it you just add the preview layer to your desired view, you'll get back the state of the camera if it's unavailable, ready or the user denied access to it. Have in mind that in order to retain the AVCaptureSession you will need to retain cameraManager instance somewhere, ex. as an instance constant.
 ```swift
-CameraManager.sharedInstance.addPreviewLayerToView(self.cameraView)
+let cameraManager = CameraManager()
+cameraManager.addPreviewLayerToView(self.cameraView)
 ```
 You can set input device to front or back camera:
 ```swift
-CameraManager.sharedInstance.cameraDevice = .Front 
+cameraManager.cameraDevice = .Front
-CameraManager.sharedInstance.cameraDevice = .Back 
+cameraManager.cameraDevice = .Back
 ```
 
 You can set output format to Image, video or video with audio:
 ```swift
-CameraManager.sharedInstance.cameraOutputMode = .StillImage
+cameraManager.cameraOutputMode = .StillImage
-CameraManager.sharedInstance.cameraOutputMode = .VideoWithMic
+cameraManager.cameraOutputMode = .VideoWithMic
-CameraManager.sharedInstance.cameraOutputMode = .VideoOnly
+cameraManager.cameraOutputMode = .VideoOnly
 ```
 
 You can set the quality:
 ```swift
-CameraManager.sharedInstance.cameraOutputQuality = .Low
+cameraManager.cameraOutputQuality = .Low
-CameraManager.sharedInstance.cameraOutputQuality = .Medium
+cameraManager.cameraOutputQuality = .Medium
-CameraManager.sharedInstance.cameraOutputQuality = .High
+cameraManager.cameraOutputQuality = .High
 ```
 
 And flash mode (it will also set corresponding torch mode for video shoot):
 ```swift
-CameraManager.sharedInstance.flashMode = .Off
+cameraManager.flashMode = .Off
-CameraManager.sharedInstance.flashMode = .On
+cameraManager.flashMode = .On
-CameraManager.sharedInstance.flashMode = .Auto
+cameraManager.flashMode = .Auto
 ```
 
 To check if the device supports flash call:
 ```swift
-CameraManager.sharedInstance.hasFlash
+cameraManager.hasFlash
 ```
 
 To change flash mode to the next available one you can use this handy function which will also return current value for you to update the UI accordingly:
 ```swift
-CameraManager.sharedInstance.changeFlashMode()
+cameraManager.changeFlashMode()
 ```
 
 
 You can specify if you want to save the files to phone library:
 ```swift
-CameraManager.sharedInstance.writeFilesToPhoneLibrary = true
+cameraManager.writeFilesToPhoneLibrary = true
 ```
 
 You can specify if you want the user to be asked about camera permissions automatically when you first try to use the camera or manually:
 ```swift
-CameraManager.sharedInstance.showAccessPermissionPopupAutomatically = false
+cameraManager.showAccessPermissionPopupAutomatically = false
 ```
 
 You can even setUp your custom block to handle error messages:
-It can be customised to be presented on the Window root view controller, for example.
+It can be customized to be presented on the Window root view controller, for example.
 ```swift
-CameraManager.sharedInstance.showErrorBlock = { (erTitle: String, erMessage: String) -> Void in
+cameraManager.showErrorBlock = { (erTitle: String, erMessage: String) -> Void in
     var alertController = UIAlertController(title: erTitle, message: erMessage, preferredStyle: .Alert)
     alertController.addAction(UIAlertAction(title: "OK", style: UIAlertActionStyle.Default, handler: { (alertAction) -> Void in
     }))
-        
+
     let topController = UIApplication.sharedApplication().keyWindow?.rootViewController
-        
+
     if (topController != nil) {
         topController?.presentViewController(alertController, animated: true, completion: { () -> Void in
             //
@@ -124,23 +155,23 @@ CameraManager.sharedInstance.showErrorBlock = { (erTitle: String, erMessage: Str
 
 To shoot image all you need to do is call:
 ```swift
-CameraManager.sharedInstance.capturePictureWithCompletition({ (image, error) -> Void in
+cameraManager.capturePictureWithCompletion({ (image, error) -> Void in
 	self.myImage = image             
 })
 ```
 
 To record video you do:
 ```swift
-CameraManager.sharedInstance.startRecordingVideo()
+cameraManager.startRecordingVideo()
-CameraManager.sharedInstance.stopRecordingVideo({ (videoURL, error) -> Void in
+cameraManager.stopVideoRecording({ (videoURL, error) -> Void in
 	NSFileManager.defaultManager().copyItemAtURL(videoURL, toURL: self.myVideoURL, error: &error)
 })
 ```
 
 ## Support
 
-Supports iOS 8 and above. Xcode 6.3 is required to build the latest code written in Swift 1.2.
+Supports iOS 8 and above. Xcode 7.0 is required to build the latest code written in Swift 2.0.
 
 ## License
 
-Copyright © 2015 ImaginaryCloud, imaginarycloud.com. This library is licensed under the MIT license.
+Copyright © 2016 ImaginaryCloud, imaginarycloud.com. This library is licensed under the MIT license.

camera.xcodeproj/project.pbxproj

@@ -12,7 +12,6 @@
 		454C1F4C19E82E2500C81915 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 454C1F4A19E82E2500C81915 /* Main.storyboard */; };
 		454C1F4E19E82E2500C81915 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 454C1F4D19E82E2500C81915 /* Images.xcassets */; };
 		454C1F5119E82E2500C81915 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 454C1F4F19E82E2500C81915 /* LaunchScreen.xib */; };
-		454C1F6719E8316A00C81915 /* CameraManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 454C1F6619E8316A00C81915 /* CameraManager.swift */; };
 		45A23C181A656BDC00FB48F3 /* ImageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45A23C171A656BDC00FB48F3 /* ImageViewController.swift */; };
 		D71DE8861AD677A7001E62F1 /* CameraManager.h in Headers */ = {isa = PBXBuildFile; fileRef = D71DE8851AD677A7001E62F1 /* CameraManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D71DE8981AD677A8001E62F1 /* CameraManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D71DE8811AD677A7001E62F1 /* CameraManager.framework */; };
@@ -52,7 +51,7 @@
 		454C1F4B19E82E2500C81915 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		454C1F4D19E82E2500C81915 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		454C1F5019E82E2500C81915 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
-		454C1F6619E8316A00C81915 /* CameraManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CameraManager.swift; sourceTree = "<group>"; };
+		454C1F6619E8316A00C81915 /* CameraManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CameraManager.swift; path = ../camera/CameraManager.swift; sourceTree = "<group>"; };
 		45A23C171A656BDC00FB48F3 /* ImageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageViewController.swift; sourceTree = "<group>"; };
 		D71DE8811AD677A7001E62F1 /* CameraManager.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CameraManager.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		D71DE8841AD677A7001E62F1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -101,7 +100,6 @@
 			children = (
 				454C1F4619E82E2500C81915 /* AppDelegate.swift */,
 				45A23C191A656BE600FB48F3 /* Example app view controllers */,
-				454C1F6619E8316A00C81915 /* CameraManager.swift */,
 				454C1F4A19E82E2500C81915 /* Main.storyboard */,
 				454C1F4D19E82E2500C81915 /* Images.xcassets */,
 				454C1F4F19E82E2500C81915 /* LaunchScreen.xib */,
@@ -131,6 +129,7 @@
 			isa = PBXGroup;
 			children = (
 				D71DE8851AD677A7001E62F1 /* CameraManager.h */,
+				454C1F6619E8316A00C81915 /* CameraManager.swift */,
 				D71DE8831AD677A7001E62F1 /* Supporting Files */,
 			);
 			path = CameraManager;
@@ -202,14 +201,17 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0700;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = imaginaryCloud;
 				TargetAttributes = {
 					454C1F4019E82E2500C81915 = {
 						CreatedOnToolsVersion = 6.0.1;
+						DevelopmentTeam = QM7HJTY23M;
+						LastSwiftMigration = 0800;
 					};
 					D71DE8801AD677A7001E62F1 = {
 						CreatedOnToolsVersion = 6.3;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -258,7 +260,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				454C1F4919E82E2500C81915 /* ViewController.swift in Sources */,
-				454C1F6719E8316A00C81915 /* CameraManager.swift in Sources */,
 				45A23C181A656BDC00FB48F3 /* ImageViewController.swift in Sources */,
 				454C1F4719E82E2500C81915 /* AppDelegate.swift in Sources */,
 			);
@@ -315,8 +316,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*]" = "";
@@ -326,6 +329,7 @@
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -360,8 +364,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -369,6 +375,7 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -378,6 +385,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -387,11 +395,13 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = camera/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = cameraDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -399,17 +409,20 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = camera/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = cameraDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
 		D71DE89B1AD677A8001E62F1 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
@@ -428,6 +441,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.imaginarycloud.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -436,6 +450,7 @@
 		D71DE89C1AD677A8001E62F1 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -451,6 +466,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.imaginarycloud.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};

camera.xcodeproj/xcshareddata/xcschemes/CameraManager.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -23,21 +23,21 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
-      buildConfiguration = "Debug">
       <Testables>
       </Testables>
       <AdditionalOptions>
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
@@ -55,10 +55,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference

camera/AppDelegate.swift

@@ -14,30 +14,30 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }
 
-    func applicationWillResignActive(application: UIApplication) {
+    func applicationWillResignActive(_ application: UIApplication) {
         // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
         // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
     }
 
-    func applicationDidEnterBackground(application: UIApplication) {
+    func applicationDidEnterBackground(_ application: UIApplication) {
         // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
         // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
     }
 
-    func applicationWillEnterForeground(application: UIApplication) {
+    func applicationWillEnterForeground(_ application: UIApplication) {
         // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
     }
 
-    func applicationDidBecomeActive(application: UIApplication) {
+    func applicationDidBecomeActive(_ application: UIApplication) {
         // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
     }
 
-    func applicationWillTerminate(application: UIApplication) {
+    func applicationWillTerminate(_ application: UIApplication) {
         // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     }
 

camera/Base.lproj/LaunchScreen.xib

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
         <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
     </dependencies>
     <objects>
@@ -11,16 +12,16 @@
             <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2014 imaginaryCloud. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2016 imaginaryCloud. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
                     <rect key="frame" x="20" y="439" width="441" height="21"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="camera" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
                     <rect key="frame" x="20" y="140" width="441" height="43"/>
                     <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
             </subviews>

camera/Base.lproj/Main.storyboard

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6751" systemVersion="13F1066" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="bhK-VL-qY4">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="bhK-VL-qY4">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6736"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
         <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
     </dependencies>
     <scenes>

camera/ImageViewController.swift

@@ -15,7 +15,7 @@ class ImageViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        self.navigationController?.navigationBar.hidden = false
+        self.navigationController?.navigationBar.isHidden = false
 
         if let validImage = self.image {
             self.imageView.image = validImage

camera/Info.plist

@@ -2,6 +2,12 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>CameraManager will access your photo library to save pictures/video.</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>CameraManager will use your microphone to record audio for videos.</string>
+	<key>NSCameraUsageDescription</key>
+	<string>CameraManager will use your camera to take pictures/video.</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>

camera/ViewController.swift

@@ -7,12 +7,13 @@
 //
 
 import UIKit
+import CameraManager
 
 class ViewController: UIViewController {
     
     // MARK: - Constants
 
-    let cameraManager = CameraManager.sharedInstance
+    let cameraManager = CameraManager()
     
     // MARK: - @IBOutlets
 
@@ -30,137 +31,130 @@ class ViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        self.cameraManager.showAccessPermissionPopupAutomatically = false
+        cameraManager.showAccessPermissionPopupAutomatically = false
         
-        self.askForPermissionsButton.hidden = true
+        askForPermissionsButton.isHidden = true
-        self.askForPermissionsLabel.hidden = true
+        askForPermissionsLabel.isHidden = true
 
-        let currentCameraState = self.cameraManager.currentCameraStatus()
+        let currentCameraState = cameraManager.currentCameraStatus()
         
-        if currentCameraState == .NotDetermined {
+        if currentCameraState == .notDetermined {
-            self.askForPermissionsButton.hidden = false
+            askForPermissionsButton.isHidden = false
-            self.askForPermissionsLabel.hidden = false
+            askForPermissionsLabel.isHidden = false
-        } else if (currentCameraState == .Ready) {
+        } else if (currentCameraState == .ready) {
-            self.addCameraToView()
+            addCameraToView()
         }
-        if !self.cameraManager.hasFlash {
+        if !cameraManager.hasFlash {
-            self.flashModeButton.enabled = false
+            flashModeButton.isEnabled = false
-            self.flashModeButton.setTitle("No flash", forState: UIControlState.Normal)
+            flashModeButton.setTitle("No flash", for: UIControlState())
         }
         
     }
     
-    override func viewWillAppear(animated: Bool)
+    override func viewWillAppear(_ animated: Bool) {
-    {
         super.viewWillAppear(animated)
         
-        self.navigationController?.navigationBar.hidden = true
+        navigationController?.navigationBar.isHidden = true
-        self.cameraManager.resumeCaptureSession()
+        cameraManager.resumeCaptureSession()
     }
     
-    override func viewWillDisappear(animated: Bool)
+    override func viewWillDisappear(_ animated: Bool) {
-    {
         super.viewWillDisappear(animated)
-        self.cameraManager.stopCaptureSession()
+        cameraManager.stopCaptureSession()
     }
     
     
     // MARK: - ViewController
     
-    private func addCameraToView()
+    fileprivate func addCameraToView()
     {
-        self.cameraManager.addPreviewLayerToView(self.cameraView, newCameraOutputMode: CameraOutputMode.VideoWithMic)
+        cameraManager.addPreviewLayerToView(cameraView, newCameraOutputMode: CameraOutputMode.videoWithMic)
-        CameraManager.sharedInstance.showErrorBlock = { (erTitle: String, erMessage: String) -> Void in            
+        cameraManager.showErrorBlock = { [weak self] (erTitle: String, erMessage: String) -> Void in
+        
+            let alertController = UIAlertController(title: erTitle, message: erMessage, preferredStyle: .alert)
+            alertController.addAction(UIAlertAction(title: "OK", style: UIAlertActionStyle.default, handler: { (alertAction) -> Void in  }))
             
-//            var alertController = UIAlertController(title: erTitle, message: erMessage, preferredStyle: .Alert)
+            self?.present(alertController, animated: true, completion: nil)
-//            alertController.addAction(UIAlertAction(title: "OK", style: UIAlertActionStyle.Default, handler: { (alertAction) -> Void in
-//                //
-//            }))
-//            
-//            let topController = UIApplication.sharedApplication().keyWindow?.rootViewController
-//            
-//            if (topController != nil) {
-//                topController?.presentViewController(alertController, animated: true, completion: { () -> Void in
-//                    //
-//                })
-//            }
         }
     }
 
     // MARK: - @IBActions
 
-    @IBAction func changeFlashMode(sender: UIButton)
+    @IBAction func changeFlashMode(_ sender: UIButton)
     {
-        
+        switch (cameraManager.changeFlashMode()) {
-        
+        case .off:
-        switch (self.cameraManager.changeFlashMode()) {
+            sender.setTitle("Flash Off", for: UIControlState())
-        case .Off:
+        case .on:
-            sender.setTitle("Flash Off", forState: UIControlState.Normal)
+            sender.setTitle("Flash On", for: UIControlState())
-        case .On:
+        case .auto:
-            sender.setTitle("Flash On", forState: UIControlState.Normal)
+            sender.setTitle("Flash Auto", for: UIControlState())
-        case .Auto:
-            sender.setTitle("Flash Auto", forState: UIControlState.Normal)
         }
     }
     
-    @IBAction func recordButtonTapped(sender: UIButton)
+    @IBAction func recordButtonTapped(_ sender: UIButton) {
-    {
+        
-        switch (self.cameraManager.cameraOutputMode) {
+        switch (cameraManager.cameraOutputMode) {
-        case .StillImage:
+        case .stillImage:
-            self.cameraManager.capturePictureWithCompletition({ (image, error) -> Void in
+            cameraManager.capturePictureWithCompletion({ (image, error) -> Void in
-                let vc: ImageViewController? = self.storyboard?.instantiateViewControllerWithIdentifier("ImageVC") as? ImageViewController
+                if let errorOccured = error {
-                if let validVC: ImageViewController = vc {
+                    self.cameraManager.showErrorBlock("Error occurred", errorOccured.localizedDescription)
-                    if let capturedImage = image {
+                }
-                        validVC.image = capturedImage
+                else {
-                        self.navigationController?.pushViewController(validVC, animated: true)
+                    let vc: ImageViewController? = self.storyboard?.instantiateViewController(withIdentifier: "ImageVC") as? ImageViewController
+                    if let validVC: ImageViewController = vc {
+                        if let capturedImage = image {
+                            validVC.image = capturedImage
+                            self.navigationController?.pushViewController(validVC, animated: true)
+                        }
                     }
                 }
             })
-        case .VideoWithMic, .VideoOnly:
+        case .videoWithMic, .videoOnly:
-            sender.selected = !sender.selected
+            sender.isSelected = !sender.isSelected
-            sender.setTitle(" ", forState: UIControlState.Selected)
+            sender.setTitle(" ", for: UIControlState.selected)
-            sender.backgroundColor = sender.selected ? UIColor.redColor() : UIColor.greenColor()
+            sender.backgroundColor = sender.isSelected ? UIColor.red : UIColor.green
-            if sender.selected {
+            if sender.isSelected {
-                self.cameraManager.startRecordingVideo()
+                cameraManager.startRecordingVideo()
             } else {
-                self.cameraManager.stopRecordingVideo({ (videoURL, error) -> Void in
+                cameraManager.stopVideoRecording({ (videoURL, error) -> Void in
                     if let errorOccured = error {                        
-                        self.cameraManager.showErrorBlock(erTitle: "Error occurred", erMessage: errorOccured.localizedDescription)
+                        self.cameraManager.showErrorBlock("Error occurred", errorOccured.localizedDescription)
                     }
                 })
             }
         }
     }
     
-    @IBAction func outputModeButtonTapped(sender: UIButton)
+    @IBAction func outputModeButtonTapped(_ sender: UIButton) {
-    {
+        
-        self.cameraManager.cameraOutputMode = self.cameraManager.cameraOutputMode == CameraOutputMode.VideoWithMic ? CameraOutputMode.StillImage : CameraOutputMode.VideoWithMic
+        cameraManager.cameraOutputMode = cameraManager.cameraOutputMode == CameraOutputMode.videoWithMic ? CameraOutputMode.stillImage : CameraOutputMode.videoWithMic
-        switch (self.cameraManager.cameraOutputMode) {
+        switch (cameraManager.cameraOutputMode) {
-        case .StillImage:
+        case .stillImage:
-            self.cameraButton.selected = false
+            cameraButton.isSelected = false
-            self.cameraButton.backgroundColor = UIColor.greenColor()
+            cameraButton.backgroundColor = UIColor.green
-            sender.setTitle("Image", forState: UIControlState.Normal)
+            sender.setTitle("Image", for: UIControlState())
-        case .VideoWithMic, .VideoOnly:
+        case .videoWithMic, .videoOnly:
-            sender.setTitle("Video", forState: UIControlState.Normal)
+            sender.setTitle("Video", for: UIControlState())
         }
     }
     
-    @IBAction func changeCameraDevice(sender: UIButton)
+    @IBAction func changeCameraDevice(_ sender: UIButton) {
-    {
+        
-        self.cameraManager.cameraDevice = self.cameraManager.cameraDevice == CameraDevice.Front ? CameraDevice.Back : CameraDevice.Front
+        cameraManager.cameraDevice = cameraManager.cameraDevice == CameraDevice.front ? CameraDevice.back : CameraDevice.front
-        switch (self.cameraManager.cameraDevice) {
+        switch (cameraManager.cameraDevice) {
-        case .Front:
+        case .front:
-            sender.setTitle("Front", forState: UIControlState.Normal)
+            sender.setTitle("Front", for: UIControlState())
-        case .Back:
+        case .back:
-            sender.setTitle("Back", forState: UIControlState.Normal)
+            sender.setTitle("Back", for: UIControlState())
         }
     }
     
-    @IBAction func askForCameraPermissions(sender: UIButton)
+    @IBAction func askForCameraPermissions(_ sender: UIButton) {
-    {
+        
-        self.cameraManager.askUserForCameraPermissions({ permissionGranted in
+        cameraManager.askUserForCameraPermission({ permissionGranted in
-            self.askForPermissionsButton.hidden = true
+            self.askForPermissionsButton.isHidden = true
-            self.askForPermissionsLabel.hidden = true
+            self.askForPermissionsLabel.isHidden = true
             self.askForPermissionsButton.alpha = 0
             self.askForPermissionsLabel.alpha = 0
             if permissionGranted {
@@ -169,15 +163,15 @@ class ViewController: UIViewController {
         })
     }
     
-    @IBAction func changeCameraQuality(sender: UIButton)
+    @IBAction func changeCameraQuality(_ sender: UIButton) {
-    {
+        
-        switch (self.cameraManager.changeQualityMode()) {
+        switch (cameraManager.changeQualityMode()) {
-        case .High:
+        case .high:
-            sender.setTitle("High", forState: UIControlState.Normal)
+            sender.setTitle("High", for: UIControlState())
-        case .Low:
+        case .low:
-            sender.setTitle("Low", forState: UIControlState.Normal)
+            sender.setTitle("Low", for: UIControlState())
-        case .Medium:
+        case .medium:
-            sender.setTitle("Medium", forState: UIControlState.Normal)
+            sender.setTitle("Medium", for: UIControlState())
         }
     }
 }