mirrors
/
SnapKit
mirror of https://github.com/SnapKit/SnapKit
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "[EXC_BAD_ACCESS] Update LayoutConstraint == operator to support iOS 10 and higher changes (#574)" (#593) 

This reverts commit bc2b0b9332.
This commit is contained in:
Robert Payne 2019-04-28 20:43:09 +12:00 committed by GitHub
parent e9b237468b
commit f59340c39b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/LayoutConstraint.swift
View File

@ -44,18 +44,14 @@ public class LayoutConstraint : NSLayoutConstraint {
} }
internal func ==(lhs: LayoutConstraint, rhs: LayoutConstraint) -> Bool { internal func ==(lhs: LayoutConstraint, rhs: LayoutConstraint) -> Bool {
let areLayoutAnchorsEqual: Bool guard lhs.firstItem === rhs.firstItem &&
if #available(iOS 10.0, OSXApplicationExtension 10.12, *) {
areLayoutAnchorsEqual = lhs.firstAnchor === rhs.firstAnchor &&
lhs.secondAnchor === rhs.secondAnchor
} else {
areLayoutAnchorsEqual = lhs.firstItem === rhs.firstItem &&
lhs.secondItem === rhs.secondItem && lhs.secondItem === rhs.secondItem &&
lhs.firstAttribute == rhs.firstAttribute && lhs.firstAttribute == rhs.firstAttribute &&
lhs.secondAttribute == rhs.secondAttribute lhs.secondAttribute == rhs.secondAttribute &&
}
return areLayoutAnchorsEqual &&
lhs.relation == rhs.relation && lhs.relation == rhs.relation &&
lhs.priority == rhs.priority && lhs.priority == rhs.priority &&
lhs.multiplier == rhs.multiplier lhs.multiplier == rhs.multiplier else {
return false
}
return true
} }

30
Tests/SnapKitTests/Tests.swift
View File

@ -580,34 +580,4 @@ class SnapKitTests: XCTestCase {
let higherPriority: ConstraintPriority = ConstraintPriority.high.advanced(by: 1) let higherPriority: ConstraintPriority = ConstraintPriority.high.advanced(by: 1)
XCTAssertEqual(higherPriority.value, highPriority.value + 1) XCTAssertEqual(higherPriority.value, highPriority.value + 1)
} }
func testLayoutConstraintEqual() {
let view1 = View()
let view2 = View()
let layoutConstraint1 = LayoutConstraint(item: view1,
attribute: .top,
relatedBy: .lessThanOrEqual,
toItem: view2,
attribute: .bottom,
multiplier: 2,
constant: 30)
let layoutConstraint2 = LayoutConstraint(item: view1,
attribute: .top,
relatedBy: .lessThanOrEqual,
toItem: view2,
attribute: .bottom,
multiplier: 2,
constant: 30)
let layoutConstraint3 = LayoutConstraint(item: view1,
attribute: .top,
relatedBy: .lessThanOrEqual,
toItem: view2,
attribute: .bottom,
multiplier: 1,
constant: 50)
XCTAssertTrue(layoutConstraint1 == layoutConstraint2)
XCTAssertFalse(layoutConstraint1 == layoutConstraint3)
XCTAssertFalse(layoutConstraint2 == layoutConstraint3)
}
} }