Skip to content

Make height/width inputs safer #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gsbernstein wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make height/width inputs safer #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
037fc20
revert infer superview
gsbernstein Aug 13, 2020
7825f9d
remove default from dimension version and make non-anonymous
gsbernstein Aug 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions constrain/Classes/BaseTypes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,9 @@ public extension Constraints {
// Height and width stuff
public extension Constraints {
/// Set the height constraint to a constant
// Can't have the constant param be anonymous or have a default or it would overload the anchor equivalent
@discardableResult
func height(_ constant: CGFloat = 0.0, by relationship: Relationship = .equal, priority: UILayoutPriority = .required) -> Constraints {
func height(to constant: CGFloat, by relationship: Relationship = .equal, priority: UILayoutPriority = .required) -> Constraints {
Copy link
Copy Markdown
Collaborator

@ericgroom ericgroom Aug 25, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should be able to omit the argument label, I think the bigger issue was that the anchor version had a default value of nil right?

guard let view = view else {
print("View fell out of memory.")
return self
Expand All @@ -102,18 +103,18 @@ public extension Constraints {

/// Constrains the height of one view to the height of another
@discardableResult
func height(to anchor: NSLayoutDimension? = nil, constant: CGFloat = 0.0, by relationship: Relationship = .equal, priority: UILayoutPriority = .required) -> Constraints {
guard let view = view,
let anchor2 = anchor ?? view.superview?.heightAnchor else {
print("Trying to create height constraint without reference anchor")
return self
func height(to anchor: NSLayoutDimension, constant: CGFloat = 0.0, by relationship: Relationship = .equal, priority: UILayoutPriority = .required) -> Constraints {
guard let view = view else {
print("View fell out of memory.")
return self
}
return applyAnchorConstraint(anchor1: view.heightAnchor, anchor2: anchor2, identifier: .height, constant: constant, relationship: relationship, priority: priority)
return applyAnchorConstraint(anchor1: view.heightAnchor, anchor2: anchor, identifier: .height, constant: constant, relationship: relationship, priority: priority)
}

/// Set the width constraint to a constant
// Can't have the constant param be anonymous or have a default or it would overload the anchor equivalent
@discardableResult
func width(_ constant: CGFloat = 0.0, by relationship: Relationship = .equal, priority: UILayoutPriority = .required) -> Constraints {
func width(to constant: CGFloat, by relationship: Relationship = .equal, priority: UILayoutPriority = .required) -> Constraints {
guard let view = view else {
print("View fell out of memory.")
return self
Expand All @@ -123,13 +124,12 @@ public extension Constraints {

/// Constrains the width of one view to the width of another
@discardableResult
func width(to anchor: NSLayoutDimension? = nil, constant: CGFloat = 0.0, by relationship: Relationship = .equal, priority: UILayoutPriority = .required) -> Constraints {
guard let view = view,
let anchor2 = anchor ?? view.superview?.widthAnchor else {
print("Trying to create width constraint without reference anchor")
return self
func width(to anchor: NSLayoutDimension, constant: CGFloat = 0.0, by relationship: Relationship = .equal, priority: UILayoutPriority = .required) -> Constraints {
guard let view = view else {
print("View fell out of memory.")
return self
}
return applyAnchorConstraint(anchor1: view.widthAnchor, anchor2: anchor2, identifier: .width, constant: constant, relationship: relationship, priority: priority)
return applyAnchorConstraint(anchor1: view.widthAnchor, anchor2: anchor, identifier: .width, constant: constant, relationship: relationship, priority: priority)
}

}
Expand Down Expand Up @@ -185,16 +185,16 @@ public extension Constraints {
@discardableResult
func size(width: CGFloat, height: CGFloat, by relationship: Relationship = .equal) -> Constraints {
return self
.width(width, by: relationship)
.height(height, by: relationship)
.width(to: width, by: relationship)
.height(to: height, by: relationship)
}

/// Constraint the height and width of one view to those of another
@discardableResult
func size(to view: UIView? = nil, by relationship: Relationship = .equal, priority: UILayoutPriority = .required) -> Constraints {
func size(to view: UIView, by relationship: Relationship = .equal, priority: UILayoutPriority = .required) -> Constraints {
return self
.height(to: view?.heightAnchor, by: relationship, priority: priority)
.width(to: view?.widthAnchor, by: relationship, priority: priority)
.height(to: view.heightAnchor, by: relationship, priority: priority)
.width(to: view.widthAnchor, by: relationship, priority: priority)
}

}