Merge pull request #1 from KazaiMazai/API-improvements

API-improvements
KazaiMazai · Apr 21, 2022 · af9a22b · af9a22b
2 parents 88a0f96 + e384e26
commit af9a22b
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 90 deletions.
diff --git a/Sources/SwiftyUIKit/DisclosureView.swift b/Sources/SwiftyUIKit/DisclosureView.swift
diff --git a/Sources/SwiftyUIKit/HStackView.swift b/Sources/SwiftyUIKit/HStackView.swift
@@ -7,10 +7,15 @@
 
 import UIKit
 
-extension HStackView {
-    public convenience init(spacing: CGFloat = 0, @ViewContentBuilder content: () -> [UIView]) {
+public extension HStackView {
+    convenience init(spacing: CGFloat = 0, @ViewContentBuilder content: () -> [UIView]) {
         self.init(spacing: spacing, content: content())
     }
+
+    convenience init(spacing: CGFloat = 0, @OptionalViewContentBuilder optionalContent: () -> [UIView]) {
+        self.init(spacing: spacing, content: optionalContent())
+    }
+
 }
 
 public final class HStackView: UIView {

diff --git a/Sources/SwiftyUIKit/UIView+Padding.swift b/Sources/SwiftyUIKit/UIView+Padding.swift
@@ -27,20 +27,12 @@ public extension UIView {
                              bottomConstant: bottom)
     }
 
-    func padding(vertical: CGFloat = 0) -> UIView {
+    func padding(vertical: CGFloat = 0, horizontal: CGFloat = 0) -> UIView {
         PaddingViewDecorator(decorated: self,
                              topConstant: vertical,
-                             leftConstant: 0,
-                             rightConstant: 0,
-                             bottomConstant: vertical)
-    }
-
-    func padding(horizontal: CGFloat = 0) -> UIView {
-        PaddingViewDecorator(decorated: self,
-                             topConstant: 0,
                              leftConstant: horizontal,
                              rightConstant: horizontal,
-                             bottomConstant: 0)
+                             bottomConstant: vertical)
     }
 }
 

diff --git a/Sources/SwiftyUIKit/VStackView.swift b/Sources/SwiftyUIKit/VStackView.swift
@@ -7,10 +7,14 @@
 
 import UIKit
 
-extension VStackView {
-    public convenience init(spacing: CGFloat = 0, @ViewContentBuilder content: () -> [UIView]) {
+public extension VStackView {
+     convenience init(spacing: CGFloat = 0, @ViewContentBuilder content: () -> [UIView]) {
         self.init(spacing: spacing, content: content())
     }
+
+    convenience init(spacing: CGFloat = 0, @OptionalViewContentBuilder optionalContent: () -> [UIView]) {
+        self.init(spacing: spacing, content: optionalContent())
+    }
 }
 
 public final class VStackView: UIView {

diff --git a/Sources/SwiftyUIKit/ViewContentBuilder.swift b/Sources/SwiftyUIKit/ViewContentBuilder.swift
@@ -13,3 +13,10 @@ public struct ViewContentBuilder {
         subviews
     }
 }
+
+@resultBuilder
+public struct OptionalViewContentBuilder {
+    public static func buildBlock(_ subviews: UIView?...) -> [UIView] {
+        subviews.compactMap { $0 }
+    }
+}
diff --git a/Sources/SwiftyUIKit/ZStackView.swift b/Sources/SwiftyUIKit/ZStackView.swift
@@ -7,10 +7,14 @@
 
 import UIKit
 
-extension ZStackView {
-    public convenience init(alignment: Alignment = .all, @ViewContentBuilder content: () -> [UIView]) {
+public extension ZStackView {
+     convenience init(alignment: Alignment = .all, @ViewContentBuilder content: () -> [UIView]) {
         self.init(alignment: alignment, content: content())
     }
+
+    convenience init(alignment: Alignment = .all, @OptionalViewContentBuilder optionalContent: () -> [UIView]) {
+        self.init(alignment: alignment, content: optionalContent())
+    }
 }
 
 public final class ZStackView: UIView {