Skip to content

Commit 57cbeee

Browse files
committed
Hotfix for fill* methods and negative insets. Updated version to 1.1.1.
1 parent 31bc8b3 commit 57cbeee

File tree

7 files changed

+25
-25
lines changed

7 files changed

+25
-25
lines changed

Example/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- LayoutExtension (1.1.0)
2+
- LayoutExtension (1.1.1)
33

44
DEPENDENCIES:
55
- LayoutExtension (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
99
:path: "../"
1010

1111
SPEC CHECKSUMS:
12-
LayoutExtension: 1670f3e34cf6b63a9a4f03ecb7303d9b0266a455
12+
LayoutExtension: b54231727342807c9c84b67d0826d19815d0878d
1313

1414
PODFILE CHECKSUM: 3a14a5d8a1d8041426005fe399bd4818782d2989
1515

Example/Pods/Local Podspecs/LayoutExtension.podspec.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Manifest.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Target Support Files/LayoutExtension/LayoutExtension-Info.plist

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

LayoutExtension.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Pod::Spec.new do |s|
1010
s.name = 'LayoutExtension'
11-
s.version = '1.1.0'
11+
s.version = '1.1.1'
1212
s.summary = 'Simple interface for auto layout in Swift'
1313

1414
# This description is used to generate tags and improve search results.

LayoutExtension/Classes/UIView+Layout.swift

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -302,35 +302,35 @@ public extension UIView {
302302
func fill(_ inset: CGFloat = 0.0, priority: UILayoutPriority = .required) -> (top: NSLayoutConstraint, left: NSLayoutConstraint, bottom: NSLayoutConstraint, right: NSLayoutConstraint) {
303303
let top = self.top(inset, priority: priority)
304304
let left = self.left(inset, priority: priority)
305-
let bottom = self.bottom(-inset, priority: priority)
306-
let right = self.right(-inset, priority: priority)
305+
let bottom = self.bottom(inset, priority: priority)
306+
let right = self.right(inset, priority: priority)
307307
return (top: top, left: left, bottom: bottom, right: right)
308308
}
309309

310310
@discardableResult
311311
func fill(_ insets: UIEdgeInsets, priority: UILayoutPriority = .required) -> (top: NSLayoutConstraint, left: NSLayoutConstraint, bottom: NSLayoutConstraint, right: NSLayoutConstraint) {
312312
let top = self.top(insets.top, priority: priority)
313313
let left = self.left(insets.left, priority: priority)
314-
let bottom = self.bottom(-insets.bottom, priority: priority)
315-
let right = self.right(-insets.right, priority: priority)
314+
let bottom = self.bottom(insets.bottom, priority: priority)
315+
let right = self.right(insets.right, priority: priority)
316316
return (top: top, left: left, bottom: bottom, right: right)
317317
}
318318

319319
@discardableResult
320320
func fillLeadingTrailing(_ inset: CGFloat = 0.0, priority: UILayoutPriority = .required) -> (top: NSLayoutConstraint, leading: NSLayoutConstraint, bottom: NSLayoutConstraint, trailing: NSLayoutConstraint) {
321321
let top = self.top(inset, priority: priority)
322322
let leading = self.leading(inset, priority: priority)
323-
let bottom = self.bottom(-inset, priority: priority)
324-
let trailing = self.trailing(-inset, priority: priority)
323+
let bottom = self.bottom(inset, priority: priority)
324+
let trailing = self.trailing(inset, priority: priority)
325325
return (top: top, leading: leading, bottom: bottom, trailing: trailing)
326326
}
327327

328328
@discardableResult
329329
func fillLeadingTrailing(_ insets: UIEdgeInsets, priority: UILayoutPriority = .required) -> (top: NSLayoutConstraint, leading: NSLayoutConstraint, bottom: NSLayoutConstraint, trailing: NSLayoutConstraint) {
330330
let top = self.top(insets.top, priority: priority)
331331
let leading = self.leading(insets.left, priority: priority)
332-
let bottom = self.bottom(-insets.bottom, priority: priority)
333-
let trailing = self.trailing(-insets.right, priority: priority)
332+
let bottom = self.bottom(insets.bottom, priority: priority)
333+
let trailing = self.trailing(insets.right, priority: priority)
334334
return (top: top, leading: leading, bottom: bottom, trailing: trailing)
335335
}
336336

@@ -426,35 +426,35 @@ public extension UIView {
426426
func fillSafe(_ inset: CGFloat = 0.0, priority: UILayoutPriority = .required) -> (top: NSLayoutConstraint, left: NSLayoutConstraint, bottom: NSLayoutConstraint, right: NSLayoutConstraint) {
427427
let top = self.topSafe(inset, priority: priority)
428428
let left = self.leftSafe(inset, priority: priority)
429-
let bottom = self.bottomSafe(-inset, priority: priority)
430-
let right = self.rightSafe(-inset, priority: priority)
429+
let bottom = self.bottomSafe(inset, priority: priority)
430+
let right = self.rightSafe(inset, priority: priority)
431431
return (top: top, left: left, bottom: bottom, right: right)
432432
}
433433

434434
@discardableResult
435435
func fillSafe(_ insets: UIEdgeInsets, priority: UILayoutPriority = .required) -> (top: NSLayoutConstraint, left: NSLayoutConstraint, bottom: NSLayoutConstraint, right: NSLayoutConstraint) {
436436
let top = self.topSafe(insets.top, priority: priority)
437437
let left = self.leftSafe(insets.left, priority: priority)
438-
let bottom = self.bottomSafe(-insets.bottom, priority: priority)
439-
let right = self.rightSafe(-insets.right, priority: priority)
438+
let bottom = self.bottomSafe(insets.bottom, priority: priority)
439+
let right = self.rightSafe(insets.right, priority: priority)
440440
return (top: top, left: left, bottom: bottom, right: right)
441441
}
442442

443443
@discardableResult
444444
func fillLeadingTrailingSafe(_ inset: CGFloat = 0.0, priority: UILayoutPriority = .required) -> (top: NSLayoutConstraint, leading: NSLayoutConstraint, bottom: NSLayoutConstraint, trailing: NSLayoutConstraint) {
445445
let top = self.topSafe(inset, priority: priority)
446446
let leading = self.leadingSafe(inset, priority: priority)
447-
let bottom = self.bottomSafe(-inset, priority: priority)
448-
let trailing = self.trailingSafe(-inset, priority: priority)
447+
let bottom = self.bottomSafe(inset, priority: priority)
448+
let trailing = self.trailingSafe(inset, priority: priority)
449449
return (top: top, leading: leading, bottom: bottom, trailing: trailing)
450450
}
451451

452452
@discardableResult
453453
func fillLeadingTrailingSafe(_ insets: UIEdgeInsets, priority: UILayoutPriority = .required) -> (top: NSLayoutConstraint, leading: NSLayoutConstraint, bottom: NSLayoutConstraint, trailing: NSLayoutConstraint) {
454454
let top = self.topSafe(insets.top, priority: priority)
455455
let leading = self.leadingSafe(insets.left, priority: priority)
456-
let bottom = self.bottomSafe(-insets.bottom, priority: priority)
457-
let trailing = self.trailingSafe(-insets.right, priority: priority)
456+
let bottom = self.bottomSafe(insets.bottom, priority: priority)
457+
let trailing = self.trailingSafe(insets.right, priority: priority)
458458
return (top: top, leading: leading, bottom: bottom, trailing: trailing)
459459
}
460460

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ To install LayoutExtension through [Swift Package Manager](https://swift.org/pac
3939

4040
```swift
4141
dependencies: [
42-
.package(name: "LayoutExtension", url: "git@github.com:abswift/layout-extension.git", .upToNextMajor(from: "1.1.0"))
42+
.package(name: "LayoutExtension", url: "git@github.com:abswift/layout-extension.git", .upToNextMajor(from: "1.1.1"))
4343
]
4444
```
4545

0 commit comments

Comments
 (0)