TouchInstinct
/
LeadKit
310
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #128 from TouchInstinct/fix/view+autolayout 

Fix/view+autolayout
This commit is contained in:
Alexey Gerasimov 2018-04-11 17:00:26 +03:00 committed by GitHub
parent a9be9b8f13 3fdbc72324
commit 5f513b5bad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -7,6 +7,8 @@
- **Add**: `mapViewEvents` overload with closure that returns array of disposables.
- **Update**: Update `ObjectMapper` to 3.1.
- **Add**: `apiRequestParameters` method to `NetworkServiceConfiguration` extension.
- **Update**: Rename setToCenter(withInsets:) to pintToSuperview(withInsets:excluding:)
- **Update**: Added parameter "edges" with label "excluding" to aforementioned method
### 0.7.7
- **Fix**: Fix doubling separator line issue

2
Sources/Extensions/Array/Array+SeparatorRowBoxExtensions.swift
View File

@ -43,7 +43,7 @@ public extension Array where Element == SeparatorRowBox {
case 1:
first?.set(separatorType: .full(extremeSeparatorConfiguration, extremeSeparatorConfiguration))
default:
forEach { $0.set(separatorType: .bottom(middleSeparatorConfiguration))}
forEach { $0.set(separatorType: .bottom(middleSeparatorConfiguration)) }
first?.set(separatorType: .full(extremeSeparatorConfiguration, middleSeparatorConfiguration))
last?.set(separatorType: .bottom(extremeSeparatorConfiguration))
}

33
Sources/Extensions/UIKit/UIView/UIView+Layout.swift
View File

@ -55,32 +55,35 @@ public extension UIView {
Place and fix view to parent view's center with insets
- parameter insets: desired view insets, by default is zero
- parameter edges: edges to which no constraints are needed
*/
func setToCenter(wtihInsets insets: UIEdgeInsets = .zero) {
func pinToSuperview(wtihInsets insets: UIEdgeInsets = .zero, excluding edges: UIRectEdge = []) {
guard let superview = superview else {
return
}
let topActive = !edges.contains(.top)
let leadingActive = !edges.contains(.left)
let bottomActive = !edges.contains(.bottom)
let trailingActive = !edges.contains(.right)
translatesAutoresizingMaskIntoConstraints = false
let constraints: [NSLayoutConstraint]
if #available(iOS 11, tvOS 11, *) {
constraints = [
topAnchor.constraint(equalTo: superview.safeAreaLayoutGuide.topAnchor, constant: insets.top),
leadingAnchor.constraint(equalTo: superview.safeAreaLayoutGuide.leadingAnchor, constant: insets.left),
bottomAnchor.constraint(equalTo: superview.safeAreaLayoutGuide.bottomAnchor, constant: -insets.bottom),
topAnchor.constraint(equalTo: superview.safeAreaLayoutGuide.topAnchor, constant: insets.top)
.isActive = topActive
leadingAnchor.constraint(equalTo: superview.safeAreaLayoutGuide.leadingAnchor, constant: insets.left)
.isActive = leadingActive
bottomAnchor.constraint(equalTo: superview.safeAreaLayoutGuide.bottomAnchor, constant: -insets.bottom)
.isActive = bottomActive
trailingAnchor.constraint(equalTo: superview.safeAreaLayoutGuide.trailingAnchor, constant: -insets.right)
]
.isActive = trailingActive
} else {
constraints = [
topAnchor.constraint(equalTo: superview.topAnchor, constant: insets.top),
leadingAnchor.constraint(equalTo: superview.leadingAnchor, constant: insets.left),
bottomAnchor.constraint(equalTo: superview.bottomAnchor, constant: -insets.bottom),
trailingAnchor.constraint(equalTo: superview.trailingAnchor, constant: -insets.right)
]
topAnchor.constraint(equalTo: superview.topAnchor, constant: insets.top).isActive = topActive
leadingAnchor.constraint(equalTo: superview.leadingAnchor, constant: insets.left).isActive = leadingActive
bottomAnchor.constraint(equalTo: superview.bottomAnchor, constant: -insets.bottom).isActive = bottomActive
trailingAnchor.constraint(equalTo: superview.trailingAnchor, constant: -insets.right).isActive = trailingActive
}
NSLayoutConstraint.activate(constraints)
}
private func scaleToFill() {