From 2c56fccbe704e5c05beca81fd21e97cd768344a5 Mon Sep 17 00:00:00 2001 From: Orkhan Alikhanov Date: Sun, 30 May 2021 00:18:33 +0400 Subject: [PATCH] Remove LayoutRelationer --- Sources/LayoutSwift/Layout+Anchors.swift | 60 +++++++++++----------- Sources/LayoutSwift/Layout+Margin.swift | 60 +++++++++++----------- Sources/LayoutSwift/Layout+Parent.swift | 60 +++++++++++----------- Sources/LayoutSwift/Layout+Readable.swift | 60 +++++++++++----------- Sources/LayoutSwift/Layout+Safe.swift | 60 +++++++++++----------- Sources/LayoutSwift/Layout+Size.swift | 12 ++--- Sources/LayoutSwift/Layout.swift | 8 +-- Sources/LayoutSwift/LayoutRelationer.swift | 41 --------------- 8 files changed, 160 insertions(+), 201 deletions(-) delete mode 100644 Sources/LayoutSwift/LayoutRelationer.swift diff --git a/Sources/LayoutSwift/Layout+Anchors.swift b/Sources/LayoutSwift/Layout+Anchors.swift index 30f524b..10cb54d 100644 --- a/Sources/LayoutSwift/Layout+Anchors.swift +++ b/Sources/LayoutSwift/Layout+Anchors.swift @@ -12,96 +12,96 @@ public extension Layout { Constraints top of the view to the given anchor. - Parameter _ anchor: A LayoutAnchorable. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func top(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - constraint(.top, to: anchor, relationer: relationer, constant: offset) + func top(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + constraint(.top, to: anchor, relation: relation, constant: offset) } /** Constraints left of the view to the given anchor. - Parameter _ anchor: A LayoutAnchorable. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func left(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - constraint(.left, to: anchor, relationer: relationer, constant: offset) + func left(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + constraint(.left, to: anchor, relation: relation, constant: offset) } /** Constraints right of the view to the given anchor. - Parameter _ anchor: A LayoutAnchorable. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func right(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - constraint(.right, to: anchor, relationer: relationer, constant: -offset) + func right(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + constraint(.right, to: anchor, relation: relation, constant: -offset) } /** Constraints leading of the view to the given anchor. - Parameter _ anchor: A LayoutAnchorable. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func leading(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - constraint(.leading, to: anchor, relationer: relationer, constant: offset) + func leading(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + constraint(.leading, to: anchor, relation: relation, constant: offset) } /** Constraints trailing of the view to the given anchor. - Parameter _ anchor: A LayoutAnchorable. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func trailing(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - constraint(.trailing, to: anchor, relationer: relationer, constant: -offset) + func trailing(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + constraint(.trailing, to: anchor, relation: relation, constant: -offset) } /** Constraints bottom of the view to the given anchor. - Parameter _ anchor: A LayoutAnchorable. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func bottom(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - constraint(.bottom, to: anchor, relationer: relationer, constant: -offset) + func bottom(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + constraint(.bottom, to: anchor, relation: relation, constant: -offset) } /** Constraints horizontal center of the view to the given anchor. - Parameter _ anchor: A LayoutAnchorable. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func centerX(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - constraint(.centerX, to: anchor, relationer: relationer, constant: offset) + func centerX(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + constraint(.centerX, to: anchor, relation: relation, constant: offset) } /** Constraints vertical center of the view to the given anchor. - Parameter _ anchor: A LayoutAnchorable. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func centerY(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - constraint(.centerY, to: anchor, relationer: relationer, constant: offset) + func centerY(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + constraint(.centerY, to: anchor, relation: relation, constant: offset) } } @@ -274,23 +274,23 @@ public extension Layout { Constraints width of the view to the given anchor. - Parameter _ anchor: A LayoutAnchorable. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func width(_ anchor: LayoutAnchorable, offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - constraint(.width, to: anchor, relationer: relationer, constant: offset) + func width(_ anchor: LayoutAnchorable, offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + constraint(.width, to: anchor, relation: relation, constant: offset) } /** Constraints height of the view to the given anchor. - Parameter _ anchor: A LayoutAnchorable. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func height(_ anchor: LayoutAnchorable, offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - constraint(.height, to: anchor, relationer: relationer, constant: offset) + func height(_ anchor: LayoutAnchorable, offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + constraint(.height, to: anchor, relation: relation, constant: offset) } } diff --git a/Sources/LayoutSwift/Layout+Margin.swift b/Sources/LayoutSwift/Layout+Margin.swift index d51de23..8fae2dd 100644 --- a/Sources/LayoutSwift/Layout+Margin.swift +++ b/Sources/LayoutSwift/Layout+Margin.swift @@ -11,89 +11,89 @@ public extension Layout { /** Constraints top of the view to the parent's marginAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func topMargin(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - top(ensuredParent.marginAnchor, offset, relationer) + func topMargin(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + top(ensuredParent.marginAnchor, offset, relation) } /** Constraints left of the view to the parent's marginAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func leftMargin(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - left(ensuredParent.marginAnchor, offset, relationer) + func leftMargin(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + left(ensuredParent.marginAnchor, offset, relation) } /** Constraints right of the view to the parent's marginAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func rightMargin(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - right(ensuredParent.marginAnchor, offset, relationer) + func rightMargin(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + right(ensuredParent.marginAnchor, offset, relation) } /** Constraints leading of the view to the parent's marginAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func leadingMargin(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - leading(ensuredParent.marginAnchor, offset, relationer) + func leadingMargin(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + leading(ensuredParent.marginAnchor, offset, relation) } /** Constraints trailing of the view to the parent's marginAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func trailingMargin(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - trailing(ensuredParent.marginAnchor, offset, relationer) + func trailingMargin(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + trailing(ensuredParent.marginAnchor, offset, relation) } /** Constraints bottom of the view to the parent's marginAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func bottomMargin(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - bottom(ensuredParent.marginAnchor, offset, relationer) + func bottomMargin(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + bottom(ensuredParent.marginAnchor, offset, relation) } /** Constraints horizontal center of the view to the parent's marginAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func centerXMargin(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - centerX(ensuredParent.marginAnchor, offset, relationer) + func centerXMargin(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + centerX(ensuredParent.marginAnchor, offset, relation) } /** Constraints vertical center of the view to the parent's marginAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func centerYMargin(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - centerY(ensuredParent.marginAnchor, offset, relationer) + func centerYMargin(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + centerY(ensuredParent.marginAnchor, offset, relation) } } @@ -252,22 +252,22 @@ public extension Layout { /** Constraints width of the view to the parent's marginAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func widthMargin(offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - width(ensuredParent.marginAnchor, offset: offset, relationer) + func widthMargin(offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + width(ensuredParent.marginAnchor, offset: offset, relation) } /** Constraints height of the view to the parent's marginAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func heightMargin(offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - height(ensuredParent.marginAnchor, offset: offset, relationer) + func heightMargin(offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + height(ensuredParent.marginAnchor, offset: offset, relation) } } diff --git a/Sources/LayoutSwift/Layout+Parent.swift b/Sources/LayoutSwift/Layout+Parent.swift index 744529b..b79ebc2 100644 --- a/Sources/LayoutSwift/Layout+Parent.swift +++ b/Sources/LayoutSwift/Layout+Parent.swift @@ -11,89 +11,89 @@ public extension Layout { /** Constraints top of the view to the parent's anchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func top(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - top(ensuredParent, offset, relationer) + func top(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + top(ensuredParent, offset, relation) } /** Constraints left of the view to the parent's anchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func left(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - left(ensuredParent, offset, relationer) + func left(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + left(ensuredParent, offset, relation) } /** Constraints right of the view to the parent's anchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func right(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - right(ensuredParent, offset, relationer) + func right(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + right(ensuredParent, offset, relation) } /** Constraints leading of the view to the parent's anchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func leading(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - leading(ensuredParent, offset, relationer) + func leading(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + leading(ensuredParent, offset, relation) } /** Constraints trailing of the view to the parent's anchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func trailing(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - trailing(ensuredParent, offset, relationer) + func trailing(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + trailing(ensuredParent, offset, relation) } /** Constraints bottom of the view to the parent's anchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func bottom(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - bottom(ensuredParent, offset, relationer) + func bottom(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + bottom(ensuredParent, offset, relation) } /** Constraints horizontal center of the view to the parent's anchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func centerX(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - centerX(ensuredParent, offset, relationer) + func centerX(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + centerX(ensuredParent, offset, relation) } /** Constraints vertical center of the view to the parent's anchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func centerY(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - centerY(ensuredParent, offset, relationer) + func centerY(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + centerY(ensuredParent, offset, relation) } } @@ -252,22 +252,22 @@ public extension Layout { /** Constraints width of the view to the parent's anchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func width(offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - width(ensuredParent, offset: offset, relationer) + func width(offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + width(ensuredParent, offset: offset, relation) } /** Constraints height of the view to the parent's anchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func height(offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - height(ensuredParent, offset: offset, relationer) + func height(offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + height(ensuredParent, offset: offset, relation) } } diff --git a/Sources/LayoutSwift/Layout+Readable.swift b/Sources/LayoutSwift/Layout+Readable.swift index 0577bf2..f8b1332 100644 --- a/Sources/LayoutSwift/Layout+Readable.swift +++ b/Sources/LayoutSwift/Layout+Readable.swift @@ -11,89 +11,89 @@ public extension Layout { /** Constraints top of the view to the parent's readableAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func topReadable(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - top(ensuredParent.readableAnchor, offset, relationer) + func topReadable(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + top(ensuredParent.readableAnchor, offset, relation) } /** Constraints left of the view to the parent's readableAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func leftReadable(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - left(ensuredParent.readableAnchor, offset, relationer) + func leftReadable(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + left(ensuredParent.readableAnchor, offset, relation) } /** Constraints right of the view to the parent's readableAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func rightReadable(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - right(ensuredParent.readableAnchor, offset, relationer) + func rightReadable(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + right(ensuredParent.readableAnchor, offset, relation) } /** Constraints leading of the view to the parent's readableAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func leadingReadable(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - leading(ensuredParent.readableAnchor, offset, relationer) + func leadingReadable(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + leading(ensuredParent.readableAnchor, offset, relation) } /** Constraints trailing of the view to the parent's readableAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func trailingReadable(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - trailing(ensuredParent.readableAnchor, offset, relationer) + func trailingReadable(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + trailing(ensuredParent.readableAnchor, offset, relation) } /** Constraints bottom of the view to the parent's readableAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func bottomReadable(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - bottom(ensuredParent.readableAnchor, offset, relationer) + func bottomReadable(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + bottom(ensuredParent.readableAnchor, offset, relation) } /** Constraints horizontal center of the view to the parent's readableAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func centerXReadable(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - centerX(ensuredParent.readableAnchor, offset, relationer) + func centerXReadable(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + centerX(ensuredParent.readableAnchor, offset, relation) } /** Constraints vertical center of the view to the parent's readableAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func centerYReadable(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - centerY(ensuredParent.readableAnchor, offset, relationer) + func centerYReadable(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + centerY(ensuredParent.readableAnchor, offset, relation) } } @@ -252,22 +252,22 @@ public extension Layout { /** Constraints width of the view to the parent's readableAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func widthReadable(offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - width(ensuredParent.readableAnchor, offset: offset, relationer) + func widthReadable(offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + width(ensuredParent.readableAnchor, offset: offset, relation) } /** Constraints height of the view to the parent's readableAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func heightReadable(offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - height(ensuredParent.readableAnchor, offset: offset, relationer) + func heightReadable(offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + height(ensuredParent.readableAnchor, offset: offset, relation) } } diff --git a/Sources/LayoutSwift/Layout+Safe.swift b/Sources/LayoutSwift/Layout+Safe.swift index 7d11482..f34277b 100644 --- a/Sources/LayoutSwift/Layout+Safe.swift +++ b/Sources/LayoutSwift/Layout+Safe.swift @@ -11,89 +11,89 @@ public extension Layout { /** Constraints top of the view to the parent's safeAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func topSafe(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - top(ensuredParent.safeAnchor, offset, relationer) + func topSafe(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + top(ensuredParent.safeAnchor, offset, relation) } /** Constraints left of the view to the parent's safeAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func leftSafe(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - left(ensuredParent.safeAnchor, offset, relationer) + func leftSafe(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + left(ensuredParent.safeAnchor, offset, relation) } /** Constraints right of the view to the parent's safeAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func rightSafe(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - right(ensuredParent.safeAnchor, offset, relationer) + func rightSafe(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + right(ensuredParent.safeAnchor, offset, relation) } /** Constraints leading of the view to the parent's safeAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func leadingSafe(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - leading(ensuredParent.safeAnchor, offset, relationer) + func leadingSafe(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + leading(ensuredParent.safeAnchor, offset, relation) } /** Constraints trailing of the view to the parent's safeAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func trailingSafe(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - trailing(ensuredParent.safeAnchor, offset, relationer) + func trailingSafe(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + trailing(ensuredParent.safeAnchor, offset, relation) } /** Constraints bottom of the view to the parent's safeAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func bottomSafe(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - bottom(ensuredParent.safeAnchor, offset, relationer) + func bottomSafe(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + bottom(ensuredParent.safeAnchor, offset, relation) } /** Constraints horizontal center of the view to the parent's safeAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func centerXSafe(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - centerX(ensuredParent.safeAnchor, offset, relationer) + func centerXSafe(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + centerX(ensuredParent.safeAnchor, offset, relation) } /** Constraints vertical center of the view to the parent's safeAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func centerYSafe(_ offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - centerY(ensuredParent.safeAnchor, offset, relationer) + func centerYSafe(_ offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + centerY(ensuredParent.safeAnchor, offset, relation) } } @@ -252,22 +252,22 @@ public extension Layout { /** Constraints width of the view to the parent's safeAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func widthSafe(offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - width(ensuredParent.safeAnchor, offset: offset, relationer) + func widthSafe(offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + width(ensuredParent.safeAnchor, offset: offset, relation) } /** Constraints height of the view to the parent's safeAnchor. - Parameter _ offset: A CGFloat offset. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func heightSafe(offset: CGFloat = 0, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - height(ensuredParent.safeAnchor, offset: offset, relationer) + func heightSafe(offset: CGFloat = 0, _ relation: LayoutRelation = .equal) -> Layout { + height(ensuredParent.safeAnchor, offset: offset, relation) } } diff --git a/Sources/LayoutSwift/Layout+Size.swift b/Sources/LayoutSwift/Layout+Size.swift index 5a9a129..2fab756 100644 --- a/Sources/LayoutSwift/Layout+Size.swift +++ b/Sources/LayoutSwift/Layout+Size.swift @@ -11,23 +11,23 @@ public extension Layout { /** Constraints width of the view to a constant value. - Parameter _ width: A CGFloat value. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func width(_ width: CGFloat, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - constraint([.width], to: LayoutAnchor(constraintable: nil, attributes: [.notAnAttribute]), relationer: relationer, constants: [width]) + func width(_ width: CGFloat, _ relation: LayoutRelation = .equal) -> Layout { + constraint([.width], to: LayoutAnchor(constraintable: nil, attributes: [.notAnAttribute]), relation: relation, constants: [width]) } /** Constraints height of the view to a constant value. - Parameter _ height: A CGFloat value. - - Parameter _ relationer: A LayoutRelationer. + - Parameter _ relation: A LayoutRelation. - Returns: A Layout instance to allow chaining. */ @discardableResult - func height(_ height: CGFloat, _ relationer: LayoutRelationer = LayoutRelationers.equal) -> Layout { - constraint([.height], to: LayoutAnchor(constraintable: nil, attributes: [.notAnAttribute]), relationer: relationer, constants: [height]) + func height(_ height: CGFloat, _ relation: LayoutRelation = .equal) -> Layout { + constraint([.height], to: LayoutAnchor(constraintable: nil, attributes: [.notAnAttribute]), relation: relation, constants: [height]) } /** diff --git a/Sources/LayoutSwift/Layout.swift b/Sources/LayoutSwift/Layout.swift index 1c12804..509eb4e 100644 --- a/Sources/LayoutSwift/Layout.swift +++ b/Sources/LayoutSwift/Layout.swift @@ -155,8 +155,8 @@ internal extension Layout { - Parameter constant: A CGFloat. - Returns: A Layout instance to allow chaining. */ - func constraint(_ attribute: LayoutAttribute, to anchor: LayoutAnchorable, relationer: LayoutRelationer = LayoutRelationers.equal, constant: CGFloat) -> Layout { - constraint([attribute], to: anchor, relationer: relationer, constants: [constant]) + func constraint(_ attribute: LayoutAttribute, to anchor: LayoutAnchorable, relation: LayoutRelation = .equal, constant: CGFloat) -> Layout { + constraint([attribute], to: anchor, relation: relation, constants: [constant]) } /** @@ -168,7 +168,7 @@ internal extension Layout { - Parameter constants: An array of CGFloat. - Returns: A Layout instance to allow chaining. */ - func constraint(_ attributes: [LayoutAttribute], to anchor: LayoutAnchorable, relationer: LayoutRelationer = LayoutRelationers.equal, constants: [CGFloat]) -> Layout { + func constraint(_ attributes: [LayoutAttribute], to anchor: LayoutAnchorable, relation: LayoutRelation = .equal, constants: [CGFloat]) -> Layout { let from = LayoutAnchor(constraintable: constraintable, attributes: attributes) var to = anchor as? LayoutAnchor if to?.attributes.isEmpty ?? true { @@ -176,7 +176,7 @@ internal extension Layout { to = LayoutAnchor(constraintable: v, attributes: attributes) } - let constraint = LayoutConstraint(fromAnchor: from, toAnchor: to!, relation: relationer(.nil, .nil), constants: constants) + let constraint = LayoutConstraint(fromAnchor: from, toAnchor: to!, relation: relation, constants: constants) let constraints = (view?.constraints ?? []) + (view?.superview?.constraints ?? []) let newConstraints = constraint.constraints diff --git a/Sources/LayoutSwift/LayoutRelationer.swift b/Sources/LayoutSwift/LayoutRelationer.swift deleted file mode 100644 index ef7546e..0000000 --- a/Sources/LayoutSwift/LayoutRelationer.swift +++ /dev/null @@ -1,41 +0,0 @@ -// -// LayoutRelationer.swift -// Oxuyan -// -// Created by Orkhan Alikhanov on 5/28/21. -// - -import UIKit - -/// A closure typealias for relation operators. -public typealias LayoutRelationer = (LayoutRelationers, LayoutRelationers) -> LayoutRelation - -/// A dummy struct used in creating relation operators (==, >=, <=). -public struct LayoutRelationers { - /// Passed as an unused argument to the LayoutRelationer closures. - static let `nil` = LayoutRelationers() - - /** - A method used as a default parameter for LayoutRelationer closures. - Swift does not allow using == operator directly, so we had to create this. - */ - public static func equal(left: LayoutRelationers, right: LayoutRelationers) -> LayoutRelation { - .equal - } -} - -/// A method returning `LayoutRelation.equal` -public func ==(left: LayoutRelationers, right: LayoutRelationers) -> LayoutRelation { - .equal -} - -/// A method returning `LayoutRelation.greaterThanOrEqual` -public func >=(left: LayoutRelationers, right: LayoutRelationers) -> LayoutRelation { - .greaterThanOrEqual -} - -/// A method returning `LayoutRelation.lessThanOrEqual` -public func <=(left: LayoutRelationers, right: LayoutRelationers) -> LayoutRelation { - .lessThanOrEqual -} -