Code review modifications

Author: antoinelamy

Sources/AutoSizeCalculable.swift

@@ -5,8 +5,6 @@ import AppKit
 #endif
 
 public protocol AutoSizeCalculable {
-    var autoSizingRect: CGRect? { get set }
-    var autoSizingRectWithMargins: CGRect? { get set }
-
+    func setAutoSizingRect(_ rect: CGRect, margins: PEdgeInsets)
     func autoSizeThatFits(_ size: CGSize, layoutClosure: () -> Void) -> CGSize
 }

Sources/Extensions/UIView+PinLayout.swift

@@ -61,11 +61,6 @@ extension UIView: Layoutable, SizeCalculable {
     public func setRect(_ rect: CGRect, keepTransform: Bool) {
         let adjustedRect = Coordinates<View>.adjustRectToDisplayScale(rect)
 
-        guard !Pin.autoSizingInProgress else {
-            autoSizingRect = adjustedRect
-            return
-        }
-
         if keepTransform {
             /*
              To adjust the view's position and size, we don't set the UIView's frame directly, because we want to keep the
@@ -108,7 +103,7 @@ extension UIView: AutoSizeCalculable {
         static var pinlayoutAutoSizingRectWithMargins = UnsafeMutablePointer<Int8>.allocate(capacity: 1)
     }
 
-    public var autoSizingRect: CGRect? {
+    private var autoSizingRect: CGRect? {
         get {
             return objc_getAssociatedObject(self, &pinlayoutAssociatedKeys.pinlayoutAutoSizingRect) as? CGRect
         }
@@ -117,7 +112,7 @@ extension UIView: AutoSizeCalculable {
         }
     }
 
-    public var autoSizingRectWithMargins: CGRect? {
+    private var autoSizingRectWithMargins: CGRect? {
         get {
             return objc_getAssociatedObject(self, &pinlayoutAssociatedKeys.pinlayoutAutoSizingRectWithMargins) as? CGRect
         }
@@ -126,6 +121,11 @@ extension UIView: AutoSizeCalculable {
         }
     }
 
+    public func setAutoSizingRect(_ rect: CGRect, margins: PEdgeInsets) {
+        self.autoSizingRect = Coordinates<View>.adjustRectToDisplayScale(rect)
+        self.autoSizingRectWithMargins = Coordinates<View>.adjustRectToDisplayScale(rect.inset(by: margins))
+    }
+
     public func autoSizeThatFits(_ size: CGSize, layoutClosure: () -> Void) -> CGSize {
         Pin.autoSizingInProgress = true
         autoSizingRect = CGRect(origin: CGPoint.zero, size: size)

Sources/Impl/PinLayout+Layouting.swift

@@ -134,10 +134,9 @@ extension PinLayout {
             newRect.size.height = view.getRect(keepTransform: keepTransform).height
         }
 
-        if Pin.autoSizingInProgress, var autoSizeCalculable = view as? AutoSizeCalculable {
+        if Pin.autoSizingInProgress, let autoSizeCalculable = view as? AutoSizeCalculable {
             let marginInsets = UIEdgeInsets(top: -_marginTop, left: -_marginLeft, bottom: -_marginBottom, right: -_marginRight)
-            let rectWithMargins = newRect.inset(by: marginInsets)
-            autoSizeCalculable.autoSizingRectWithMargins = rectWithMargins
+            autoSizeCalculable.setAutoSizingRect(newRect, margins: marginInsets)
         }
 
         /*