Skip to content

Commit e4706dc

Browse files
authored
Merge pull request #6632 from woocommerce/issue/5956-improve-UIView+SafeAreaConstraints
UIView+SafeAreaConstraints: Remove unnecessary self and #available checks
2 parents 0345d96 + 4d4f7dd commit e4706dc

File tree

1 file changed

+6
-30
lines changed

1 file changed

+6
-30
lines changed

WooCommerce/Classes/Extensions/UIView+SafeAreaConstraints.swift

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,56 +3,32 @@ import UIKit
33
extension UIView {
44
var safeLeadingAnchor: NSLayoutAnchor<NSLayoutXAxisAnchor> {
55
get {
6-
if #available(iOS 11.0, *) {
7-
return self.safeAreaLayoutGuide.leadingAnchor
8-
} else {
9-
return self.leadingAnchor
10-
}
6+
safeAreaLayoutGuide.leadingAnchor
117
}
128
}
139
var safeTrailingAnchor: NSLayoutAnchor<NSLayoutXAxisAnchor> {
1410
get {
15-
if #available(iOS 11.0, *) {
16-
return self.safeAreaLayoutGuide.trailingAnchor
17-
} else {
18-
return self.trailingAnchor
19-
}
11+
safeAreaLayoutGuide.trailingAnchor
2012
}
2113
}
2214
var safeLeftAnchor: NSLayoutAnchor<NSLayoutXAxisAnchor> {
2315
get {
24-
if #available(iOS 11.0, *) {
25-
return self.safeAreaLayoutGuide.leftAnchor
26-
} else {
27-
return self.leftAnchor
28-
}
16+
safeAreaLayoutGuide.leftAnchor
2917
}
3018
}
3119
var safeRightAnchor: NSLayoutAnchor<NSLayoutXAxisAnchor> {
3220
get {
33-
if #available(iOS 11.0, *) {
34-
return self.safeAreaLayoutGuide.rightAnchor
35-
} else {
36-
return self.rightAnchor
37-
}
21+
safeAreaLayoutGuide.rightAnchor
3822
}
3923
}
4024
var safeTopAnchor: NSLayoutAnchor<NSLayoutYAxisAnchor> {
4125
get {
42-
if #available(iOS 11.0, *) {
43-
return self.safeAreaLayoutGuide.topAnchor
44-
} else {
45-
return self.topAnchor
46-
}
26+
safeAreaLayoutGuide.topAnchor
4727
}
4828
}
4929
var safeBottomAnchor: NSLayoutAnchor<NSLayoutYAxisAnchor> {
5030
get {
51-
if #available(iOS 11.0, *) {
52-
return self.safeAreaLayoutGuide.bottomAnchor
53-
} else {
54-
return self.bottomAnchor
55-
}
31+
safeAreaLayoutGuide.bottomAnchor
5632
}
5733
}
5834
}

0 commit comments

Comments
 (0)