Преглед изворни кода

feat: 移除 directional 概念,默认就是 自然方向

陈文艺 пре 2 месеци
родитељ
комит
89a54dd7b8

+ 0 - 26
Sources/Constraint.swift

@@ -129,32 +129,6 @@ public final class Constraint {
                         default:
                             fatalError()
                         }
-                    } else if self.from.attributes == .directionalEdges && self.to.attributes == .directionalMargins {
-                      switch layoutFromAttribute {
-                      case .leading:
-                        layoutToAttribute = .leadingMargin
-                      case .trailing:
-                        layoutToAttribute = .trailingMargin
-                      case .top:
-                        layoutToAttribute = .topMargin
-                      case .bottom:
-                        layoutToAttribute = .bottomMargin
-                      default:
-                        fatalError()
-                      }
-                    } else if self.from.attributes == .directionalMargins && self.to.attributes == .directionalEdges {
-                      switch layoutFromAttribute {
-                      case .leadingMargin:
-                        layoutToAttribute = .leading
-                      case .trailingMargin:
-                        layoutToAttribute = .trailing
-                      case .topMargin:
-                        layoutToAttribute = .top
-                      case .bottomMargin:
-                        layoutToAttribute = .bottom
-                      default:
-                        fatalError()
-                      }
                     } else if self.from.attributes == self.to.attributes {
                         layoutToAttribute = layoutFromAttribute
                     } else {

+ 2 - 8
Sources/ConstraintAttributes.swift

@@ -99,19 +99,13 @@ internal struct ConstraintAttributes : OptionSet, ExpressibleByIntegerLiteral {
     // aggregates
     
     internal static let edges: ConstraintAttributes = [.horizontalEdges, .verticalEdges]
-    internal static let horizontalEdges: ConstraintAttributes = [.left, .right]
+    internal static let horizontalEdges: ConstraintAttributes = [.leading, .trailing]
     internal static let verticalEdges: ConstraintAttributes = [.top, .bottom]
-    internal static let directionalEdges: ConstraintAttributes = [.directionalHorizontalEdges, .directionalVerticalEdges]
-    internal static let directionalHorizontalEdges: ConstraintAttributes = [.leading, .trailing]
-    internal static let directionalVerticalEdges: ConstraintAttributes = [.top, .bottom]
     internal static let size: ConstraintAttributes = [.width, .height]
     internal static let center: ConstraintAttributes = [.centerX, .centerY]
 
     @available(iOS 8.0, *)
-    internal static let margins: ConstraintAttributes = [.leftMargin, .topMargin, .rightMargin, .bottomMargin]
-
-    @available(iOS 8.0, *)
-    internal static let directionalMargins: ConstraintAttributes = [.leadingMargin, .topMargin, .trailingMargin, .bottomMargin]
+    internal static let margins: ConstraintAttributes = [.leadingMargin, .topMargin, .trailingMargin, .bottomMargin]
 
     @available(iOS 8.0, *)
     internal static let centerWithinMargins: ConstraintAttributes = [.centerXWithinMargins, .centerYWithinMargins]

+ 0 - 17
Sources/ConstraintDSL.swift

@@ -98,10 +98,6 @@ extension ConstraintBasicAttributesDSL {
     public var edges: ConstraintItem {
         return ConstraintItem(target: self.target, attributes: ConstraintAttributes.edges)
     }
-    
-    public var directionalEdges: ConstraintItem {
-      return ConstraintItem(target: self.target, attributes: ConstraintAttributes.directionalEdges)
-    }
 
     public var horizontalEdges: ConstraintItem {
         return ConstraintItem(target: self.target, attributes: ConstraintAttributes.horizontalEdges)
@@ -111,14 +107,6 @@ extension ConstraintBasicAttributesDSL {
         return ConstraintItem(target: self.target, attributes: ConstraintAttributes.verticalEdges)
     }
 
-    public var directionalHorizontalEdges: ConstraintItem {
-        return ConstraintItem(target: self.target, attributes: ConstraintAttributes.directionalHorizontalEdges)
-    }
-
-    public var directionalVerticalEdges: ConstraintItem {
-        return ConstraintItem(target: self.target, attributes: ConstraintAttributes.directionalVerticalEdges)
-    }
-
     public var size: ConstraintItem {
         return ConstraintItem(target: self.target, attributes: ConstraintAttributes.size)
     }
@@ -195,11 +183,6 @@ extension ConstraintAttributesDSL {
     public var margins: ConstraintItem {
         return ConstraintItem(target: self.target, attributes: ConstraintAttributes.margins)
     }
-    
-    @available(iOS 8.0, *)
-    public var directionalMargins: ConstraintItem {
-      return ConstraintItem(target: self.target, attributes: ConstraintAttributes.directionalMargins)
-    }
 
     @available(iOS 8.0, *)
     public var centerWithinMargins: ConstraintItem {

+ 0 - 14
Sources/ConstraintMaker.swift

@@ -132,15 +132,6 @@ public class ConstraintMaker {
     public var verticalEdges: ConstraintMakerExtendable {
         return self.makeExtendableWithAttributes(.verticalEdges)
     }
-    public var directionalEdges: ConstraintMakerExtendable {
-        return self.makeExtendableWithAttributes(.directionalEdges)
-    }
-    public var directionalHorizontalEdges: ConstraintMakerExtendable {
-        return self.makeExtendableWithAttributes(.directionalHorizontalEdges)
-    }
-    public var directionalVerticalEdges: ConstraintMakerExtendable {
-        return self.makeExtendableWithAttributes(.directionalVerticalEdges)
-    }
     public var size: ConstraintMakerExtendable {
         return self.makeExtendableWithAttributes(.size)
     }
@@ -152,11 +143,6 @@ public class ConstraintMaker {
     public var margins: ConstraintMakerExtendable {
         return self.makeExtendableWithAttributes(.margins)
     }
-    
-    @available(iOS 8.0, *)
-    public var directionalMargins: ConstraintMakerExtendable {
-        return self.makeExtendableWithAttributes(.directionalMargins)
-    }
 
     @available(iOS 8.0, *)
     public var centerWithinMargins: ConstraintMakerExtendable {

+ 0 - 18
Sources/ConstraintMakerExtendable.swift

@@ -157,18 +157,6 @@ public class ConstraintMakerExtendable: ConstraintMakerRelatable {
         self.description.attributes += .verticalEdges
         return self
     }
-    public var directionalEdges: ConstraintMakerExtendable {
-        self.description.attributes += .directionalEdges
-        return self
-    }
-    public var directionalHorizontalEdges: ConstraintMakerExtendable {
-        self.description.attributes += .directionalHorizontalEdges
-        return self
-    }
-    public var directionalVerticalEdges: ConstraintMakerExtendable {
-        self.description.attributes += .directionalVerticalEdges
-        return self
-    }
     public var size: ConstraintMakerExtendable {
         self.description.attributes += .size
         return self
@@ -179,12 +167,6 @@ public class ConstraintMakerExtendable: ConstraintMakerRelatable {
         self.description.attributes += .margins
         return self
     }
-    
-    @available(iOS 8.0, *)
-    public var directionalMargins: ConstraintMakerExtendable {
-      self.description.attributes += .directionalMargins
-      return self
-    }
 
     @available(iOS 8.0, *)
     public var centerWithinMargins: ConstraintMakerExtendable {

+ 1 - 3
Sources/ConstraintMakerRelatable.swift

@@ -45,9 +45,7 @@ public class ConstraintMakerRelatable {
                   other.attributes.layoutAttributes.count <= 1 ||
                   other.attributes.layoutAttributes == self.description.attributes.layoutAttributes ||
                   other.attributes == .edges && self.description.attributes == .margins ||
-                  other.attributes == .margins && self.description.attributes == .edges ||
-                  other.attributes == .directionalEdges && self.description.attributes == .directionalMargins ||
-                  other.attributes == .directionalMargins && self.description.attributes == .directionalEdges else {
+                  other.attributes == .margins && self.description.attributes == .edges else {
                 fatalError("Cannot constraint to multiple non identical attributes. (\(file), \(line))");
             }