Skip to content
This repository was archived by the owner on Jun 17, 2018. It is now read-only.

Commit 22c5eb2

Browse files
committed
Refactor conditional statement
1 parent a93ecc7 commit 22c5eb2

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

Pod/Classes/MenuItemView.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ open class MenuItemView: UIView {
3838
// adjust label width if needed
3939
let labelSize = calculateLabelSize(titleLabel, maxWidth: maxWindowSize)
4040
widthConstraint.constant = labelSize.width
41-
case .multilineText(let title, let description):
41+
case let .multilineText(title, description):
4242
updateLabel(titleLabel, text: title)
4343
updateLabel(descriptionLabel, text: description)
4444

4545
// adjust label width if needed
4646
widthConstraint.constant = calculateLabelSize(titleLabel, maxWidth: maxWindowSize).width
4747
descriptionWidthConstraint.constant = calculateLabelSize(descriptionLabel, maxWidth: maxWindowSize).width
48-
case .image(let image, let selectedImage):
48+
case let .image(image, selectedImage):
4949
menuImageView.image = selected ? (selectedImage ?? image) : image
5050
case .custom: break
5151
}
@@ -83,7 +83,7 @@ open class MenuItemView: UIView {
8383
self.setupTitleLabel(title)
8484
self.layoutLabel()
8585
})
86-
case .multilineText(let title, let description):
86+
case let .multilineText(title, description):
8787
commonInit({
8888
self.setupMultilineLabel(title, description: description)
8989
self.layoutMultiLineLabel()
@@ -295,11 +295,11 @@ extension MenuItemView: LabelSizeCalculatable {
295295

296296
let itemWidth: CGFloat
297297
switch menuOptions.displayMode {
298-
case let .standard(widthMode, _, _):
298+
case .standard(let widthMode, _, _):
299299
itemWidth = labelWidth(widthMode, estimatedSize: estimatedLabelSize(label))
300300
case .segmentedControl:
301301
itemWidth = maxWidth / CGFloat(menuOptions.itemsOptions.count)
302-
case let .infinite(widthMode, _):
302+
case .infinite(let widthMode, _):
303303
itemWidth = labelWidth(widthMode, estimatedSize: estimatedLabelSize(label))
304304
}
305305

Pod/Classes/MenuView.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ open class MenuView: UIScrollView {
4545
}
4646
fileprivate var contentOffsetX: CGFloat {
4747
switch menuOptions.displayMode {
48-
case let .standard(_, centerItem, _) where centerItem:
48+
case .standard(_, let centerItem, _) where centerItem:
4949
return centerOfScreenWidth
5050
case .segmentedControl:
5151
return contentOffset.x
@@ -267,15 +267,15 @@ open class MenuView: UIScrollView {
267267
}
268268

269269
fileprivate func animateUnderlineViewIfNeeded() {
270-
guard case let .underline(_, _, horizontalPadding, _) = menuOptions.focusMode else { return }
270+
guard case .underline(_, _, let horizontalPadding, _) = menuOptions.focusMode else { return }
271271

272272
let targetFrame = menuItemViews[currentPage].frame
273273
underlineView.frame.origin.x = targetFrame.minX + horizontalPadding
274274
underlineView.frame.size.width = targetFrame.width - horizontalPadding * 2
275275
}
276276

277277
fileprivate func animateRoundRectViewIfNeeded() {
278-
guard case let .roundRect(_, horizontalPadding, _, _) = menuOptions.focusMode else { return }
278+
guard case .roundRect(_, let horizontalPadding, _, _) = menuOptions.focusMode else { return }
279279

280280
let targetFrame = menuItemViews[currentPage].frame
281281
roundRectView.frame.origin.x = targetFrame.minX + horizontalPadding
@@ -295,7 +295,7 @@ open class MenuView: UIScrollView {
295295

296296
fileprivate func adjustmentContentInsetIfNeeded() {
297297
switch menuOptions.displayMode {
298-
case let .standard(_, centerItem, _) where centerItem: break
298+
case .standard(_, let centerItem, _) where centerItem: break
299299
default: return
300300
}
301301

Pod/Classes/PagingMenuController.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,8 @@ extension PagingMenuController: GestureHandler {
393393
internal func handleTapGesture(_ recognizer: UITapGestureRecognizer) {
394394
guard let menuItemView = recognizer.view as? MenuItemView,
395395
let menuView = menuView,
396-
let page = menuView.menuItemViews.index(of: menuItemView) , page != menuView.currentPage,
396+
let page = menuView.menuItemViews.index(of: menuItemView),
397+
page != menuView.currentPage,
397398
let menuOptions = menuOptions else { return }
398399

399400
let newPage: Int

0 commit comments

Comments
 (0)