Remove 'with' protocol, some syntaxes updated

Author: kennic

Example/FrameLayoutKit.xcworkspace/xcuserdata/namkennic.xcuserdatad/UserInterfaceState.xcuserstate

@@ -17,7 +17,11 @@ class CardView: UIView {
 	let dateLabel = UILabel()
 	let messageLabel = UILabel()
 	let expandButton = UIButton(type: .contactAdd)
-	let frameLayout = StackFrameLayout(axis: .horizontal)
+	let frameLayout = HStackLayout() {
+		$0.spacing = 15.0
+		$0.padding(top: 15, left: 15, bottom: 15, right: 15)
+		$0.debug = true
+	}
 	let blueView = UIView()
 	let redView = UIView()
 	var messageFrameLayout: FrameLayout!
@@ -61,7 +65,7 @@ class CardView: UIView {
 			$0.textColor = .black
 		}
 
-		[blueView, redView, earthImageView, rocketImageView, nameLabel, titleLabel, dateLabel, messageLabel, expandButton].forEach { addSubview($0) }
+		[blueView, redView, earthImageView, rocketImageView, nameLabel, titleLabel, dateLabel, messageLabel, expandButton, frameLayout].forEach { addSubview($0) }
 
 		// Standard syntax:
 
@@ -107,12 +111,7 @@ class CardView: UIView {
 				$0.spacing = 10
 
 				($0 + [Label(.yellow), Label(.green), Label(.brown), Label(.systemPink), Label(.blue)]).forEach {
-					$0.willSizeThatFitsBlock = { (sender, size) in
-						if let label = sender.targetView as? UILabel {
-							label.text = "\(size.width) x \(size.height)"
-						}
-					}
-					$0.willLayoutSubviewsBlock = { sender in
+					$0.didLayoutSubviewsBlock = { sender in
 						if let label = sender.targetView as? UILabel {
 							let size = sender.frame.size
 							label.text = "\(size.width) x \(size.height)"
@@ -126,10 +125,7 @@ class CardView: UIView {
 			$0.spacing = 5.0
 		}
 
-		frameLayout.spacing = 15.0
-		frameLayout.padding(top: 15, left: 15, bottom: 15, right: 15)
-		frameLayout.debug = true
-		addSubview(frameLayout)
+		
 	}
 
 	func Label(_ color: UIColor) -> UILabel {

Example/FrameLayoutKit/CardView.swift

@@ -30,6 +30,7 @@ class NumberPadView: UIView {
 			button.setTitle(title, for: .normal)
 			button.backgroundColor = color(index: i)
 			button.showsTouchWhenHighlighted = true
+			button.titleLabel?.font = .systemFont(ofSize: 24, weight: .medium)
 			i += 1
 			return button
 		}

Example/FrameLayoutKit/NumberPadView.swift

@@ -13,7 +13,7 @@ class TagListView: UIView {
 	let flowLayout = FlowFrameLayout(axis: .horizontal)
 	let addButton = UIButton()
 	let removeButton = UIButton()
-	let frameLayout = StackFrameLayout(axis: .vertical)
+	let frameLayout = VStackLayout().spacing(4.0)
 	let colors: [UIColor] = [.red, .green, .blue, .brown, .yellow, .magenta, .black, .orange, .purple, .systemPink]
 
 	var onChanged: ((TagListView) -> Void)?
@@ -23,10 +23,11 @@ class TagListView: UIView {
 
 		backgroundColor = .gray
 
-		flowLayout.interItemSpacing = 4
-		flowLayout.lineSpacing = 4
-		flowLayout.padding(top: 4, left: 4, bottom: 4, right: 4)
-		flowLayout.distribution = .left
+		flowLayout
+			.interitemSpacing(4)
+			.lineSpacing(4)
+			.padding(top: 4, left: 4, bottom: 4, right: 4)
+			.distribution(.left)
 
 		addButton.setTitle("Add Item", for: .normal)
 		addButton.backgroundColor = .systemBlue
@@ -53,11 +54,10 @@ class TagListView: UIView {
 		frameLayout + flowLayout
 		frameLayout + HStackLayout {
 			$0 + [removeButton, addButton]
-			$0.distribution = .equal
-			$0.fixedSize = CGSize(width: 0, height: 50)
+			
+			$0.distribution(.equal)
+			  .fixedSize(CGSize(width: 0, height: 50))
 		}
-		
-		frameLayout.spacing = 4
 	}
 
 	required init?(coder: NSCoder) {

Example/FrameLayoutKit/TagListView.swift

@@ -35,9 +35,11 @@ class ViewController: UIViewController {
 		scrollStackView + NumberPadView()
 		scrollStackView + tagListView
 
-		scrollStackView.spacing = 20
-		scrollStackView.edgeInsets = UIEdgeInsets(top: 50, left: 50, bottom: 50, right: 50)
-		scrollStackView.distribution = .center
+		scrollStackView
+			.spacing(20)
+			.padding(top: 50, left: 50, bottom: 50, right: 50)
+			.distribution(.center)
+		
 		view.addSubview(scrollStackView)
     }
 

Example/FrameLayoutKit/ViewController.swift

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 	s.name             = 'FrameLayoutKit'
-	s.version          = '6.4.1'
+	s.version          = '6.5.0'
 	s.summary          = 'FrameLayoutKit is a super fast and easy to use layout kit'
 	s.description      = <<-DESC
 	An auto layout kit helps you to layout your UI easier, faster and more effective

FrameLayoutKit.podspec

@@ -30,4 +30,14 @@ extension DoubleFrameLayout {
 		return self
 	}
 
+	@discardableResult public func leftView(_ view: UIView?) -> Self {
+		setLeft(view)
+		return self
+	}
+	
+	@discardableResult public func rightView(_ view: UIView?) -> Self {
+		setRight(view)
+		return self
+	}
+	
 }

FrameLayoutKit/Classes/Extensions/DoubleFrameLayout+Chainable.swift

@@ -11,7 +11,11 @@ import UIKit
 /**
 Supports chaining syntax:
 
-frameLayout.flexible().align(vertical: .center, horizontal: .left).padding(top: 10, bottom: 20).minHeight(100)
+frameLayout
+ .flexible()
+ .align(vertical: .center, horizontal: .left)
+ .padding(top: 10, bottom: 20)
+ .minHeight(100)
 */
 
 extension FrameLayout {

FrameLayoutKit/Classes/Extensions/FrameLayout+Chainable.swift

@@ -165,8 +165,8 @@ extension ScrollStackView {
 		return self
 	}
 
-	@discardableResult public func fixItemSize(_ value: CGSize) -> Self {
-		fixItemSize = value
+	@discardableResult public func fixedItemSize(_ value: CGSize) -> Self {
+		fixedItemSize = value
 		return self
 	}
 

FrameLayoutKit/Classes/Extensions/ScrollStackView+Chainable.swift

@@ -50,8 +50,8 @@ extension StackFrameLayout {
 		return self
 	}
 
-	@discardableResult public func fixItemSize(_ value: CGSize) -> Self {
-		fixItemSize = value
+	@discardableResult public func fixedItemSize(_ value: CGSize) -> Self {
+		fixedItemSize = value
 		return self
 	}