Revert "Added animation on path update and corner only path for QR-code frame"

Author: ivanvorobei

Sources/SPQRCode/Interface/SPQRCameraController+AVCaptureMetadataOutputObjectsDelegate.swift

@@ -35,6 +35,13 @@ extension SPQRCameraController: AVCaptureMetadataOutputObjectsDelegate {
         guard let transformedObject = previewLayer.transformedMetadataObject(for: object) as? AVMetadataMachineReadableCodeObject else { return }
 
         let points = transformedObject.corners
+        guard let firstPoint = points.first else { return }
+        let path = UIBezierPath()
+        path.move(to: firstPoint)
+        var newPoints = points
+        newPoints.removeFirst()
+        newPoints.append(firstPoint)
+        newPoints.forEach { path.addLine(to: $0) }
 
         // Update Detail
 
@@ -84,7 +91,7 @@ extension SPQRCameraController: AVCaptureMetadataOutputObjectsDelegate {
 
         // Update Frame
 
-        frameLayer.update(using: points)
+        frameLayer.update(with: path)
 
         // Timer
 

Sources/SPQRCode/Interface/SPQRCorner.swift

@@ -23,86 +23,31 @@
 import UIKit
 
 class SPQRFrameLayer: CAShapeLayer {
-    private let cLength: CGFloat
-    private let cRadius: CGFloat
 
     // MARK: - Init
 
-    init(
-        length: CGFloat = 16.0,
-        radius: CGFloat = 16.0,
-        lineWidth: CGFloat = 5.0,
-        lineColor: UIColor = .systemYellow
-    ) {
-        self.cLength = length
-        self.cRadius = radius
-        
+    override init() {
         super.init()
-        
-        self.strokeColor = lineColor.cgColor
-        self.fillColor = UIColor.clear.cgColor
-        
-        self.lineWidth = lineWidth
+        strokeColor = UIColor.systemYellow.cgColor
+        lineWidth = 5
+        fillColor = UIColor.clear.cgColor
     }
 
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
-    override func action(forKey event: String) -> CAAction? {
-        if event == "path" {
-            let animation: CABasicAnimation = .init(keyPath: event)
-            
-            animation.duration = 0.3
-            animation.timingFunction = CATransaction.animationTimingFunction()
-            
-            return animation
-        }
-        
-        return super.action(forKey: event)
-    }
-    
     // MARK: - Actions
 
-    func update(using points: [CGPoint]) {
-        let corners = buildCorners(for: points)
-        
-        let framePath: UIBezierPath = .init()
-        
-        for corner in corners {
-            guard let cStartPoint = corner.startPoint(using: corners),
-                  let cPreCurvePoint = corner.preCurvePoint(using: corners),
-                  let cPostCurvePoint = corner.postCurvePoint(using: corners),
-                  let cEndPoint = corner.endPoint(using: corners)
-            else { return }
-            
-            framePath.move(to: cStartPoint)
-            framePath.addLine(to: cPreCurvePoint)
-            framePath.addQuadCurve(to: cPostCurvePoint, controlPoint: corner.point)
-            framePath.addLine(to: cEndPoint)
-        }
-        
-        path = framePath.cgPath
+    func detected(with newBezierPath: UIBezierPath) {
+        path = newBezierPath.cgPath
     }
 
-    func dissapear() {
-        path = nil
+    func update(with newBezierPath: UIBezierPath) {
+        path = newBezierPath.cgPath
     }
 
-    private func buildCorners(for points: [CGPoint]) -> [SPQRCorner] {
-        var corners: [SPQRCorner] = .init()
-        
-        for corner in SPQRCorner.Kind.allCases {
-            corners.append(
-                .init(
-                    kind: corner,
-                    point: points[corner.rawValue],
-                    length: cLength,
-                    radius: cRadius
-                )
-            )
-        }
-        
-        return corners
+    func dissapear() {
+        path = nil
     }
 }