Skip to content
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

Jump to bottom

equalToSuperviewSafeAreaLayoutGuide, lessThanOrEqualToSuperviewSafeAreaLayoutGuide and greaterThanOrEqualToSuperviewSafeAreaLayoutGuide #792

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

equalToSuperviewSafeAreaLayoutGuide, lessThanOrEqualToSuperviewSafeAreaLayoutGuide and greaterThanOrEqualToSuperviewSafeAreaLayoutGuide #792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a78644
safeAreaLayoutGuide
RomanPodymov Dec 25, 2023
17c8392
macOS 11.0
RomanPodymov Dec 25, 2023
fc29ffd
Moved to other place
RomanPodymov Dec 25, 2023
7dd6b32
Reset
RomanPodymov Dec 25, 2023
eadab7e
Tests
RomanPodymov Dec 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 29 additions & 2 deletions Sources/ConstraintMakerRelatable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,16 @@ public class ConstraintMakerRelatable {
}
return self.relatedTo(other, relation: .equal, file: file, line: line)
}


@available(iOS 11.0, tvOS 11.0, macOS 11.0, *)
@discardableResult
public func equalToSuperviewSafeAreaLayoutGuide(_ file: String = #file, _ line: UInt = #line) -> ConstraintMakerEditable {
guard let other = self.description.item.superview?.safeAreaLayoutGuide else {
fatalError("Expected superview but found nil when attempting make constraint `equalToSuperviewSafeAreaLayoutGuide`.")
}
return self.relatedTo(other, relation: .equal, file: file, line: line)
}

@discardableResult
public func lessThanOrEqualTo(_ other: ConstraintRelatableTarget, _ file: String = #file, _ line: UInt = #line) -> ConstraintMakerEditable {
return self.relatedTo(other, relation: .lessThanOrEqual, file: file, line: line)
Expand All @@ -99,7 +108,16 @@ public class ConstraintMakerRelatable {
}
return self.relatedTo(other, relation: .lessThanOrEqual, file: file, line: line)
}


@available(iOS 11.0, tvOS 11.0, macOS 11.0, *)
@discardableResult
public func lessThanOrEqualToSuperviewSafeAreaLayoutGuide(_ file: String = #file, _ line: UInt = #line) -> ConstraintMakerEditable {
guard let other = self.description.item.superview?.safeAreaLayoutGuide else {
fatalError("Expected superview but found nil when attempting make constraint `lessThanOrEqualToSuperviewSafeAreaLayoutGuide`.")
}
return self.relatedTo(other, relation: .lessThanOrEqual, file: file, line: line)
}

@discardableResult
public func greaterThanOrEqualTo(_ other: ConstraintRelatableTarget, _ file: String = #file, line: UInt = #line) -> ConstraintMakerEditable {
return self.relatedTo(other, relation: .greaterThanOrEqual, file: file, line: line)
Expand All @@ -112,4 +130,13 @@ public class ConstraintMakerRelatable {
}
return self.relatedTo(other, relation: .greaterThanOrEqual, file: file, line: line)
}

@available(iOS 11.0, tvOS 11.0, macOS 11.0, *)
@discardableResult
public func greaterThanOrEqualToSuperviewSafeAreaLayoutGuide(_ file: String = #file, line: UInt = #line) -> ConstraintMakerEditable {
guard let other = self.description.item.superview?.safeAreaLayoutGuide else {
fatalError("Expected superview but found nil when attempting make constraint `greaterThanOrEqualToSuperviewSafeAreaLayoutGuide`.")
}
return self.relatedTo(other, relation: .greaterThanOrEqual, file: file, line: line)
}
}
34 changes: 34 additions & 0 deletions Tests/SnapKitTests/Tests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,4 +768,38 @@ class SnapKitTests: XCTestCase {
let higherPriority: ConstraintPriority = ConstraintPriority.high.advanced(by: 1)
XCTAssertEqual(higherPriority.value, highPriority.value + 1)
}

@available(iOS 11.0, tvOS 11.0, macOS 11.0, *)
func testSafeAreaLayoutGuide() {
let v1 = View()
self.container.addSubview(v1)

v1.snp.makeConstraints { make in
make.verticalEdges.equalToSuperviewSafeAreaLayoutGuide()
make.leading.lessThanOrEqualToSuperviewSafeAreaLayoutGuide()
make.trailing.greaterThanOrEqualToSuperviewSafeAreaLayoutGuide()
}

XCTAssertEqual(container.snp_constraints.count, 4, "Should have 4 constraints installed")
XCTAssertNotNil(container.constraints.first {
$0.firstAttribute == .leading &&
$0.secondAttribute == .leading &&
$0.relation == .lessThanOrEqual
})
XCTAssertNotNil(container.constraints.first {
$0.firstAttribute == .trailing &&
$0.secondAttribute == .trailing &&
$0.relation == .greaterThanOrEqual
})
XCTAssertNotNil(container.constraints.first {
$0.firstAttribute == .top &&
$0.secondAttribute == .top &&
$0.relation == .equal
})
XCTAssertNotNil(container.constraints.first {
$0.firstAttribute == .bottom &&
$0.secondAttribute == .bottom &&
$0.relation == .equal
})
}
}