Merge pull request #14 from OutSystems/development

Push `development` into `main`

Author: OS-ricardomoreirasilva

.github/workflows/github_actions.yml

@@ -15,7 +15,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Setup Java 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: '17'
@@ -30,7 +30,7 @@ jobs:
     - name: Lint
       run: bundle exec fastlane lint
     - name: Setup sonarqube
-      uses: warchant/setup-sonar-scanner@v7
+      uses: warchant/setup-sonar-scanner@v8
     - name: Send to Sonarcloud
       run: bundle exec fastlane sonarqube
       env: 

docs/CHANGELOG.md CHANGELOG.mddocs/CHANGELOG.md renamed to CHANGELOG.md

@@ -4,8 +4,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-### [1.0.0]
+## [Unreleased]
 
+### Chores
+- Update `github_actions.yml` file steps versions (https://outsystemsrd.atlassian.net/browse/RMET-2568).
+
+### Features
+- Add zooming out feature (https://outsystemsrd.atlassian.net/browse/RMET-2986).
+- Add zooming in feature (https://outsystemsrd.atlassian.net/browse/RMET-2986).
+
+## [1.0.0]
+
+### Features
 - Implement iPad user interface (https://outsystemsrd.atlassian.net/browse/RMET-2911).
 - Implement iPhone user interface (https://outsystemsrd.atlassian.net/browse/RMET-2771).
 - Add Scan Orientation Selection feature (https://outsystemsrd.atlassian.net/browse/RMET-2753).

OSBarcodeLib.xcodeproj/project.pbxproj

@@ -0,0 +1,24 @@
+/// Protocol that is used to signal a modification on a camera property or setting.
+protocol OSBARCCameraChange {
+    associatedtype ValueType
+    
+    /// Property to apply the change to. If `nil` it indicates a change to the camera itself.
+    var property: OSBARCCameraProperty? { get }
+    /// The new value to apply.
+    var value: ValueType { get set }
+}
+
+struct OSBARCCameraZoomFactorChange: OSBARCCameraChange {
+    var property: OSBARCCameraProperty? { .zoomFactor }
+    var value: Float
+}
+
+struct OSBARCCameraTorchChange: OSBARCCameraChange {
+    var property: OSBARCCameraProperty? { .torch }
+    var value: Bool
+}
+
+struct OSBARCCameraRotationChange: OSBARCCameraChange {
+    var property: OSBARCCameraProperty? { nil }
+    var value: (height: Int, width: Int)
+}

OSBarcodeLib/Scanner/CameraManager/OSBARCCameraChange.swift

@@ -0,0 +1,38 @@
+import QuartzCore
+
+/// Protocol that contains all the methods required for camera management.
+protocol OSBARCCameraManager {
+    /// The layer to display video on
+    var videoPreview: CALayer? { get }
+    
+    /// Setup camera
+    /// - Parameter type: The type of camera to setup. `Nil` value offers the possibility to setup a default camera provided by the implementations.
+    func setup(type: OSBARCCameraType?) throws
+    
+    /// Apply changes to the camera.
+    /// - Parameter change: The change to apply to the camera. It can be made to a property or to the camera itself.
+    func apply(change: any OSBARCCameraChange) throws
+    
+    /// Initialises the camera display.
+    func start()
+    
+    /// Terminates the camera display.
+    func stop()
+    
+    /// Verifies if the camera passed by parameter is available for selection.
+    /// - Parameter cameraType: The camera to be checked.
+    /// - Returns: Indicates if the camera is available.
+    func isAvailable(_ cameraType: OSBARCCameraType) throws -> Bool
+    
+    /// Retrieves the value associated with the passed property.
+    /// - Parameter property: The property to fetch the value from (e.g. torch, zoom factors, ...).
+    /// - Returns: The value associated with the passed property.
+    func getValue<T>(forProperty property: OSBARCCameraProperty) throws -> T?
+}
+
+/// Accelerators.
+extension OSBARCCameraManager {
+    func setup() throws {
+        try self.setup(type: nil)
+    }
+}

OSBarcodeLib/Scanner/CameraManager/OSBARCCameraManager.swift

@@ -0,0 +1,16 @@
+/// Errors related to the `OSBARCCameraManager`
+enum OSBARCCameraManagerError: Error {
+    case cameraNotConfigured(_: OSBARCCameraType)
+}
+
+/// Indicates the camera properties that can be retrieved and changed.
+enum OSBARCCameraProperty {
+    case zoomFactor
+    case torch
+}
+
+/// Indicates the two types of cameras that can be used based on the selected zoom factor.
+enum OSBARCCameraType {
+    case regular
+    case zoomOut
+}

OSBarcodeLib/Scanner/CameraManager/OSBARCCameraManagerEnums.swift

@@ -0,0 +1,11 @@
+import AVFoundation
+
+extension OSBARCCameraType {
+    /// Fetches the `AVCaptureDevice.DeviceType` equivalent values.
+    var deviceType: AVCaptureDevice.DeviceType {
+        switch self {
+        case .regular: return .builtInWideAngleCamera
+        case .zoomOut: return .builtInUltraWideCamera
+        }
+    }
+}

OSBarcodeLib/Scanner/CameraManager/OSBARCCameraType+DeviceType.swift

@@ -3,14 +3,14 @@ import Combine
 import SwiftUI
 import Vision
 
-/// Manages the sample buffers received from the video data output to return the desired information.
-final class OSBARCScannerViewControllerCoordinator: NSObject, AVCaptureVideoDataOutputSampleBufferDelegate {
+/// Class responsible for decoding the scanning output (in this case, barcodes).
+final class OSBARCCaptureOutputDecoder: NSObject, AVCaptureVideoDataOutputSampleBufferDelegate {
     /// The object containing the value to return.
     @Binding private var scanResult: String
     /// Indicates if scanning should be done only  after a button click or automatically.
     private let scanThroughButton: Bool
     /// Indicates if scanning is enabled (when there's a Scan Button).
-    @Binding private var scanButtonEnabled: Bool
+    private var scanButtonEnabled: Bool
 
     /// The publisher's cancellable instance collector.
     private var cancellables: Set<AnyCancellable> = []
@@ -29,10 +29,10 @@ final class OSBARCScannerViewControllerCoordinator: NSObject, AVCaptureVideoData
     ///   - scanResult: Binding object with the value to return.
     ///   - scanThroughButton: Boolean indicating if scanning should be performed automatically or after clicking the Scan Button.
     ///   - scanButtonEnabled: Indicates if scanning has already been set on.
-    init(_ scanResult: Binding<String>, _ scanThroughButton: Bool, _ scanButtonEnabled: Binding<Bool>) {
+    init(_ scanResult: Binding<String>, _ scanThroughButton: Bool, _ scanButtonEnabled: Bool = false) {
         self._scanResult = scanResult
         self.scanThroughButton = scanThroughButton
-        self._scanButtonEnabled = scanButtonEnabled
+        self.scanButtonEnabled = scanButtonEnabled
         super.init()
 
         NotificationCenter.default
@@ -44,6 +44,16 @@ final class OSBARCScannerViewControllerCoordinator: NSObject, AVCaptureVideoData
                 }
             }
             .store(in: &cancellables)
+        
+        NotificationCenter.default
+            .publisher(for: .scanButtonSelection)
+            .receive(on: RunLoop.main)  // receive this on the main thread
+            .sink { // performed this when `scanButtonSelection` gets triggered.
+                if let enabled = $0.object as? Bool {
+                    self.scanButtonEnabled = enabled
+                }
+            }
+            .store(in: &cancellables)
     }
 
     func captureOutput(_ output: AVCaptureOutput, didOutput sampleBuffer: CMSampleBuffer, from connection: AVCaptureConnection) {
@@ -75,8 +85,8 @@ final class OSBARCScannerViewControllerCoordinator: NSObject, AVCaptureVideoData
     }()
 }
 
-// MARK: - Private coordinator methods
-private extension OSBARCScannerViewControllerCoordinator {
+// MARK: - Private methods
+private extension OSBARCCaptureOutputDecoder {
     /// Processes the Vision request to return the desired barcode value.
     /// - Parameter request: Vision request handler that performs image analysis.
     func processClassification(for request: VNRequest) {