Update access controls

.swiftlint.yml

@@ -10,6 +10,7 @@ excluded:
   - Build
   - .build
   - Tests
+  - AdyenCardScannerTests
   - Internal
   - Docs
   - Demo

AdyenCardScanner/Sources/CaptureSessionManager.swift

@@ -8,11 +8,11 @@ import AVFoundation
 import CoreImage
 import Foundation
 
-protocol CaptureSessionDelegate: AnyObject {
+internal protocol CaptureSessionDelegate: AnyObject {
     func didCapture(image: CIImage?)
 }
 
-protocol CaptureSessionManaging {
+internal protocol CaptureSessionManaging {
     var delegate: CaptureSessionDelegate? { get set }
     func configureSession()
     func startCaptureSession()
@@ -21,9 +21,9 @@ protocol CaptureSessionManaging {
     var videoPreviewLayer: AVCaptureVideoPreviewLayer { get }
 }
 
-class CaptureSessionManager: NSObject, CaptureSessionManaging {
+internal class CaptureSessionManager: NSObject, CaptureSessionManaging {
 
-    enum Constants {
+    private enum Constants {
         static let videoSettings: [String: Any] = [
             kCVPixelBufferPixelFormatTypeKey as String: kCVPixelFormatType_32BGRA
         ]
@@ -37,8 +37,8 @@ class CaptureSessionManager: NSObject, CaptureSessionManaging {
     private let videoOutputQueue = DispatchQueue(label: "com.cardscanner.videoOutputQueue")
 
     private let captureDevice: AVCaptureDevice
-    let videoPreviewLayer: AVCaptureVideoPreviewLayer
-    weak var delegate: CaptureSessionDelegate?
+    internal let videoPreviewLayer: AVCaptureVideoPreviewLayer
+    internal weak var delegate: CaptureSessionDelegate?
 
     private let captureSession: AVCaptureSession = {
         let session = AVCaptureSession()
@@ -48,7 +48,7 @@ class CaptureSessionManager: NSObject, CaptureSessionManaging {
 
     // MARK: - Initializers
 
-    init(captureDevice: AVCaptureDevice) {
+    internal init(captureDevice: AVCaptureDevice) {
         self.captureDevice = captureDevice
 
         self.videoPreviewLayer = AVCaptureVideoPreviewLayer(session: captureSession)
@@ -57,27 +57,27 @@ class CaptureSessionManager: NSObject, CaptureSessionManaging {
 
     // MARK: - CaptureSessionManaging
 
-    func configureSession() {
+    internal func configureSession() {
         sessionQueue.async {
             try? self.configureCaptureSession()
         }
     }
 
-    func startCaptureSession() {
+    internal func startCaptureSession() {
         sessionQueue.async {
             guard !self.captureSession.isRunning else { return }
             self.captureSession.startRunning()
         }
     }
 
-    func stopCaptureSession() {
+    internal func stopCaptureSession() {
         sessionQueue.async {
             guard self.captureSession.isRunning else { return }
             self.captureSession.stopRunning()
         }
     }
 
-    func updateVideoOrientation() {
+    internal func updateVideoOrientation() {
         guard
             let connection = videoPreviewLayer.connection,
             connection.isVideoOrientationSupported else {

AdyenCardScanner/Sources/CardImageParser.swift

@@ -8,14 +8,14 @@ import CoreImage.CIFilterBuiltins
 import Foundation
 import Vision
 
-protocol CardImageParsing {
+internal protocol CardImageParsing {
     func parse(
         image: CIImage,
         completion: @escaping (CreditCard) -> Void
     )
 }
 
-class CardImageParser: CardImageParsing {
+internal class CardImageParser: CardImageParsing {
 
     private enum Constants {
         static let expirationDateRegex = "\\d{2}\\/\\d{2,4}"
@@ -33,13 +33,13 @@ class CardImageParser: CardImageParsing {
 
     // MARK: - Initializers
 
-    init(expirationDateFormatter: ExpirationDateFormatting) {
+    internal init(expirationDateFormatter: ExpirationDateFormatting) {
         self.expirationDateFormatter = expirationDateFormatter
     }
 
     // MARK: - CardImageParsing
 
-    func parse(
+    internal func parse(
         image: CIImage,
         completion: @escaping (CreditCard) -> Void
     ) {

AdyenCardScanner/Sources/CardScanner.swift

@@ -7,7 +7,7 @@
 import Foundation
 import UIKit
 
-protocol CardScanning {
+public protocol CardScanning {
     static func createCardScanner(
         completion: @escaping (Result<CreditCard, CardScannerError>) -> Void
     ) -> UIViewController?

AdyenCardScanner/Sources/CardScannerAssembler.swift

@@ -8,19 +8,19 @@ import AVFoundation
 import Foundation
 import UIKit
 
-protocol CardScannerAssembling {
+internal protocol CardScannerAssembling {
     func resolveCardScannerViewController(
         completion: @escaping (Result<CreditCard, CardScannerError>) -> Void
     ) -> UIViewController?
 }
 
-class CardScannerAssembler: CardScannerAssembling {
+internal class CardScannerAssembler: CardScannerAssembling {
 
     // MARK: - Initializers
 
-    let captureDevice: AVCaptureDevice?
+    internal let captureDevice: AVCaptureDevice?
 
-    init() {
+    internal init() {
         self.captureDevice = AVCaptureDevice.default(
             .builtInWideAngleCamera,
             for: .video,
@@ -30,7 +30,7 @@ class CardScannerAssembler: CardScannerAssembling {
 
     // MARK: - CardScannerAssemblerProtocol
 
-    func resolveCardScannerViewController(
+    internal func resolveCardScannerViewController(
         completion: @escaping (Result<CreditCard, CardScannerError>) -> Void
     ) -> UIViewController? {
         guard let captureDevice else {

AdyenCardScanner/Sources/CardScannerOverlayView.swift

@@ -6,13 +6,13 @@
 
 import UIKit
 
-class CardScannerOverlayView: UIView {
+internal class CardScannerOverlayView: UIView {
 
-    enum Style {
+    private enum Style {
         static let backgroundColor = UIColor.black.withAlphaComponent(0.4)
     }
 
-    enum Constants {
+    private enum Constants {
         static let roiAspectRatio: CGFloat = 1.585 // Credit card aspect ratio
     }
 
@@ -32,22 +32,22 @@ class CardScannerOverlayView: UIView {
 
     // MARK: - Properties
 
-    @Published private(set) var roiFrame: CGRect = .zero
+    @Published internal private(set) var roiFrame: CGRect = .zero
 
     // MARK: - Initializers
 
-    override init(frame: CGRect) {
+    override internal init(frame: CGRect) {
         super.init(frame: frame)
         setupMaskViews()
         setupMasksLayout()
     }
 
     @available(*, unavailable)
-    required init?(coder: NSCoder) {
+    internal required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
-    override func layoutSubviews() {
+    override internal func layoutSubviews() {
         super.layoutSubviews()
         updateRoiLayout()
         self.roiFrame = roiView.frame

AdyenCardScanner/Sources/CardScannerViewController.swift

@@ -8,7 +8,7 @@ import AVFoundation
 import Combine
 import UIKit
 
-class CardScannerViewController: UIViewController {
+internal class CardScannerViewController: UIViewController {
 
     // MARK: - UI elements
 
@@ -27,20 +27,20 @@ class CardScannerViewController: UIViewController {
 
     // MARK: - Initializers
 
-    init(viewModel: CardScannerViewModelProtocol) {
+    internal init(viewModel: CardScannerViewModelProtocol) {
         self.viewModel = viewModel
         self.previewLayer = viewModel.videoPreviewLayer
         super.init(nibName: nil, bundle: nil)
     }
 
     @available(*, unavailable)
-    required init?(coder: NSCoder) {
+    internal required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
     // MARK: - View lifecycle
 
-    override func viewDidLoad() {
+    override internal func viewDidLoad() {
         super.viewDidLoad()
         setupPreviewLayer()
         addOverlayView()
@@ -49,17 +49,17 @@ class CardScannerViewController: UIViewController {
         viewModel.configureSession()
     }
 
-    override func viewWillAppear(_ animated: Bool) {
+    override internal func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         viewModel.startCaptureSession()
     }
 
-    override func viewWillDisappear(_ animated: Bool) {
+    override internal func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         viewModel.stopCaptureSession()
     }
 
-    override func viewDidLayoutSubviews() {
+    override internal func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
         previewLayer.frame = view.bounds
         viewModel.updateVideoOrientation()

AdyenCardScanner/Sources/CardScannerViewModel.swift

@@ -8,7 +8,7 @@ import CoreImage
 import Foundation
 import QuartzCore
 
-protocol CardScannerViewModelProtocol {
+internal protocol CardScannerViewModelProtocol {
     var videoPreviewLayer: CALayer { get }
     func configureSession()
     func startCaptureSession()
@@ -17,7 +17,7 @@ protocol CardScannerViewModelProtocol {
     func update(previewLayerFrame: CGRect, roiInPreviewLayer: CGRect)
 }
 
-class CardScannerViewModel: CardScannerViewModelProtocol {
+internal class CardScannerViewModel: CardScannerViewModelProtocol {
 
     // MARK: - Properties
 
@@ -30,7 +30,7 @@ class CardScannerViewModel: CardScannerViewModelProtocol {
 
     // MARK: - Initializers
 
-    init(
+    internal init(
         cardImageParser: CardImageParsing,
         captureSessionManager: CaptureSessionManaging,
         completion: @escaping (Result<CreditCard, CardScannerError>) -> Void
@@ -43,34 +43,34 @@ class CardScannerViewModel: CardScannerViewModelProtocol {
 
     // MARK: - CardScannerViewModelProtocol
 
-    var videoPreviewLayer: CALayer {
+    internal var videoPreviewLayer: CALayer {
         captureSessionManager.videoPreviewLayer
     }
 
-    func configureSession() {
+    internal func configureSession() {
         captureSessionManager.configureSession()
     }
 
-    func startCaptureSession() {
+    internal func startCaptureSession() {
         captureSessionManager.startCaptureSession()
     }
 
-    func stopCaptureSession() {
+    internal func stopCaptureSession() {
         captureSessionManager.stopCaptureSession()
     }
 
-    func updateVideoOrientation() {
+    internal func updateVideoOrientation() {
         captureSessionManager.updateVideoOrientation()
     }
 
-    func update(previewLayerFrame: CGRect, roiInPreviewLayer: CGRect) {
+    internal func update(previewLayerFrame: CGRect, roiInPreviewLayer: CGRect) {
         self.previewFrame = previewLayerFrame
         self.roiInPreviewFrame = roiInPreviewLayer
     }
 
     // MARK: - Private
 
-    private func getCardData(
+    private func fetchCardData(
         from image: CIImage,
         roiInPreviewFrame: CGRect,
         previewFrame: CGRect
@@ -81,8 +81,8 @@ class CardScannerViewModel: CardScannerViewModelProtocol {
             previewFrame: previewFrame
         )
 
-        cardImageParser.parse(image: croppedImage) { creditCard in
-            self.completion(.success(creditCard))
+        cardImageParser.parse(image: croppedImage) { [weak self] creditCard in
+            self?.completion(.success(creditCard))
         }
     }
 
@@ -135,12 +135,12 @@ class CardScannerViewModel: CardScannerViewModelProtocol {
 
 extension CardScannerViewModel: CaptureSessionDelegate {
 
-    func didCapture(image: CIImage?) {
+    internal func didCapture(image: CIImage?) {
         guard let image else { return }
 
         DispatchQueue.global(qos: .userInitiated).async { [weak self] in
             guard let self else { return }
-            getCardData(
+            fetchCardData(
                 from: image,
                 roiInPreviewFrame: roiInPreviewFrame,
                 previewFrame: previewFrame

AdyenCardScanner/Sources/Formatters/ExpirationDateFormatter.swift

@@ -6,13 +6,13 @@
 
 import Foundation
 
-protocol ExpirationDateFormatting {
+internal protocol ExpirationDateFormatting {
     func date(from string: String) -> Date?
 }
 
-class ExpirationDateFormatter: ExpirationDateFormatting {
+internal class ExpirationDateFormatter: ExpirationDateFormatting {
 
-    enum ExpirationDateFormat {
+    private enum ExpirationDateFormat {
         static let short = "MM/yy"
         static let long = "MM/yyyy"
     }
@@ -24,7 +24,7 @@ class ExpirationDateFormatter: ExpirationDateFormatting {
 
     // MARK: - Initializers
 
-    init() {
+    internal init() {
         let locale = Locale.current
         let timeZone = TimeZone(secondsFromGMT: 0)
 
@@ -39,7 +39,7 @@ class ExpirationDateFormatter: ExpirationDateFormatting {
 
     // MARK: - ExpireDateFormatting
 
-    func date(from string: String) -> Date? {
+    internal func date(from string: String) -> Date? {
         // First, try the short ("MM/YY") format
         if let shortDate = shortDateFormatter.date(from: string) {
             return shortDate