Support RTL languages in HStackView + activation constrains by scope (#3

) * added support rtl languages in HStackView * formatted code * added file names to header * added activation constrains by scope * migrated to swift 5.7 * simplified snapSubview method * fixed type in constraints variable * returned set to snapSubview method
KazaiMazai · Nov 5, 2022 · 3715de1 · 3715de1
1 parent 326a934
commit 3715de1
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 102 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,12 +1,12 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.7
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "SwiftyUIKit",
     platforms: [
-       .iOS(.v9)
+       .iOS(.v11)
     ],
     products: [
         .library(

diff --git a/README.md b/README.md
@@ -142,7 +142,11 @@ or
 }
 
 ```
+
+#### Right-to-left languages
                    
+HStackView supports right-to-left languages by default.
+Use `semanticContentAttribute = .forceLeftToRight` if you want to force direction.
 
 ## Installation
 

diff --git a/Sources/SwiftyUIKit/HStackView.swift b/Sources/SwiftyUIKit/HStackView.swift
@@ -1,5 +1,5 @@
 //
-//  File.swift
+//  HStackView.swift
 //  
 //
 //  Created by Sergey Kazakov on 30.11.2020.
@@ -15,66 +15,44 @@ public extension HStackView {
     convenience init(spacing: CGFloat = 0, @OptionalViewContentBuilder optionalContent: () -> [UIView]) {
         self.init(spacing: spacing, content: optionalContent())
     }
-
 }
 
 public final class HStackView: UIView {
     public init(spacing: CGFloat = 0,
                 content: [UIView]) {
         super.init(frame: .zero)
+        var constraints = [NSLayoutConstraint]()
         translatesAutoresizingMaskIntoConstraints = false
         content
             .enumerated()
             .forEach { (index, view) in
                 let isFirst = index == 0
                 let isLast = index == content.count - 1
-                let previousView: UIView? = isFirst ? nil : content[index - 1]
+                let prevView: UIView? = isFirst ? nil : content[index - 1]
 
                 view.translatesAutoresizingMaskIntoConstraints = false
                 addSubview(view)
-
-                view.topAnchor
-                    .constraint(equalTo: topAnchor)
-                    .modify {
-                        $0.priority = .defaultHigh
-                        $0.isActive = true
-                    }
-
-                view.bottomAnchor
-                    .constraint(equalTo: bottomAnchor)
-                    .modify {
-                        $0.priority = .defaultHigh
-                        $0.isActive = true
-                    }
+
+                constraints.append(view.topAnchor.constraint(equalTo: topAnchor))
+                constraints.append(view.bottomAnchor.constraint(equalTo: bottomAnchor))
 
                 if isFirst {
-                    view.leftAnchor
-                        .constraint(equalTo: leftAnchor)
-                        .modify {
-                            $0.priority = .defaultHigh
-                            $0.isActive = true
-                        }
+                    constraints.append(view.leadingAnchor.constraint(equalTo: leadingAnchor))
                 }
 
-                if let prevView = previousView {
-                    view.leftAnchor
-                        .constraint(equalTo: prevView.rightAnchor,
-                                    constant: spacing)
-                        .modify {
-                            $0.priority = .defaultHigh
-                            $0.isActive = true
-                        }
+                if let prevView {
+                    constraints.append(view.leadingAnchor.constraint(
+                        equalTo: prevView.trailingAnchor,
+                        constant: spacing))
                 }
 
                 if isLast {
-                    view.rightAnchor
-                        .constraint(equalTo: rightAnchor)
-                        .modify {
-                            $0.priority = .defaultHigh
-                            $0.isActive = true
-                        }
+                    constraints.append(view.trailingAnchor.constraint(equalTo: trailingAnchor))
                 }
             }
+
+        constraints.forEach { $0.priority = .defaultHigh }
+        NSLayoutConstraint.activate(constraints)
     }
 
     required init?(coder: NSCoder) {

diff --git a/Sources/SwiftyUIKit/Modifiable.swift b/Sources/SwiftyUIKit/Modifiable.swift
@@ -1,5 +1,5 @@
 //
-//  File.swift
+//  Modifiable.swift
 //
 //
 //  Created by Sergey Kazakov on 01.12.2020.

diff --git a/Sources/SwiftyUIKit/SpacerView.swift b/Sources/SwiftyUIKit/SpacerView.swift
@@ -1,5 +1,5 @@
 //
-//  File.swift
+//  SpacerView.swift
 //  
 //
 //  Created by Sergey Kazakov on 30.11.2020.

diff --git a/Sources/SwiftyUIKit/UIView+Padding.swift b/Sources/SwiftyUIKit/UIView+Padding.swift
@@ -1,5 +1,5 @@
 //
-//  File.swift
+//  UIView+Padding.swift
 //  
 //
 //  Created by Sergey Kazakov on 22.09.2020.

diff --git a/Sources/SwiftyUIKit/UIView+Snap.swift b/Sources/SwiftyUIKit/UIView+Snap.swift
@@ -1,5 +1,5 @@
 //
-//  File.swift
+//  UIView+Snap.swift
 //  
 //
 //  Created by Sergey Kazakov on 30.11.2020.
@@ -15,16 +15,16 @@ public extension UIView {
 
 internal extension UIView {
     enum FlexibleEdge: Int, Equatable, CaseIterable {
-           case top
-           case left
-           case right
-           case bottom
-       }
+        case top
+        case left
+        case right
+        case bottom
+    }
 }
 
 internal extension UIView {
     func snapSubview(_ subview: UIView,
-                     flexibleEdges: [FlexibleEdge]? = nil,
+                     flexibleEdges: [FlexibleEdge] = [],
                      center: Bool = false) {
         addSubview(subview)
         subview.translatesAutoresizingMaskIntoConstraints = false
@@ -35,19 +35,9 @@ internal extension UIView {
                 subview.centerXAnchor.constraint(equalTo: centerXAnchor)
             ])
         }
-
-        guard let flexibleEdges = flexibleEdges else {
-            NSLayoutConstraint.activate([
-                subview.leftAnchor.constraint(equalTo: leftAnchor),
-                subview.rightAnchor.constraint(equalTo: rightAnchor),
-                subview.topAnchor.constraint(equalTo: topAnchor),
-                subview.bottomAnchor.constraint(equalTo: bottomAnchor)
-            ])
-            return
-        }
-
+
         let edges = Set(flexibleEdges)
-
+        
         NSLayoutConstraint.activate([
             edges.contains(.left) ?
                 subview.leftAnchor.constraint(greaterThanOrEqualTo: leftAnchor)

diff --git a/Sources/SwiftyUIKit/VStackView.swift b/Sources/SwiftyUIKit/VStackView.swift
@@ -1,5 +1,5 @@
 //
-//  File.swift
+//  VStackView.swift
 //  
 //
 //  Created by Sergey Kazakov on 30.11.2020.
@@ -21,60 +21,38 @@ public final class VStackView: UIView {
     public init(spacing: CGFloat = 0,
                 content: [UIView]) {
         super.init(frame: .zero)
-
+        var constraints = [NSLayoutConstraint]()
         translatesAutoresizingMaskIntoConstraints = false
         content
             .enumerated()
             .forEach { (index, view) in
                 let isFirst = index == 0
                 let isLast = index == content.count - 1
-                let previousView: UIView? = isFirst ? nil : content[index - 1]
+                let prevView: UIView? = isFirst ? nil : content[index - 1]
 
                 view.translatesAutoresizingMaskIntoConstraints = false
                 addSubview(view)
-
-                view.leftAnchor
-                    .constraint(equalTo: leftAnchor)
-                    .modify {
-                        $0.priority = .defaultHigh
-                        $0.isActive = true
-                    }
-
-                view.rightAnchor
-                    .constraint(equalTo: rightAnchor)
-                    .modify {
-                        $0.priority = .defaultHigh
-                        $0.isActive = true
-                    }
-
+
+                constraints.append(view.leftAnchor.constraint(equalTo: leftAnchor))
+                constraints.append(view.rightAnchor.constraint(equalTo: rightAnchor))
+
                 if isFirst {
-                    view.topAnchor
-                        .constraint(equalTo: topAnchor)
-                        .modify {
-                            $0.priority =  .defaultHigh
-                            $0.isActive = true
-                        }
+                    constraints.append(view.topAnchor.constraint(equalTo: topAnchor))
                 }
 
-                if let prevView = previousView {
-                    view.topAnchor
-                        .constraint(equalTo: prevView.bottomAnchor,
-                                    constant: spacing)
-                        .modify {
-                            $0.priority =  .defaultHigh
-                            $0.isActive = true
-                        }
+                if let prevView {
+                    constraints.append(view.topAnchor.constraint(
+                        equalTo: prevView.bottomAnchor,
+                        constant: spacing))
                 }
 
                 if isLast {
-                    view.bottomAnchor
-                        .constraint(equalTo: bottomAnchor)
-                        .modify {
-                            $0.priority =  .defaultHigh
-                            $0.isActive = true
-                        }
+                    constraints.append(view.bottomAnchor.constraint(equalTo: bottomAnchor))
                 }
             }
+
+        constraints.forEach { $0.priority = .defaultHigh }
+        NSLayoutConstraint.activate(constraints)
     }
 
     required init?(coder: NSCoder) {

diff --git a/Sources/SwiftyUIKit/ViewContentBuilder.swift b/Sources/SwiftyUIKit/ViewContentBuilder.swift
@@ -1,5 +1,5 @@
 //
-//  File.swift
+//  ViewContentBuilder.swift
 //  
 //
 //  Created by Sergey Kazakov on 30.11.2020.

diff --git a/Sources/SwiftyUIKit/ZStackView.swift b/Sources/SwiftyUIKit/ZStackView.swift
@@ -1,5 +1,5 @@
 //
-//  File.swift
+//  ZStackView.swift
 //  
 //
 //  Created by Sergey Kazakov on 30.11.2020.
@@ -43,7 +43,7 @@ public final class ZStackView: UIView {
             case .bottom:
                 snapSubview($0, flexibleEdges: [.top])
             case .all:
-                snapSubview($0, flexibleEdges: nil)
+                snapSubview($0)
             case .center:
                 snapSubview($0, flexibleEdges: FlexibleEdge.allCases, center: true)
             case .vertical: