minor code changes for better readability

Sources/WeScan/Common/QuadrilateralView.swift

@@ -80,21 +80,13 @@ final class QuadrilateralView: UIView {
         }
     }
 
-    private lazy var topLeftCornerView: EditScanCornerView = {
-        return EditScanCornerView(frame: CGRect(origin: .zero, size: cornerViewSize), position: .topLeft)
-    }()
+    private lazy var topLeftCornerView = EditScanCornerView(frame: CGRect(origin: .zero, size: cornerViewSize), position: .topLeft)
 
-    private lazy var topRightCornerView: EditScanCornerView = {
-        return EditScanCornerView(frame: CGRect(origin: .zero, size: cornerViewSize), position: .topRight)
-    }()
+    private lazy var topRightCornerView = EditScanCornerView(frame: CGRect(origin: .zero, size: cornerViewSize), position: .topRight)
 
-    private lazy var bottomRightCornerView: EditScanCornerView = {
-        return EditScanCornerView(frame: CGRect(origin: .zero, size: cornerViewSize), position: .bottomRight)
-    }()
+    private lazy var bottomRightCornerView = EditScanCornerView(frame: CGRect(origin: .zero, size: cornerViewSize), position: .bottomRight)
 
-    private lazy var bottomLeftCornerView: EditScanCornerView = {
-        return EditScanCornerView(frame: CGRect(origin: .zero, size: cornerViewSize), position: .bottomLeft)
-    }()
+    private lazy var bottomLeftCornerView = EditScanCornerView(frame: CGRect(origin: .zero, size: cornerViewSize), position: .bottomLeft)
 
     private let highlightedCornerViewSize = CGSize(width: 75.0, height: 75.0)
     private let cornerViewSize = CGSize(width: 20.0, height: 20.0)

Sources/WeScan/Common/VisionRectangleDetector.swift

@@ -21,33 +21,29 @@ enum VisionRectangleDetector {
         completion: @escaping ((Quadrilateral?) -> Void)
     ) {
         // Create the rectangle request, and, if found, return the biggest rectangle (else return nothing).
-        let rectangleDetectionRequest: VNDetectRectanglesRequest = {
-            let rectDetectRequest = VNDetectRectanglesRequest(completionHandler: { request, error in
-                guard error == nil, let results = request.results as? [VNRectangleObservation], !results.isEmpty else {
-                    completion(nil)
-                    return
-                }
+        let rectangleDetectionRequest = VNDetectRectanglesRequest(completionHandler: { request, error in
+            guard error == nil, let results = request.results as? [VNRectangleObservation], !results.isEmpty else {
+                completion(nil)
+                return
+            }
+
+            let quads: [Quadrilateral] = results.map(Quadrilateral.init)
+
+            // This can't fail because the earlier guard protected against an empty array, but we use guard because of SwiftLint
+            guard let biggest = quads.biggest() else {
+                completion(nil)
+                return
+            }
+
+            let transform = CGAffineTransform.identity
+                .scaledBy(x: width, y: height)
+
+            completion(biggest.applying(transform))
+        })
 
-                let quads: [Quadrilateral] = results.map(Quadrilateral.init)
-
-                // This can't fail because the earlier guard protected against an empty array, but we use guard because of SwiftLint
-                guard let biggest = quads.biggest() else {
-                    completion(nil)
-                    return
-                }
-
-                let transform = CGAffineTransform.identity
-                    .scaledBy(x: width, y: height)
-
-                completion(biggest.applying(transform))
-            })
-
-            rectDetectRequest.minimumConfidence = 0.8
-            rectDetectRequest.maximumObservations = 15
-            rectDetectRequest.minimumAspectRatio = 0.3
-
-            return rectDetectRequest
-        }()
+        rectangleDetectionRequest.minimumConfidence = 0.8
+        rectangleDetectionRequest.maximumObservations = 15
+        rectangleDetectionRequest.minimumAspectRatio = 0.3
 
         // Send the requests to the request handler.
         do {

Sources/WeScan/Extensions/AVCaptureVideoOrientation+Utils.swift

@@ -17,19 +17,19 @@ extension AVCaptureVideoOrientation {
     init?(deviceOrientation: UIDeviceOrientation) {
         switch deviceOrientation {
         case .portrait:
-            self.init(rawValue: AVCaptureVideoOrientation.portrait.rawValue)
+            self = .portrait
         case .portraitUpsideDown:
-            self.init(rawValue: AVCaptureVideoOrientation.portraitUpsideDown.rawValue)
+            self = .portraitUpsideDown
         case .landscapeLeft:
-            self.init(rawValue: AVCaptureVideoOrientation.landscapeLeft.rawValue)
+            self = .landscapeLeft
         case .landscapeRight:
-            self.init(rawValue: AVCaptureVideoOrientation.landscapeRight.rawValue)
+            self = .landscapeRight
         case .faceUp:
-            self.init(rawValue: AVCaptureVideoOrientation.portrait.rawValue)
+            self = .portrait
         case .faceDown:
-            self.init(rawValue: AVCaptureVideoOrientation.portraitUpsideDown.rawValue)
+            self = .portraitUpsideDown
         default:
-            self.init(rawValue: AVCaptureVideoOrientation.portrait.rawValue)
+            self = .portrait
         }
     }