Skip to content

M
Material
Commit d8e312ae by Orkhan Alikhanov
Options

Added ability to omit anchor for views

parent 85205879
Showing with 46 additions and 39 deletions
Sources/iOS/Layout.swift
...@@ -265,179 +265,179 @@ public extension Layout { ...@@ -265,179 +265,179 @@ public extension Layout {
public extension Layout { public extension Layout {
/** /**
Constraints top of the view to the given anchor. Constraints top of the view to the given anchor.
- Parameter _ acnhor: A LayoutAnchor. - Parameter _ anchor: A LayoutAnchorable.
- Parameter _ offset: A CGFloat offset. - Parameter _ offset: A CGFloat offset.
- Returns: A Layout instance to allow chaining. - Returns: A Layout instance to allow chaining.
*/ */
@discardableResult @discardableResult
func top(_ anchor: LayoutAnchor, _ offset: CGFloat = 0) -> Layout { func top(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0) -> Layout {
return constraint(.top, to: anchor, constant: offset) return constraint(.top, to: anchor, constant: offset)
} }
/** /**
Constraints left of the view to the given anchor. Constraints left of the view to the given anchor.
- Parameter _ acnhor: A LayoutAnchor. - Parameter _ anchor: A LayoutAnchorable.
- Parameter _ offset: A CGFloat offset. - Parameter _ offset: A CGFloat offset.
- Returns: A Layout instance to allow chaining. - Returns: A Layout instance to allow chaining.
*/ */
@discardableResult @discardableResult
func left(_ anchor: LayoutAnchor, _ offset: CGFloat = 0) -> Layout { func left(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0) -> Layout {
return constraint(.left, to: anchor, constant: offset) return constraint(.left, to: anchor, constant: offset)
} }
/** /**
Constraints right of the view to the given anchor. Constraints right of the view to the given anchor.
- Parameter _ acnhor: A LayoutAnchor. - Parameter _ anchor: A LayoutAnchorable.
- Parameter _ offset: A CGFloat offset. - Parameter _ offset: A CGFloat offset.
- Returns: A Layout instance to allow chaining. - Returns: A Layout instance to allow chaining.
*/ */
@discardableResult @discardableResult
func right(_ anchor: LayoutAnchor, _ offset: CGFloat = 0) -> Layout { func right(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0) -> Layout {
return constraint(.right, to: anchor, constant: -offset) return constraint(.right, to: anchor, constant: -offset)
} }
/** /**
Constraints bottom of the view to the given anchor. Constraints bottom of the view to the given anchor.
- Parameter _ acnhor: A LayoutAnchor. - Parameter _ anchor: A LayoutAnchorable.
- Parameter _ offset: A CGFloat offset. - Parameter _ offset: A CGFloat offset.
- Returns: A Layout instance to allow chaining. - Returns: A Layout instance to allow chaining.
*/ */
@discardableResult @discardableResult
func bottom(_ anchor: LayoutAnchor, _ offset: CGFloat = 0) -> Layout { func bottom(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0) -> Layout {
return constraint(.bottom, to: anchor, constant: -offset) return constraint(.bottom, to: anchor, constant: -offset)
} }
/** /**
Constraints top-left of the view to the given anchor. Constraints top-left of the view to the given anchor.
- Parameter _ acnhor: A LayoutAnchor. - Parameter _ anchor: A LayoutAnchorable.
- Parameter top: A CGFloat offset for top. - Parameter top: A CGFloat offset for top.
- Parameter left: A CGFloat offset for left. - Parameter left: A CGFloat offset for left.
- Returns: A Layout instance to allow chaining. - Returns: A Layout instance to allow chaining.
*/ */
@discardableResult @discardableResult
func topLeft(_ anchor: LayoutAnchor, top: CGFloat = 0, left: CGFloat = 0) -> Layout { func topLeft(_ anchor: LayoutAnchorable, top: CGFloat = 0, left: CGFloat = 0) -> Layout {
return constraint(.topLeft, to: anchor, constants: top, left) return constraint(.topLeft, to: anchor, constants: top, left)
} }
/** /**
Constraints top-right of the view to the given anchor. Constraints top-right of the view to the given anchor.
- Parameter _ acnhor: A LayoutAnchor. - Parameter _ anchor: A LayoutAnchorable.
- Parameter top: A CGFloat offset for top. - Parameter top: A CGFloat offset for top.
- Parameter right: A CGFloat offset for right. - Parameter right: A CGFloat offset for right.
- Returns: A Layout instance to allow chaining. - Returns: A Layout instance to allow chaining.
*/ */
@discardableResult @discardableResult
func topRight(_ anchor: LayoutAnchor, top: CGFloat = 0, right: CGFloat = 0) -> Layout { func topRight(_ anchor: LayoutAnchorable, top: CGFloat = 0, right: CGFloat = 0) -> Layout {
return constraint(.topRight, to: anchor, constants: top, -right) return constraint(.topRight, to: anchor, constants: top, -right)
} }
/** /**
Constraints bottom-left of the view to the given anchor. Constraints bottom-left of the view to the given anchor.
- Parameter _ acnhor: A LayoutAnchor. - Parameter _ anchor: A LayoutAnchorable.
- Parameter bottom: A CGFloat offset for bottom. - Parameter bottom: A CGFloat offset for bottom.
- Parameter left: A CGFloat offset for left. - Parameter left: A CGFloat offset for left.
- Returns: A Layout instance to allow chaining. - Returns: A Layout instance to allow chaining.
*/ */
@discardableResult @discardableResult
func bottomLeft(_ anchor: LayoutAnchor, bottom: CGFloat = 0, left: CGFloat = 0) -> Layout { func bottomLeft(_ anchor: LayoutAnchorable, bottom: CGFloat = 0, left: CGFloat = 0) -> Layout {
return constraint(.bottomLeft, to: anchor, constants: -bottom, left) return constraint(.bottomLeft, to: anchor, constants: -bottom, left)
} }
/** /**
Constraints bottom-right of the view to the given anchor. Constraints bottom-right of the view to the given anchor.
- Parameter _ acnhor: A LayoutAnchor. - Parameter _ anchor: A LayoutAnchorable.
- Parameter bottom: A CGFloat offset for bottom. - Parameter bottom: A CGFloat offset for bottom.
- Parameter right: A CGFloat offset for right. - Parameter right: A CGFloat offset for right.
- Returns: A Layout instance to allow chaining. - Returns: A Layout instance to allow chaining.
*/ */
@discardableResult @discardableResult
func bottomRight(_ anchor: LayoutAnchor, bottom: CGFloat = 0, right: CGFloat = 0) -> Layout { func bottomRight(_ anchor: LayoutAnchorable, bottom: CGFloat = 0, right: CGFloat = 0) -> Layout {
return constraint(.bottomRight, to: anchor, constants: -bottom, -right) return constraint(.bottomRight, to: anchor, constants: -bottom, -right)
} }
/** /**
Constraints left and right of the view to the given anchor. Constraints left and right of the view to the given anchor.
- Parameter _ acnhor: A LayoutAnchor. - Parameter _ anchor: A LayoutAnchorable.
- Parameter left: A CGFloat offset for left. - Parameter left: A CGFloat offset for left.
- Parameter right: A CGFloat offset for right. - Parameter right: A CGFloat offset for right.
- Returns: A Layout instance to allow chaining. - Returns: A Layout instance to allow chaining.
*/ */
@discardableResult @discardableResult
func leftRight(_ anchor: LayoutAnchor, left: CGFloat = 0, right: CGFloat = 0) -> Layout { func leftRight(_ anchor: LayoutAnchorable, left: CGFloat = 0, right: CGFloat = 0) -> Layout {
return constraint(.leftRight, to: anchor, constants: left, -right) return constraint(.leftRight, to: anchor, constants: left, -right)
} }
/** /**
Constraints top and bottom of the view to the given anchor. Constraints top and bottom of the view to the given anchor.
- Parameter _ acnhor: A LayoutAnchor. - Parameter _ anchor: A LayoutAnchorable.
- Parameter top: A CGFloat offset for top. - Parameter top: A CGFloat offset for top.
- Parameter bottom: A CGFloat offset for bottom. - Parameter bottom: A CGFloat offset for bottom.
- Returns: A Layout instance to allow chaining. - Returns: A Layout instance to allow chaining.
*/ */
@discardableResult @discardableResult
func topBottom(_ anchor: LayoutAnchor, top: CGFloat = 0, bottom: CGFloat = 0) -> Layout { func topBottom(_ anchor: LayoutAnchorable, top: CGFloat = 0, bottom: CGFloat = 0) -> Layout {
return constraint(.topBottom, to: anchor, constants: top, -bottom) return constraint(.topBottom, to: anchor, constants: top, -bottom)
} }
/** /**
Constraints center of the view to the given anchor. Constraints center of the view to the given anchor.
- Parameter _ acnhor: A LayoutAnchor. - Parameter _ anchor: A LayoutAnchorable.
- Parameter offsetX: A CGFloat offset for horizontal center. - Parameter offsetX: A CGFloat offset for horizontal center.
- Parameter offsetY: A CGFloat offset for vertical center. - Parameter offsetY: A CGFloat offset for vertical center.
- Returns: A Layout instance to allow chaining. - Returns: A Layout instance to allow chaining.
*/ */
@discardableResult @discardableResult
func center(_ anchor: LayoutAnchor, offsetX: CGFloat = 0, offsetY: CGFloat = 0) -> Layout { func center(_ anchor: LayoutAnchorable, offsetX: CGFloat = 0, offsetY: CGFloat = 0) -> Layout {
return constraint(.center, to: anchor, constants: offsetX, offsetY) return constraint(.center, to: anchor, constants: offsetX, offsetY)
} }
/** /**
Constraints horizontal center of the view to the given anchor. Constraints horizontal center of the view to the given anchor.
- Parameter _ acnhor: A LayoutAnchor. - Parameter _ anchor: A LayoutAnchorable.
- Parameter _ offset: A CGFloat offset. - Parameter _ offset: A CGFloat offset.
- Returns: A Layout instance to allow chaining. - Returns: A Layout instance to allow chaining.
*/ */
@discardableResult @discardableResult
func centerX(_ anchor: LayoutAnchor, _ offset: CGFloat = 0) -> Layout { func centerX(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0) -> Layout {
return constraint(.centerX, to: anchor, constant: offset) return constraint(.centerX, to: anchor, constant: offset)
} }
/** /**
Constraints vertical center of the view to the given anchor. Constraints vertical center of the view to the given anchor.
- Parameter _ acnhor: A LayoutAnchor. - Parameter _ anchor: A LayoutAnchorable.
- Parameter _ offset: A CGFloat offset. - Parameter _ offset: A CGFloat offset.
- Returns: A Layout instance to allow chaining. - Returns: A Layout instance to allow chaining.
*/ */
@discardableResult @discardableResult
func centerY(_ anchor: LayoutAnchor, _ offset: CGFloat = 0) -> Layout { func centerY(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0) -> Layout {
return constraint(.centerY, to: anchor, constant: offset) return constraint(.centerY, to: anchor, constant: offset)
} }
/** /**
Constraints height of the view to the given anchor. Constraints height of the view to the given anchor.
- Parameter _ acnhor: A LayoutAnchor. - Parameter _ anchor: A LayoutAnchorable.
- Parameter offset: A CGFloat offset. - Parameter offset: A CGFloat offset.
- Returns: A Layout instance to allow chaining. - Returns: A Layout instance to allow chaining.
*/ */
@discardableResult @discardableResult
func width(_ anchor: LayoutAnchor, _ offset: CGFloat = 0) -> Layout { func width(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0) -> Layout {
return constraint(.width, to: anchor, constant: offset) return constraint(.width, to: anchor, constant: offset)
} }
/** /**
Constraints height of the view to the given anchor. Constraints height of the view to the given anchor.
- Parameter _ acnhor: A LayoutAnchor. - Parameter _ anchor: A LayoutAnchorable.
- Parameter offset: A CGFloat offset. - Parameter offset: A CGFloat offset.
- Returns: A Layout instance to allow chaining. - Returns: A Layout instance to allow chaining.
*/ */
@discardableResult @discardableResult
func height(_ anchor: LayoutAnchor, _ offset: CGFloat = 0) -> Layout { func height(_ anchor: LayoutAnchorable, _ offset: CGFloat = 0) -> Layout {
return constraint(.height, to: anchor, constant: offset) return constraint(.height, to: anchor, constant: offset)
} }
/** /**
Constraints edges of the view to the given anchor. Constraints edges of the view to the given anchor.
- Parameter _ acnhor: A LayoutAnchor. - Parameter _ anchor: A LayoutAnchorable.
- Parameter top: A CGFloat offset for top. - Parameter top: A CGFloat offset for top.
- Parameter left: A CGFloat offset for left. - Parameter left: A CGFloat offset for left.
- Parameter bottom: A CGFloat offset for bottom. - Parameter bottom: A CGFloat offset for bottom.
...@@ -445,7 +445,7 @@ public extension Layout { ...@@ -445,7 +445,7 @@ public extension Layout {
- Returns: A Layout instance to allow chaining. - Returns: A Layout instance to allow chaining.
*/ */
@discardableResult @discardableResult
func edges(_ anchor: LayoutAnchor, top: CGFloat = 0, left: CGFloat = 0, bottom: CGFloat = 0, right: CGFloat = 0) -> Layout { func edges(_ anchor: LayoutAnchorable, top: CGFloat = 0, left: CGFloat = 0, bottom: CGFloat = 0, right: CGFloat = 0) -> Layout {
return constraint(.edges, to: anchor, constants: top, left, -bottom, -right) return constraint(.edges, to: anchor, constants: top, left, -bottom, -right)
} }
} }
...@@ -486,11 +486,11 @@ private extension Layout { ...@@ -486,11 +486,11 @@ private extension Layout {
Constraints the view to the given anchor according to the provided attribute. Constraints the view to the given anchor according to the provided attribute.
If the constraint already exists, will update its constant. If the constraint already exists, will update its constant.
- Parameter _ attribute: A LayoutAttribute. - Parameter _ attribute: A LayoutAttribute.
- Parameter to anchor: A LayoutAnchor. - Parameter to anchor: A LayoutAnchorable.
- Parameter constant: A CGFloat. - Parameter constant: A CGFloat.
- Returns: A Layout instance to allow chaining. - Returns: A Layout instance to allow chaining.
*/ */
func constraint(_ attribute: LayoutAttribute, to anchor: LayoutAnchor, constant: CGFloat) -> Layout { func constraint(_ attribute: LayoutAttribute, to anchor: LayoutAnchorable, constant: CGFloat) -> Layout {
return constraint([attribute], to: anchor, constants: constant) return constraint([attribute], to: anchor, constants: constant)
} }
...@@ -498,11 +498,11 @@ private extension Layout { ...@@ -498,11 +498,11 @@ private extension Layout {
Constraints the view to the given anchor according to the provided attributes. Constraints the view to the given anchor according to the provided attributes.
If any of the constraints already exists, will update its constant. If any of the constraints already exists, will update its constant.
- Parameter _ attributes: An array of LayoutAttribute. - Parameter _ attributes: An array of LayoutAttribute.
- Parameter to anchor: A LayoutAnchor. - Parameter to anchor: A LayoutAnchorable.
- Parameter constants: A list of CGFloat. - Parameter constants: A list of CGFloat.
- Returns: A Layout instance to allow chaining. - Returns: A Layout instance to allow chaining.
*/ */
func constraint(_ attributes: [LayoutAttribute], to anchor: LayoutAnchor, constants: CGFloat...) -> Layout { func constraint(_ attributes: [LayoutAttribute], to anchor: LayoutAnchorable, constants: CGFloat...) -> Layout {
return constraint(attributes, to: anchor, constants: constants) return constraint(attributes, to: anchor, constants: constants)
} }
...@@ -510,13 +510,14 @@ private extension Layout { ...@@ -510,13 +510,14 @@ private extension Layout {
Constraints the view to the given anchor according to the provided attributes. Constraints the view to the given anchor according to the provided attributes.
If any of the constraints already exists, will update its constant. If any of the constraints already exists, will update its constant.
- Parameter _ attributes: An array of LayoutAttribute. - Parameter _ attributes: An array of LayoutAttribute.
- Parameter to anchor: A LayoutAnchor. - Parameter to anchor: A LayoutAnchorable.
- Parameter constants: An array of CGFloat. - Parameter constants: An array of CGFloat.
- Returns: A Layout instance to allow chaining. - Returns: A Layout instance to allow chaining.
*/ */
func constraint(_ attributes: [LayoutAttribute], to anchor: LayoutAnchor, constants: [CGFloat]) -> Layout { func constraint(_ attributes: [LayoutAttribute], to anchor: LayoutAnchorable, constants: [CGFloat]) -> Layout {
let from = LayoutAnchor(view: view, attributes: attributes) let from = LayoutAnchor(view: view, attributes: attributes)
let constraint = LayoutConstraint(fromAnchor: from, toAnchor: anchor, constants: constants) let to = anchor as? LayoutAnchor ?? LayoutAnchor(view: anchor as? UIView, attributes: attributes)
let constraint = LayoutConstraint(fromAnchor: from, toAnchor: to, constants: constants)
let constraints = (view?.constraints ?? []) + (parent?.constraints ?? []) let constraints = (view?.constraints ?? []) + (parent?.constraints ?? [])
let newConstraints = constraint.constraints let newConstraints = constraint.constraints
......
Sources/iOS/LayoutAnchor.swift
...@@ -30,6 +30,12 @@ ...@@ -30,6 +30,12 @@
import UIKit import UIKit
/// A protocol that's conformed by UIView and LayoutAnchor.
public protocol LayoutAnchorable { }
extension UIView: LayoutAnchorable { }
extension LayoutAnchor: LayoutAnchorable { }
public struct LayoutAnchor { public struct LayoutAnchor {
/// A weak reference to the view. /// A weak reference to the view.
weak var view: UIView? weak var view: UIView?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment