Merge pull request #1 from hyperoslo/master

Getting up to date

Author: Garett Breen

Localization/nl.lproj/Localizable.strings

@@ -0,0 +1,7 @@
+"SCAN_BARCODE_TITLE" = "Scan barcode";
+"BUTTON_CLOSE" = "Sluit";
+"BUTTON_SETTINGS" = "Instellingen";
+"INFO_DESCRIPTION_TEXT" = "Plaats de barcode in het venster om te scannen. Zoeken start automatisch.";
+"INFO_LOADING_TITLE" = "Product aan het zoeken...";
+"NO_PRODUCT_ERROR_TITLE" = "Geen product gevonden.";
+"ASK_FOR_PERMISSION_TEXT" = "Om een barcode te kunnen scannen hebben we toegang nodig tot de camera.";

Localization/pt-BR.lproj/Localizable.strings

@@ -0,0 +1,7 @@
+"SCAN_BARCODE_TITLE" = "Escaneie o código de barras";
+"BUTTON_CLOSE" = "Fechar";
+"BUTTON_SETTINGS" = "Configurações";
+"INFO_DESCRIPTION_TEXT" = "Posicione o código de barras dentro da janela. A busca iniciará automaticamente.";
+"INFO_LOADING_TITLE" = "Procurando pelo seu produto...";
+"NO_PRODUCT_ERROR_TITLE" = "Nenhum produto encontrado.";
+"ASK_FOR_PERMISSION_TEXT" = "Para escanear os códigos de barras você deve permitir acesso a câmera nas configurações.";

Localization/ru.lproj/Localizable.strings

@@ -0,0 +1,7 @@
+"SCAN_BARCODE_TITLE" = "Сканер штрих-кода";
+"BUTTON_CLOSE" = "Закрыть";
+"BUTTON_SETTINGS" = "Настройки";
+"INFO_DESCRIPTION_TEXT" = "Расположите штрих-код в окне для сканирования. Поиск начнется автоматически.";
+"INFO_LOADING_TITLE" = "Ищем продукт...";
+"NO_PRODUCT_ERROR_TITLE" = "Продукт не найден";
+"ASK_FOR_PERMISSION_TEXT" = "Чтобы воспользоваться сканером, необходимо разрешить доступ к камере в настройках телефона";

README.md

@@ -185,6 +185,8 @@ let viewController = BarcodeScannerViewController()
 viewController.cameraViewController.barCodeFocusViewType = .animated
 // Show camera position button
 viewController.cameraViewController.showsCameraButton = true
+// Set the initial camera position
+viewController.cameraViewController.initialCameraPosition = .front // Default is .back
 // Set settings button text
 let title = NSAttributedString(
   string: "Settings",

Sources/Controllers/BarcodeScannerViewController.swift

@@ -33,6 +33,7 @@ public protocol BarcodeScannerDismissalDelegate: class {
  */
 open class BarcodeScannerViewController: UIViewController {
   private static let footerHeight: CGFloat = 75
+  public var hideFooterView = false
 
   // MARK: - Public properties
 
@@ -47,6 +48,10 @@ open class BarcodeScannerViewController: UIViewController {
   /// and waits for the next reset action.
   public var isOneTimeSearch = true
 
+    /// When the flag is set to `true` the screen is flashed on barcode scan.
+      /// Defaults to true.
+  public var shouldSimulateFlash = true
+    
   /// `AVCaptureMetadataOutput` metadata object types.
   public var metadata = AVMetadataObject.ObjectType.barcodeScannerMetadata {
     didSet {
@@ -197,6 +202,13 @@ open class BarcodeScannerViewController: UIViewController {
    - Parameter processing: Flag to set the current state to `.processing`.
    */
   private func animateFlash(whenProcessing: Bool = false) {
+    guard shouldSimulateFlash else {
+        if whenProcessing {
+            self.status = Status(state: .processing)
+        }
+        return
+    }
+
     let flashView = UIView(frame: view.bounds)
     flashView.backgroundColor = UIColor.white
     flashView.alpha = 1
@@ -235,7 +247,7 @@ private extension BarcodeScannerViewController {
       cameraView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
       cameraView.bottomAnchor.constraint(
         equalTo: view.bottomAnchor,
-        constant: -BarcodeScannerViewController.footerHeight
+        constant: hideFooterView ? 0 : -BarcodeScannerViewController.footerHeight
       )
     )
 
@@ -272,7 +284,7 @@ private extension BarcodeScannerViewController {
       messageView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
       messageView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
       messageView.heightAnchor.constraint(
-        equalToConstant: BarcodeScannerViewController.footerHeight
+        equalToConstant: hideFooterView ? 0 : -BarcodeScannerViewController.footerHeight
       )
     ]
   }

Sources/Controllers/CameraViewController.swift

@@ -19,6 +19,7 @@ public final class CameraViewController: UIViewController {
 
   /// Focus view type.
   public var barCodeFocusViewType: FocusViewType = .animated
+  public var initialCameraPosition: AVCaptureDevice.Position = .back
   public var showsCameraButton: Bool = false {
     didSet {
       cameraButton.isHidden = showsCameraButton
@@ -213,7 +214,7 @@ public final class CameraViewController: UIViewController {
       }
 
       if error == nil {
-        strongSelf.setupSessionInput(for: .back)
+        strongSelf.setupSessionInput(for: strongSelf.initialCameraPosition)
         strongSelf.setupSessionOutput()
         strongSelf.delegate?.cameraViewControllerDidSetupCaptureSession(strongSelf)
       } else {