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

Commit e3c3b66

Browse files
kitasukekitasuke
authored
Merge pull request #239 from kitasuke/rename_mode_to_displayMode
Rename to displayMode
2 parents 205fc70 + 16b5216 commit e3c3b66

File tree

8 files changed

+37
-37
lines changed

8 files changed

+37
-37
lines changed

‎Example/Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
99
:path: ../
1010

1111
SPEC CHECKSUMS:
12-
PagingMenuController: 8d5eb5854e1b13e4c7ffd6186a8d8b3ecb7db4aa
12+
PagingMenuController: b2e3a3c71eb462e8cf9a3bef643f5a0aa0a990eb
1313

1414
PODFILE CHECKSUM: 182e65100ed4f1fc8683837abd55ef28346367f5
1515

‎Pod/Classes/MenuItemView.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class MenuItemView: UIView {
3131
backgroundColor = selected ? menuOptions.selectedBackgroundColor : menuOptions.backgroundColor
3232
}
3333

34-
switch menuItemOptions.mode {
34+
switch menuItemOptions.displayMode {
3535
case .Text(let title):
3636
updateLabel(titleLabel, text: title)
3737

@@ -63,7 +63,7 @@ public class MenuItemView: UIView {
6363
private var widthConstraint: NSLayoutConstraint!
6464
private var descriptionWidthConstraint: NSLayoutConstraint!
6565
private var horizontalMargin: CGFloat {
66-
switch menuOptions.mode {
66+
switch menuOptions.displayMode {
6767
case .SegmentedControl: return 0.0
6868
default: return menuItemOptions.horizontalMargin
6969
}
@@ -77,7 +77,7 @@ public class MenuItemView: UIView {
7777
self.menuOptions = menuOptions
7878
self.menuItemOptions = menuItemOptions
7979

80-
switch menuItemOptions.mode {
80+
switch menuItemOptions.displayMode {
8181
case .Text(let title):
8282
commonInit({
8383
self.setupTitleLabel(title)
@@ -126,9 +126,9 @@ public class MenuItemView: UIView {
126126

127127
internal func updateConstraints(size: CGSize) {
128128
// set width manually to support ratotaion
129-
guard case .SegmentedControl = menuOptions.mode else { return }
129+
guard case .SegmentedControl = menuOptions.displayMode else { return }
130130

131-
switch menuItemOptions.mode {
131+
switch menuItemOptions.displayMode {
132132
case .Text:
133133
let labelSize = calculateLabelSize(titleLabel, maxWidth: size.width)
134134
widthConstraint.constant = labelSize.width
@@ -218,7 +218,7 @@ public class MenuItemView: UIView {
218218
guard let image = menuImageView.image else { return }
219219

220220
let width: CGFloat
221-
switch menuOptions.mode {
221+
switch menuOptions.displayMode {
222222
case .SegmentedControl:
223223
width = UIApplication.sharedApplication().keyWindow!.bounds.size.width / CGFloat(menuOptions.itemsOptions.count)
224224
default:
@@ -261,7 +261,7 @@ public class MenuItemView: UIView {
261261

262262
extension MenuItemView: ViewCleanable {
263263
func cleanup() {
264-
switch menuItemOptions.mode {
264+
switch menuItemOptions.displayMode {
265265
case .Text:
266266
titleLabel.removeFromSuperview()
267267
case .MultilineText:
@@ -294,7 +294,7 @@ extension MenuItemView: LabelSizeCalculatable {
294294
guard let _ = label.text else { return .zero }
295295

296296
let itemWidth: CGFloat
297-
switch menuOptions.mode {
297+
switch menuOptions.displayMode {
298298
case let .Standard(widthMode, _, _):
299299
itemWidth = labelWidth(widthMode, estimatedSize: estimatedLabelSize(label))
300300
case .SegmentedControl:

‎Pod/Classes/MenuView.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ public class MenuView: UIScrollView {
2828
return $0
2929
}(UIView(frame: .zero))
3030
private var menuViewBounces: Bool {
31-
switch menuOptions.mode {
31+
switch menuOptions.displayMode {
3232
case .Standard(_, _, .ScrollEnabledAndBouces),
3333
.Infinite(_, .ScrollEnabledAndBouces): return true
3434
default: return false
3535
}
3636
}
3737
private var menuViewScrollEnabled: Bool {
38-
switch menuOptions.mode {
38+
switch menuOptions.displayMode {
3939
case .Standard(_, _, .ScrollEnabledAndBouces),
4040
.Standard(_, _, .ScrollEnabled),
4141
.Infinite(_, .ScrollEnabledAndBouces),
@@ -44,7 +44,7 @@ public class MenuView: UIScrollView {
4444
}
4545
}
4646
private var contentOffsetX: CGFloat {
47-
switch menuOptions.mode {
47+
switch menuOptions.displayMode {
4848
case let .Standard(_, centerItem, _) where centerItem:
4949
return centerOfScreenWidth
5050
case .SegmentedControl:
@@ -123,7 +123,7 @@ public class MenuView: UIScrollView {
123123
guard let _ = self else { return }
124124

125125
// relayout menu item views dynamically
126-
if case .Infinite = self!.menuOptions.mode {
126+
if case .Infinite = self!.menuOptions.displayMode {
127127
self!.relayoutMenuItemViews()
128128
}
129129
if self!.menuOptions.selectedItemCenter {
@@ -144,7 +144,7 @@ public class MenuView: UIScrollView {
144144
}
145145

146146
internal func updateMenuViewConstraints(size: CGSize) {
147-
if case .SegmentedControl = menuOptions.mode {
147+
if case .SegmentedControl = menuOptions.displayMode {
148148
menuItemViews.forEach { $0.updateConstraints(size) }
149149
}
150150
setNeedsLayout()
@@ -211,7 +211,7 @@ public class MenuView: UIScrollView {
211211
sortedMenuItemViews.removeAll()
212212
}
213213

214-
if case .Infinite = menuOptions.mode {
214+
if case .Infinite = menuOptions.displayMode {
215215
for i in 0..<menuItemCount {
216216
let page = rawPage(i)
217217
sortedMenuItemViews.append(menuItemViews[page])
@@ -294,7 +294,7 @@ public class MenuView: UIScrollView {
294294
}
295295

296296
private func adjustmentContentInsetIfNeeded() {
297-
switch menuOptions.mode {
297+
switch menuOptions.displayMode {
298298
case let .Standard(_, centerItem, _) where centerItem: break
299299
default: return
300300
}
@@ -363,7 +363,7 @@ extension MenuView: ViewCleanable {
363363

364364
extension MenuView: MenuItemMultipliable {
365365
var menuItemCount: Int {
366-
switch menuOptions.mode {
366+
switch menuOptions.displayMode {
367367
case .Infinite: return menuOptions.itemsOptions.count * menuOptions.dummyItemViewsSet
368368
default: return menuOptions.itemsOptions.count
369369
}

‎Pod/Classes/PagingMenuController.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public class PagingMenuController: UIViewController, PagingValidator {
8080
self.view.layoutIfNeeded()
8181

8282
// reset selected menu item view position
83-
switch menuOptions.mode {
83+
switch menuOptions.displayMode {
8484
case .Standard, .Infinite:
8585
self.moveToMenuPage(menuView.currentPage)
8686
default: break
@@ -261,7 +261,7 @@ public class PagingMenuController: UIViewController, PagingValidator {
261261
private func hidePagingMenuControllers(page: Int) {
262262
guard let menuOptions = menuOptions else { return }
263263

264-
switch (options.lazyLoadingPage, menuOptions.mode, page) {
264+
switch (options.lazyLoadingPage, menuOptions.displayMode, page) {
265265
case (.Three, .Infinite, menuView?.previousPage ?? previousPage),
266266
(.Three, .Infinite, menuView?.nextPage ?? nextPage),
267267
(.Three, _, previousPage),
@@ -313,14 +313,14 @@ extension PagingMenuController: Pagable {
313313
}
314314
var previousPage: Int {
315315
guard let menuOptions = menuOptions,
316-
case .Infinite = menuOptions.mode,
316+
case .Infinite = menuOptions.displayMode,
317317
let controllers = pagingViewController?.controllers else { return currentPage - 1 }
318318

319319
return currentPage - 1 < 0 ? controllers.count - 1 : currentPage - 1
320320
}
321321
var nextPage: Int {
322322
guard let menuOptions = menuOptions,
323-
case .Infinite = menuOptions.mode,
323+
case .Infinite = menuOptions.displayMode,
324324
let controllers = pagingViewController?.controllers else { return currentPage + 1 }
325325

326326
return currentPage + 1 > controllers.count - 1 ? 0 : currentPage + 1
@@ -334,7 +334,7 @@ extension PagingMenuController: PageDetectable {
334334
let order = Int(ceil((pagingViewController.contentScrollView.contentOffset.x - pageWidth / 2) / pageWidth))
335335

336336
if let menuOptions = menuOptions,
337-
case .Infinite = menuOptions.mode {
337+
case .Infinite = menuOptions.displayMode {
338338
return PagingViewPosition(order: order)
339339
}
340340

@@ -379,7 +379,7 @@ extension PagingMenuController: GestureHandler {
379379
func addSwipeGestureHandler() {
380380
guard let menuOptions = menuOptions else { return }
381381

382-
switch menuOptions.mode {
382+
switch menuOptions.displayMode {
383383
case .Standard(_, _, .PagingEnabled): break
384384
case .Infinite(_, .PagingEnabled): break
385385
default: return
@@ -398,7 +398,7 @@ extension PagingMenuController: GestureHandler {
398398
let menuOptions = menuOptions else { return }
399399

400400
let newPage: Int
401-
switch menuOptions.mode {
401+
switch menuOptions.displayMode {
402402
case .Standard(_, _, .PagingEnabled):
403403
newPage = page < currentPage ? menuView.currentPage - 1 : menuView.currentPage + 1
404404
case .Infinite(_, .PagingEnabled):
@@ -420,7 +420,7 @@ extension PagingMenuController: GestureHandler {
420420
let menuOptions = menuOptions else { return }
421421

422422
let newPage: Int
423-
switch (recognizer.direction, menuOptions.mode) {
423+
switch (recognizer.direction, menuOptions.displayMode) {
424424
case (UISwipeGestureRecognizerDirection.Left, .Infinite):
425425
newPage = menuView.nextPage
426426
case (UISwipeGestureRecognizerDirection.Left, _):

‎Pod/Classes/PagingViewController.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public class PagingViewController: UIViewController {
142142
controllers.count == MinimumSupportedViewCount || options.menuControllerSet == MenuControllerSet.Single {
143143
horizontalVisualFormat = "H:|[pagingView(==contentScrollView)]|"
144144
} else {
145-
if case .All(let menuOptions, _) = options.componentType, case .Infinite = menuOptions.mode {
145+
if case .All(let menuOptions, _) = options.componentType, case .Infinite = menuOptions.displayMode {
146146
if index == currentPage {
147147
viewsDictionary["previousPagingView"] = controllers[previousPage].view
148148
viewsDictionary["nextPagingView"] = controllers[nextPage].view
@@ -198,12 +198,12 @@ extension PagingViewController: Pagable {
198198
return currentIndex
199199
}
200200
var previousPage: Int {
201-
guard case .All(let menuOptions, _) = options.componentType, case .Infinite = menuOptions.mode else { return currentPage - 1 }
201+
guard case .All(let menuOptions, _) = options.componentType, case .Infinite = menuOptions.displayMode else { return currentPage - 1 }
202202

203203
return currentPage - 1 < 0 ? menuOptions.itemsOptions.count - 1 : currentPage - 1
204204
}
205205
var nextPage: Int {
206-
guard case .All(let menuOptions, _) = options.componentType, case .Infinite = menuOptions.mode else { return currentPage + 1 }
206+
guard case .All(let menuOptions, _) = options.componentType, case .Infinite = menuOptions.displayMode else { return currentPage + 1 }
207207

208208
return currentPage + 1 > menuOptions.itemsOptions.count - 1 ? 0 : currentPage + 1
209209
}
@@ -235,7 +235,7 @@ extension PagingViewController: PageLoadable {
235235
guard page == currentPage else { return false }
236236
case (_, .Three):
237237
if case .All(let menuOptions, _) = options.componentType,
238-
case .Infinite = menuOptions.mode {
238+
case .Infinite = menuOptions.displayMode {
239239
guard page == currentPage ||
240240
page == previousPage ||
241241
page == nextPage else { return false }
@@ -264,7 +264,7 @@ extension PagingViewController: PageLoadable {
264264
private func shouldWaitForLayout() -> Bool {
265265
switch options.componentType {
266266
case .All(let menuOptions, _):
267-
guard case .Infinite = menuOptions.mode else { return false }
267+
guard case .Infinite = menuOptions.displayMode else { return false }
268268
return true
269269
default: break
270270
}

‎Pod/Classes/Protocols/MenuItemViewCustomizable.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ import Foundation
1010

1111
public protocol MenuItemViewCustomizable {
1212
var horizontalMargin: CGFloat { get }
13-
var mode: MenuItemMode { get }
13+
var displayMode: MenuItemDisplayMode { get }
1414
}
1515

1616
public extension MenuItemViewCustomizable {
1717
var horizontalMargin: CGFloat {
1818
return 20
1919
}
20-
var mode: MenuItemMode {
20+
var displayMode: MenuItemDisplayMode {
2121
let title = MenuItemText()
2222
return .Text(title: title)
2323
}
2424
}
2525

26-
public enum MenuItemMode {
26+
public enum MenuItemDisplayMode {
2727
case Text(title: MenuItemText)
2828
case MultilineText(title: MenuItemText, description: MenuItemText)
2929
case Image(image: UIImage, selectedImage: UIImage?)

‎Pod/Classes/Protocols/MenuViewCustomizable.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public protocol MenuViewCustomizable {
1515
var animationDuration: NSTimeInterval { get }
1616
var deceleratingRate: CGFloat { get }
1717
var selectedItemCenter: Bool { get }
18-
var mode: MenuViewMode { get }
18+
var displayMode: MenuDisplayMode { get }
1919
var focusMode: MenuFocusMode { get }
2020
var dummyItemViewsSet: Int { get }
2121
var menuPosition: MenuPosition { get }
@@ -42,7 +42,7 @@ public extension MenuViewCustomizable {
4242
var selectedItemCenter: Bool {
4343
return true
4444
}
45-
var mode: MenuViewMode {
45+
var displayMode: MenuDisplayMode {
4646
return .Standard(widthMode: .Flexible, centerItem: false, scrollingMode: .PagingEnabled)
4747
}
4848
var focusMode: MenuFocusMode {
@@ -59,7 +59,7 @@ public extension MenuViewCustomizable {
5959
}
6060
}
6161

62-
public enum MenuViewMode {
62+
public enum MenuDisplayMode {
6363
case Standard(widthMode: MenuItemWidthMode, centerItem: Bool, scrollingMode: MenuScrollingMode)
6464
case SegmentedControl
6565
case Infinite(widthMode: MenuItemWidthMode, scrollingMode: MenuScrollingMode)

‎Pod/Classes/Protocols/PagingValidator.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ extension PagingValidator {
4646

4747
private func validateInfiniteMenuItemNumbers(options: PagingMenuControllerCustomizable) {
4848
guard case .All(let menuOptions, _) = options.componentType,
49-
case .Infinite = menuOptions.mode else { return }
49+
case .Infinite = menuOptions.displayMode else { return }
5050
guard menuOptions.itemsOptions.count < VisiblePagingViewNumber else { return }
5151

5252
raise("number of view controllers should be more than three with Infinite display mode")

0 commit comments

Comments
 (0)