Skip to content

Commit 00b4a31

Browse files
committed
Use activate property
1 parent c9143e6 commit 00b4a31

File tree

3 files changed

+10
-18
lines changed

3 files changed

+10
-18
lines changed

Pod/Classes/MenuItemView.swift

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,11 @@ class MenuItemView: UIView {
113113
let horizontalConstraints = NSLayoutConstraint.constraintsWithVisualFormat("H:|-margin-[view]-margin-|", options: .allZeros, metrics: ["margin": viewMargin.horizontal], views: viewsDictionary)
114114
let verticalConstraints = NSLayoutConstraint.constraintsWithVisualFormat("V:|-margin@250-[view(height)]-margin@250-|", options: .allZeros, metrics: ["height": viewSize.height, "margin": viewMargin.vertical], views: viewsDictionary)
115115

116-
addConstraints(horizontalConstraints)
117-
addConstraints(verticalConstraints)
116+
NSLayoutConstraint.activateConstraints(horizontalConstraints + verticalConstraints)
118117

119118
// use property to change constant value anytime
120119
widthViewConstraint = NSLayoutConstraint(item: titleView, attribute: NSLayoutAttribute.Width, relatedBy: NSLayoutRelation.Equal, toItem: nil, attribute: NSLayoutAttribute.Width, multiplier: 1.0, constant: viewSize.width)
121-
addConstraint(widthViewConstraint)
120+
widthViewConstraint.active = true
122121
}
123122

124123
private func layoutLabel() {
@@ -131,12 +130,11 @@ class MenuItemView: UIView {
131130
let horizontalConstraints = NSLayoutConstraint.constraintsWithVisualFormat("H:|-margin-[label]-margin-|", options: .allZeros, metrics: ["margin": labelMargin.horizontal], views: viewsDictionary)
132131
let verticalConstraints = NSLayoutConstraint.constraintsWithVisualFormat("V:|-margin@250-[label(height)]-margin@250-|", options: .allZeros, metrics: ["height": labelSize.height, "margin": labelMargin.vertical], views: viewsDictionary)
133132

134-
titleView.addConstraints(horizontalConstraints)
135-
titleView.addConstraints(verticalConstraints)
133+
NSLayoutConstraint.activateConstraints(horizontalConstraints + verticalConstraints)
136134

137135
widthLabelConstraint = NSLayoutConstraint(item: titleLabel, attribute: NSLayoutAttribute.Width, relatedBy: NSLayoutRelation.Equal, toItem: nil, attribute: NSLayoutAttribute.Width, multiplier: 1.0, constant: labelSize.width)
138136
widthLabelConstraint.priority = 250 // label's width should be calculated by its view's width
139-
titleView.addConstraint(widthLabelConstraint)
137+
widthLabelConstraint.active = true
140138
}
141139

142140
// MARK: - Size calculator

Pod/Classes/MenuView.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,7 @@ class MenuView: UIScrollView {
102102
let horizontalConstraints = NSLayoutConstraint.constraintsWithVisualFormat("H:|[contentView]|", options: .allZeros, metrics: nil, views: viewsDictionary)
103103
let verticalConstraints = NSLayoutConstraint.constraintsWithVisualFormat("V:|[contentView(==scrollView)]|", options: .allZeros, metrics: nil, views: viewsDictionary)
104104

105-
addConstraints(horizontalConstraints)
106-
addConstraints(verticalConstraints)
105+
NSLayoutConstraint.activateConstraints(horizontalConstraints + verticalConstraints)
107106
}
108107

109108
private func constructMenuItemViews(#titles: [String]) {
@@ -135,8 +134,7 @@ class MenuView: UIScrollView {
135134

136135
let verticalConstraints = NSLayoutConstraint.constraintsWithVisualFormat("V:|[menuItemView]|", options: .allZeros, metrics: nil, views: viewsDicrionary)
137136

138-
contentView.addConstraints(horizontalConstraints)
139-
contentView.addConstraints(verticalConstraints)
137+
NSLayoutConstraint.activateConstraints(horizontalConstraints + verticalConstraints)
140138
}
141139
}
142140

Pod/Classes/PagingMenuController.swift

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,7 @@ public class PagingMenuController: UIViewController, UIScrollViewDelegate {
156156
verticalConstraints = NSLayoutConstraint.constraintsWithVisualFormat("V:[menuView(height)]|", options: .allZeros, metrics: metrics, views: viewsDictionary)
157157
}
158158

159-
view.addConstraints(horizontalConstraints)
160-
view.addConstraints(verticalConstraints)
159+
NSLayoutConstraint.activateConstraints(horizontalConstraints + verticalConstraints)
161160
}
162161

163162
private func constructScrollView() {
@@ -183,8 +182,7 @@ public class PagingMenuController: UIViewController, UIScrollViewDelegate {
183182
verticalConstraints = NSLayoutConstraint.constraintsWithVisualFormat("V:|[scrollView][menuView]", options: .allZeros, metrics: nil, views: viewsDictionary)
184183
}
185184

186-
view.addConstraints(horizontalConstraints)
187-
view.addConstraints(verticalConstraints)
185+
NSLayoutConstraint.activateConstraints(horizontalConstraints + verticalConstraints)
188186
}
189187

190188
private func constructContentView() {
@@ -198,8 +196,7 @@ public class PagingMenuController: UIViewController, UIScrollViewDelegate {
198196
let horizontalConstraints = NSLayoutConstraint.constraintsWithVisualFormat("H:|[contentView]|", options: .allZeros, metrics: nil, views: viewsDictionary)
199197
let verticalConstraints = NSLayoutConstraint.constraintsWithVisualFormat("V:|[contentView(==scrollView)]|", options: .allZeros, metrics: nil, views: viewsDictionary)
200198

201-
scrollView.addConstraints(horizontalConstraints)
202-
scrollView.addConstraints(verticalConstraints)
199+
NSLayoutConstraint.activateConstraints(horizontalConstraints + verticalConstraints)
203200
}
204201

205202
private func constructPagingViewControllers() {
@@ -235,8 +232,7 @@ public class PagingMenuController: UIViewController, UIScrollViewDelegate {
235232
let horizontalConstraints = NSLayoutConstraint.constraintsWithVisualFormat(horizontalVisualFormat, options: .allZeros, metrics: nil, views: viewsDictionary)
236233
let verticalConstraints = NSLayoutConstraint.constraintsWithVisualFormat("V:|[pagingView(==scrollView)]|", options: .allZeros, metrics: nil, views: viewsDictionary)
237234

238-
scrollView.addConstraints(horizontalConstraints)
239-
scrollView.addConstraints(verticalConstraints)
235+
NSLayoutConstraint.activateConstraints(horizontalConstraints + verticalConstraints)
240236
}
241237

242238
view.setNeedsLayout()

0 commit comments

Comments
 (0)