From fb81adb8693b86accb6eeaba8185b77b39276110 Mon Sep 17 00:00:00 2001 From: Natalia Terlecka Date: Tue, 17 Nov 2015 09:18:11 +0000 Subject: [PATCH] v2.0.2 --- CameraManager.podspec | 4 ++-- camera/ViewController.swift | 28 ++++++++++++---------------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/CameraManager.podspec b/CameraManager.podspec index a441af4..3acaa51 100644 --- a/CameraManager.podspec +++ b/CameraManager.podspec @@ -1,11 +1,11 @@ Pod::Spec.new do |s| s.name = "CameraManager" - s.version = "2.0.1" + s.version = "2.0.2" 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.homepage = "https://github.com/imaginary-cloud/CameraManager" s.license = 'MIT' s.author = { "nelanelanela" => "nterlecka@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 => "2.0.2" } s.social_media_url = 'http://www.imaginarycloud.com/' s.platform = :ios, '8.0' s.requires_arc = true diff --git a/camera/ViewController.swift b/camera/ViewController.swift index 6677781..a12006c 100644 --- a/camera/ViewController.swift +++ b/camera/ViewController.swift @@ -50,16 +50,14 @@ class ViewController: UIViewController { } - override func viewWillAppear(animated: Bool) - { + override func viewWillAppear(animated: Bool) { super.viewWillAppear(animated) self.navigationController?.navigationBar.hidden = true self.cameraManager.resumeCaptureSession() } - override func viewWillDisappear(animated: Bool) - { + override func viewWillDisappear(animated: Bool) { super.viewWillDisappear(animated) self.cameraManager.stopCaptureSession() } @@ -91,8 +89,6 @@ class ViewController: UIViewController { @IBAction func changeFlashMode(sender: UIButton) { - - switch (self.cameraManager.changeFlashMode()) { case .Off: sender.setTitle("Flash Off", forState: UIControlState.Normal) @@ -103,8 +99,8 @@ class ViewController: UIViewController { } } - @IBAction func recordButtonTapped(sender: UIButton) - { + @IBAction func recordButtonTapped(sender: UIButton) { + switch (self.cameraManager.cameraOutputMode) { case .StillImage: self.cameraManager.capturePictureWithCompletition({ (image, error) -> Void in @@ -132,8 +128,8 @@ class ViewController: UIViewController { } } - @IBAction func outputModeButtonTapped(sender: UIButton) - { + @IBAction func outputModeButtonTapped(sender: UIButton) { + self.cameraManager.cameraOutputMode = self.cameraManager.cameraOutputMode == CameraOutputMode.VideoWithMic ? CameraOutputMode.StillImage : CameraOutputMode.VideoWithMic switch (self.cameraManager.cameraOutputMode) { case .StillImage: @@ -145,8 +141,8 @@ class ViewController: UIViewController { } } - @IBAction func changeCameraDevice(sender: UIButton) - { + @IBAction func changeCameraDevice(sender: UIButton) { + self.cameraManager.cameraDevice = self.cameraManager.cameraDevice == CameraDevice.Front ? CameraDevice.Back : CameraDevice.Front switch (self.cameraManager.cameraDevice) { case .Front: @@ -156,8 +152,8 @@ class ViewController: UIViewController { } } - @IBAction func askForCameraPermissions(sender: UIButton) - { + @IBAction func askForCameraPermissions(sender: UIButton) { + self.cameraManager.askUserForCameraPermissions({ permissionGranted in self.askForPermissionsButton.hidden = true self.askForPermissionsLabel.hidden = true @@ -169,8 +165,8 @@ class ViewController: UIViewController { }) } - @IBAction func changeCameraQuality(sender: UIButton) - { + @IBAction func changeCameraQuality(sender: UIButton) { + switch (self.cameraManager.changeQualityMode()) { case .High: sender.setTitle("High", forState: UIControlState.Normal)