refactor: code improving (#354)

* refactor: simplify updateContentOffset function * refactor: refactor some code simplify flipCropWorkbenchViewIfNeeded add transformScaleBy(xScale: CGFloat, yScale: CGFloat) to CropWorkbenchViewProtocol
guoyingtao · Nov 16, 2023 · 11a4474 · 11a4474
1 parent 5e125f0
commit 11a4474
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 31 deletions.
diff --git a/Sources/Mantis/CropView/CropBoxLockedAspectFrameUpdater.swift b/Sources/Mantis/CropView/CropBoxLockedAspectFrameUpdater.swift
@@ -129,7 +129,7 @@ struct CropBoxLockedAspectFrameUpdater {
             case .bottomRight:
                 handleBottomRightEdgeFrameUpdate()
             default:
-                print("none")
+                break
             }
         }
 

diff --git a/Sources/Mantis/CropView/CropView.swift b/Sources/Mantis/CropView/CropView.swift
@@ -185,7 +185,9 @@ final class CropView: UIView {
     }
 
     private func imageStatusChanged() -> Bool {
-        if viewModel.getTotalRadians() != 0 { return true }
+        if viewModel.getTotalRadians() != 0 {
+            return true
+        }
 
         if forceFixedRatio {
             if checkForForceFixedRatioFlag {
@@ -363,8 +365,6 @@ final class CropView: UIView {
                                                            andContentFrame: contentBounds,
                                                            aspectRatioLockEnabled: aspectRatioLockEnabled)
 
-        print("newCropBoxFrame is \(newCropBoxFrame.width) - \(newCropBoxFrame.height)")
-
         guard newCropBoxFrame.width >= cropViewMinimumBoxSize
                 && newCropBoxFrame.height >= cropViewMinimumBoxSize else {
             return
@@ -417,19 +417,13 @@ final class CropView: UIView {
 extension CropView {
     private func flipCropWorkbenchViewIfNeeded() {
         if viewModel.horizontallyFlip {
-            if viewModel.rotationType.isRotateByMultiple180 {
-                cropWorkbenchView.transform = cropWorkbenchView.transform.scaledBy(x: -1, y: 1)
-            } else {
-                cropWorkbenchView.transform = cropWorkbenchView.transform.scaledBy(x: 1, y: -1)
-            }
+            let scale: CGFloat = viewModel.rotationType.isRotatedByMultiple180 ? -1 : 1
+            cropWorkbenchView.transformScaleBy(xScale: scale, yScale: -scale)
         }
 
         if viewModel.verticallyFlip {
-            if viewModel.rotationType.isRotateByMultiple180 {
-                cropWorkbenchView.transform = cropWorkbenchView.transform.scaledBy(x: 1, y: -1)
-            } else {
-                cropWorkbenchView.transform = cropWorkbenchView.transform.scaledBy(x: -1, y: 1)
-            }
+            let scale: CGFloat = viewModel.rotationType.isRotatedByMultiple180 ? 1 : -1
+            cropWorkbenchView.transformScaleBy(xScale: scale, yScale: -scale)
         }
     }
 
@@ -624,7 +618,7 @@ extension CropView {
             let height = abs(sin(radians)) * cropAuxiliaryIndicatorView.frame.width + abs(cos(radians)) * cropAuxiliaryIndicatorView.frame.height
 
             let newSize: CGSize
-            if viewModel.rotationType.isRotateByMultiple180 {
+            if viewModel.rotationType.isRotatedByMultiple180 {
                 newSize = CGSize(width: width, height: height)
             } else {
                 newSize = CGSize(width: height, height: width)
@@ -774,13 +768,13 @@ extension CropView {
         var scaleY: CGFloat = 1
 
         if isHorizontal {
-            if viewModel.rotationType.isRotateByMultiple180 {
+            if viewModel.rotationType.isRotatedByMultiple180 {
                 scaleX = -scaleX
             } else {
                 scaleY = -scaleY
             }
         } else {
-            if viewModel.rotationType.isRotateByMultiple180 {
+            if viewModel.rotationType.isRotatedByMultiple180 {
                 scaleY = -scaleY
             } else {
                 scaleX = -scaleX
@@ -829,7 +823,7 @@ extension CropView: CropViewProtocol {
     }
 
     func getImageHorizontalToVerticalRatio() -> Double {
-        if viewModel.rotationType.isRotateByMultiple180 {
+        if viewModel.rotationType.isRotatedByMultiple180 {
             return Double(image.horizontalToVerticalRatio())
         } else {
             return Double(1 / image.horizontalToVerticalRatio())
@@ -1144,15 +1138,15 @@ extension CropView: CropViewProtocol {
         var scaleY = cropWorkbenchView.zoomScale
 
         if viewModel.horizontallyFlip {
-            if viewModel.rotationType.isRotateByMultiple180 {
+            if viewModel.rotationType.isRotatedByMultiple180 {
                 scaleX = -scaleX
             } else {
                 scaleY = -scaleY
             }
         }
 
         if viewModel.verticallyFlip {
-            if viewModel.rotationType.isRotateByMultiple180 {
+            if viewModel.rotationType.isRotatedByMultiple180 {
                 scaleY = -scaleY
             } else {
                 scaleX = -scaleX

diff --git a/Sources/Mantis/CropView/CropViewModel.swift b/Sources/Mantis/CropView/CropViewModel.swift
@@ -35,7 +35,7 @@ enum ImageRotationType: CGFloat {
         }
     }
 
-    var isRotateByMultiple180: Bool {
+    var isRotatedByMultiple180: Bool {
         return self == .none || self == .counterclockwise180
     }
 }

diff --git a/Sources/Mantis/CropView/CropWorkbenchView.swift b/Sources/Mantis/CropView/CropWorkbenchView.swift
@@ -80,15 +80,9 @@ final class CropWorkbenchView: UIScrollView {
 extension CropWorkbenchView: CropWorkbenchViewProtocol {
     func updateContentOffset() {
         contentOffset.x = max(contentOffset.x, 0)
-        contentOffset.y = max(contentOffset.y, 0)
-
-        if contentSize.height - contentOffset.y <= bounds.size.height {
-            contentOffset.y = contentSize.height - bounds.size.height
-        }
-
-        if contentSize.width - contentOffset.x <= bounds.size.width {
-            contentOffset.x = contentSize.width - bounds.size.width
-        }
+        contentOffset.y = max(contentOffset.y, 0)        
+        contentOffset.x = min(contentOffset.x, contentSize.width - bounds.size.width)
+        contentOffset.y = min(contentOffset.y, contentSize.height - bounds.size.height)
     }
 
     func updateMinZoomScale() {

diff --git a/Sources/Mantis/CropViewController/CropViewController.swift b/Sources/Mantis/CropViewController/CropViewController.swift
@@ -56,7 +56,7 @@ open class CropViewController: UIViewController {
         case .circle, .square, .heart:
             self.config.presetFixedRatioType = .alwaysUsingOnePresetFixedRatio(ratio: 1)
         default:
-            ()
+            break
         }
 
         super.init(nibName: nil, bundle: nil)

diff --git a/Sources/Mantis/Protocols/CropScrollViewProtocol.swift b/Sources/Mantis/Protocols/CropScrollViewProtocol.swift
@@ -20,4 +20,11 @@ protocol CropWorkbenchViewProtocol: UIScrollView {
     func updateLayout(byNewSize newSize: CGSize)
     func reset(by rect: CGRect)
     func resetImageContent(by cropBoxFrame: CGRect)
+    func transformScaleBy(xScale: CGFloat, yScale: CGFloat)
+}
+
+extension CropWorkbenchViewProtocol {
+    func transformScaleBy(xScale: CGFloat, yScale: CGFloat) {
+        transform = transform.scaledBy(x: xScale, y: yScale)
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,7 @@ enum ImageRotationType: CGFloat { @@
             }
         }
-        var isRotateByMultiple180: Bool {
+        var isRotatedByMultiple180: Bool {
             return self == .none || self == .counterclockwise180
         }
     }
@@ Expand Down @@