Merge pull request hyperoslo#224 from rlmartin/option-default-to-fron…

…t-camera Add option to default to the front camera instead of the back camera
YasinMultani23 · Oct 27, 2016 · 462aa8b · 462aa8b
2 parents 36db6a2 + e239eed
commit 462aa8b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/Source/CameraView/CameraMan.swift b/Source/CameraView/CameraMan.swift
@@ -17,14 +17,16 @@ class CameraMan {
   var backCamera: AVCaptureDeviceInput?
   var frontCamera: AVCaptureDeviceInput?
   var stillImageOutput: AVCaptureStillImageOutput?
+  var startOnFrontCamera: Bool = false
 
   deinit {
     stop()
   }
 
   // MARK: - Setup
 
-  func setup() {
+  func setup(_ startOnFrontCamera: Bool = false) {
+    self.startOnFrontCamera = startOnFrontCamera
     checkPermission()
   }
 
@@ -100,7 +102,7 @@ class CameraMan {
     // Devices
     setupDevices()
 
-    guard let input = backCamera, let output = stillImageOutput else { return }
+    guard let input = (self.startOnFrontCamera) ? frontCamera ?? backCamera : backCamera, let output = stillImageOutput else { return }
 
     addInput(input)
 

diff --git a/Source/CameraView/CameraView.swift b/Source/CameraView/CameraView.swift
@@ -85,6 +85,7 @@ class CameraView: UIViewController, CLLocationManagerDelegate, CameraManDelegate
   weak var delegate: CameraViewDelegate?
   var animationTimer: Timer?
   var locationManager: LocationManager?
+  var startOnFrontCamera: Bool = false
 
   override func viewDidLoad() {
     super.viewDidLoad()
@@ -105,7 +106,7 @@ class CameraView: UIViewController, CLLocationManagerDelegate, CameraManDelegate
     view.addGestureRecognizer(tapGestureRecognizer)
 
     cameraMan.delegate = self
-    cameraMan.setup()
+    cameraMan.setup(self.startOnFrontCamera)
   }
 
   override func viewDidAppear(_ animated: Bool) {

diff --git a/Source/ImagePickerController.swift b/Source/ImagePickerController.swift
@@ -46,6 +46,7 @@ open class ImagePickerController: UIViewController {
   lazy var cameraController: CameraView = { [unowned self] in
     let controller = CameraView()
     controller.delegate = self
+    controller.startOnFrontCamera = self.startOnFrontCamera
 
     return controller
     }()
@@ -70,6 +71,7 @@ open class ImagePickerController: UIViewController {
   open var stack = ImageStack()
   open var imageLimit = 0
   open var preferredImageSize: CGSize?
+  open var startOnFrontCamera = false
   var totalSize: CGSize { return UIScreen.main.bounds.size }
   var initialFrame: CGRect?
   var initialContentOffset: CGPoint?