more Swift 3.0 changes

update for Swift 3.0

CHANGELOG.md

@@ -2,8 +2,29 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [2.2.2](https://github.com/imaginary-cloud/CameraManager/tree/2.2.2) - 2016-03-07
+## [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.

CameraManager.podspec

@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
   s.name             = "CameraManager"
-  s.version          = "2.2.4"
+  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           = { "torrao" => "rtorrao@imaginarycloud.com" }
-  s.source           = { :git => "https://github.com/imaginary-cloud/CameraManager.git", :tag => "2.2.4" }
+  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.source_files     = 'camera/CameraManager.swift'

README.md

@@ -14,6 +14,14 @@ The easiest way to install the CameraManager is with: [CocoaPods](http://cocoapo
 
 ### 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
@@ -52,6 +60,12 @@ let package = Package(
 
 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:
 
 ```

camera.xcodeproj/project.pbxproj

@@ -201,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;
 					};
 				};
 			};
@@ -313,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*]" = "";
@@ -324,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",
@@ -358,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";
@@ -367,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;
@@ -376,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;
 			};
@@ -385,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;
 		};
@@ -397,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;
@@ -426,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 = "";
 			};
@@ -434,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";
@@ -449,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/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

@@ -33,32 +33,32 @@ class ViewController: UIViewController {
         
         cameraManager.showAccessPermissionPopupAutomatically = false
         
-        askForPermissionsButton.hidden = true
+        askForPermissionsButton.isHidden = true
-        askForPermissionsLabel.hidden = true
+        askForPermissionsLabel.isHidden = true
 
         let currentCameraState = cameraManager.currentCameraStatus()
         
-        if currentCameraState == .NotDetermined {
+        if currentCameraState == .notDetermined {
-            askForPermissionsButton.hidden = false
+            askForPermissionsButton.isHidden = false
-            askForPermissionsLabel.hidden = false
+            askForPermissionsLabel.isHidden = false
-        } else if (currentCameraState == .Ready) {
+        } else if (currentCameraState == .ready) {
             addCameraToView()
         }
         if !cameraManager.hasFlash {
-            flashModeButton.enabled = false
+            flashModeButton.isEnabled = false
-            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)
         
-        navigationController?.navigationBar.hidden = true
+        navigationController?.navigationBar.isHidden = true
         cameraManager.resumeCaptureSession()
     }
     
-    override func viewWillDisappear(animated: Bool) {
+    override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         cameraManager.stopCaptureSession()
     }
@@ -66,42 +66,42 @@ class ViewController: UIViewController {
     
     // MARK: - ViewController
     
-    private func addCameraToView()
+    fileprivate func addCameraToView()
     {
-        cameraManager.addPreviewLayerToView(cameraView, newCameraOutputMode: CameraOutputMode.VideoWithMic)
+        cameraManager.addPreviewLayerToView(cameraView, newCameraOutputMode: CameraOutputMode.videoWithMic)
         cameraManager.showErrorBlock = { [weak self] (erTitle: String, erMessage: String) -> Void in
         
-            let alertController = UIAlertController(title: erTitle, message: erMessage, preferredStyle: .Alert)
+            let alertController = UIAlertController(title: erTitle, message: erMessage, preferredStyle: .alert)
-            alertController.addAction(UIAlertAction(title: "OK", style: UIAlertActionStyle.Default, handler: { (alertAction) -> Void in  }))
+            alertController.addAction(UIAlertAction(title: "OK", style: UIAlertActionStyle.default, handler: { (alertAction) -> Void in  }))
             
-            self?.presentViewController(alertController, animated: true, completion: nil)
+            self?.present(alertController, animated: true, completion: nil)
         }
     }
 
     // MARK: - @IBActions
 
-    @IBAction func changeFlashMode(sender: UIButton)
+    @IBAction func changeFlashMode(_ sender: UIButton)
     {
         switch (cameraManager.changeFlashMode()) {
-        case .Off:
+        case .off:
-            sender.setTitle("Flash Off", forState: UIControlState.Normal)
+            sender.setTitle("Flash Off", for: UIControlState())
-        case .On:
+        case .on:
-            sender.setTitle("Flash On", forState: UIControlState.Normal)
+            sender.setTitle("Flash On", for: UIControlState())
-        case .Auto:
+        case .auto:
-            sender.setTitle("Flash Auto", forState: UIControlState.Normal)
+            sender.setTitle("Flash Auto", for: UIControlState())
         }
     }
     
-    @IBAction func recordButtonTapped(sender: UIButton) {
+    @IBAction func recordButtonTapped(_ sender: UIButton) {
         
         switch (cameraManager.cameraOutputMode) {
-        case .StillImage:
+        case .stillImage:
             cameraManager.capturePictureWithCompletion({ (image, error) -> Void in
                 if let errorOccured = error {
-                    self.cameraManager.showErrorBlock(erTitle: "Error occurred", erMessage: errorOccured.localizedDescription)
+                    self.cameraManager.showErrorBlock("Error occurred", errorOccured.localizedDescription)
                 }
                 else {
-                    let vc: ImageViewController? = self.storyboard?.instantiateViewControllerWithIdentifier("ImageVC") as? ImageViewController
+                    let vc: ImageViewController? = self.storyboard?.instantiateViewController(withIdentifier: "ImageVC") as? ImageViewController
                     if let validVC: ImageViewController = vc {
                         if let capturedImage = image {
                             validVC.image = capturedImage
@@ -110,51 +110,51 @@ class ViewController: UIViewController {
                     }
                 }
             })
-        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 {
                 cameraManager.startRecordingVideo()
             } else {
                 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) {
         
-        cameraManager.cameraOutputMode = cameraManager.cameraOutputMode == CameraOutputMode.VideoWithMic ? CameraOutputMode.StillImage : CameraOutputMode.VideoWithMic
+        cameraManager.cameraOutputMode = cameraManager.cameraOutputMode == CameraOutputMode.videoWithMic ? CameraOutputMode.stillImage : CameraOutputMode.videoWithMic
         switch (cameraManager.cameraOutputMode) {
-        case .StillImage:
+        case .stillImage:
-            cameraButton.selected = false
+            cameraButton.isSelected = false
-            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) {
         
-        cameraManager.cameraDevice = cameraManager.cameraDevice == CameraDevice.Front ? CameraDevice.Back : CameraDevice.Front
+        cameraManager.cameraDevice = cameraManager.cameraDevice == CameraDevice.front ? CameraDevice.back : CameraDevice.front
         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) {
         
         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 {
@@ -163,15 +163,15 @@ class ViewController: UIViewController {
         })
     }
     
-    @IBAction func changeCameraQuality(sender: UIButton) {
+    @IBAction func changeCameraQuality(_ sender: UIButton) {
         
         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())
         }
     }
 }