fix: fix the crop masks become darker and darker when resetting multi…

…ple times (#331) set error parameter to _ in VNDetectHorizonRequest did some renaming works for crop masks
guoyingtao · Aug 7, 2023 · 4f996c1 · 4f996c1
1 parent 143d7a7
commit 4f996c1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 20 deletions.
diff --git a/Sources/Mantis/Helpers/ImageAutoAdjustHelper.swift b/Sources/Mantis/Helpers/ImageAutoAdjustHelper.swift
@@ -25,7 +25,7 @@ class ImageAutoAdjustHelper {
             return false
         }
 
-        let request = VNDetectHorizonRequest { [weak self] request, error in
+        let request = VNDetectHorizonRequest { [weak self] request, _ in
             guard let observations = request.results as? [VNHorizonObservation] else {
                 return
             }

diff --git a/Sources/Mantis/MaskBackground/CropDimmingView.swift b/Sources/Mantis/MaskBackground/CropDimmingView.swift
@@ -9,10 +9,8 @@
 import UIKit
 
 class CropDimmingView: UIView, CropMaskProtocol {
-    var overLayerFillColor: CGColor = UIColor.black.cgColor
-
-    var innerLayer: CALayer?
-
+    var overLayerFillColor = UIColor.black.cgColor    
+    var maskLayer: CALayer?
     var cropShapeType: CropShapeType = .rect
     var imageRatio: CGFloat = 1.0
 
@@ -22,8 +20,8 @@ class CropDimmingView: UIView, CropMaskProtocol {
     }
 
     func setMask(cropRatio: CGFloat) {
-        let layer = createOverLayer(opacity: 0.5, cropRatio: cropRatio)
-        self.layer.addSublayer(layer)
-        innerLayer = layer
+        maskLayer?.removeFromSuperlayer()
+        maskLayer = createMaskLayer(opacity: 0.5, cropRatio: cropRatio)
+        layer.addSublayer(maskLayer!)
     }
 }
diff --git a/Sources/Mantis/MaskBackground/CropMaskProtocal.swift b/Sources/Mantis/MaskBackground/CropMaskProtocal.swift
@@ -13,7 +13,7 @@ private let initialFrameLength: CGFloat = 1000
 
 protocol CropMaskProtocol: UIView {
     var cropShapeType: CropShapeType { get set }
-    var innerLayer: CALayer? { get set }
+    var maskLayer: CALayer? { get set }
     var overLayerFillColor: CGColor { get set }
 
     func initialize(cropRatio: CGFloat)
@@ -44,7 +44,7 @@ extension CropMaskProtocol {
 
         switch cropShapeType {
         case .roundedRect:
-            innerLayer?.removeFromSuperlayer()
+            maskLayer?.removeFromSuperlayer()
             setMask(cropRatio: cropRatio)
             scaleX = cropRect.width / (minOverLayerUnit * cropRatio)
         default:
@@ -62,7 +62,7 @@ extension CropMaskProtocol {
         self.frame.origin.y = cropRect.midY - self.frame.height / 2
     }
 
-    func createOverLayer(opacity: Float, cropRatio: CGFloat = 1.0) -> CAShapeLayer {
+    func createMaskLayer(opacity: Float, cropRatio: CGFloat = 1.0) -> CAShapeLayer {
         let coff: CGFloat
         switch cropShapeType {
         case .roundedRect:

diff --git a/Sources/Mantis/MaskBackground/CropVisualEffectView.swift b/Sources/Mantis/MaskBackground/CropVisualEffectView.swift
@@ -9,10 +9,8 @@
 import UIKit
 
 class CropMaskVisualEffectView: UIVisualEffectView, CropMaskProtocol {
-    var overLayerFillColor: CGColor = UIColor.black.cgColor
-
-    var innerLayer: CALayer?
-
+    var overLayerFillColor = UIColor.black.cgColor
+    var maskLayer: CALayer?
     var cropShapeType: CropShapeType = .rect
     var imageRatio: CGFloat = 1.0
 
@@ -30,13 +28,12 @@ class CropMaskVisualEffectView: UIVisualEffectView, CropMaskProtocol {
     }
 
     func setMask(cropRatio: CGFloat) {
-        let layer = createOverLayer(opacity: 0.98, cropRatio: cropRatio)
+        maskLayer?.removeFromSuperlayer()        
+        maskLayer = createMaskLayer(opacity: 0.98, cropRatio: cropRatio)
 
         let maskView = UIView(frame: self.bounds)
         maskView.clipsToBounds = true
-        maskView.layer.addSublayer(layer)
-
-        innerLayer = layer
+        maskView.layer.addSublayer(maskLayer!)
 
         self.mask = maskView
     }
@@ -55,5 +52,4 @@ class CropMaskVisualEffectView: UIVisualEffectView, CropMaskProtocol {
             return (nil, .black)
         }
     }
-
 }