Merge pull request #78 from shih-liang/main

New feature: scan code from album

Author: nathanfallet

Sources/CodeScanner/CodeScanner.swift

@@ -59,6 +59,7 @@ public struct CodeScannerView: UIViewControllerRepresentable {
 
     public let codeTypes: [AVMetadataObject.ObjectType]
     public let scanMode: ScanMode
+    public let manualSelect: Bool
     public let scanInterval: Double
     public let showViewfinder: Bool
     public var simulatedData = ""
@@ -71,6 +72,7 @@ public struct CodeScannerView: UIViewControllerRepresentable {
     public init(
         codeTypes: [AVMetadataObject.ObjectType],
         scanMode: ScanMode = .once,
+        manualSelect: Bool = false,
         scanInterval: Double = 2.0,
         showViewfinder: Bool = false,
         simulatedData: String = "",
@@ -82,6 +84,7 @@ public struct CodeScannerView: UIViewControllerRepresentable {
     ) {
         self.codeTypes = codeTypes
         self.scanMode = scanMode
+        self.manualSelect = manualSelect
         self.showViewfinder = showViewfinder
         self.scanInterval = scanInterval
         self.simulatedData = simulatedData
@@ -107,7 +110,8 @@ public struct CodeScannerView: UIViewControllerRepresentable {
         uiViewController.updateViewController(
             isTorchOn: isTorchOn,
             isGalleryPresented: isGalleryPresented.wrappedValue,
-            isManualCapture: scanMode == .manual
+            isManualCapture: scanMode == .manual,
+            isManualSelect: manualSelect
         )
     }
 

Sources/CodeScanner/ScannerViewController.swift

@@ -150,6 +150,17 @@ extension CodeScannerView {
             return button
         }()
 
+        private lazy var manualSelectButton: UIButton = {
+            let button = UIButton(type: .system)
+            let image = UIImage(systemName: "photo.on.rectangle")
+            let background = UIImage(systemName: "capsule.fill")?.withTintColor(.systemBackground, renderingMode: .alwaysOriginal)
+            button.setImage(image, for: .normal)
+            button.setBackgroundImage(background, for: .normal)
+            button.addTarget(self, action: #selector(openGalleryFromButton), for: .touchUpInside)
+            button.translatesAutoresizingMaskIntoConstraints = false
+            return button
+        }()
+
         override public func viewDidLoad() {
             super.viewDidLoad()
             self.addOrientationDidChangeObserver()
@@ -362,9 +373,23 @@ extension CodeScannerView {
             manualCaptureButton.isHidden = !isManualCapture
         }
 
+        func showManualSelectButton(_ isManualSelect: Bool) {
+            if manualSelectButton.superview == nil {
+                view.addSubview(manualSelectButton)
+                NSLayoutConstraint.activate([
+                    manualSelectButton.heightAnchor.constraint(equalToConstant: 50),
+                    manualSelectButton.widthAnchor.constraint(equalToConstant: 60),
+                    view.centerXAnchor.constraint(equalTo: manualSelectButton.centerXAnchor),
+                    view.safeAreaLayoutGuide.bottomAnchor.constraint(equalTo: manualSelectButton.bottomAnchor, constant: 32)
+                ])
+            }
+            
+            view.bringSubviewToFront(manualSelectButton)
+            manualSelectButton.isHidden = !isManualSelect
+        }
         #endif
 
-        func updateViewController(isTorchOn: Bool, isGalleryPresented: Bool, isManualCapture: Bool) {
+        func updateViewController(isTorchOn: Bool, isGalleryPresented: Bool, isManualCapture: Bool, isManualSelect: Bool) {
             if let backCamera = AVCaptureDevice.default(for: AVMediaType.video),
                backCamera.hasTorch
             {
@@ -379,6 +404,7 @@ extension CodeScannerView {
 
             #if !targetEnvironment(simulator)
             showManualCaptureButton(isManualCapture)
+            showManualSelectButton(isManualSelect)
             #endif
         }