Merge pull request #275 from kitasuke/swift3.0

Swift3.0

Author: kitasuke

Pod/Classes/MenuItemView.swift

@@ -23,12 +23,12 @@ open class MenuItemView: UIView {
             addSubview(customView)
         }
     }
-    open internal(set) var selected: Bool = false {
+    open internal(set) var isSelected: Bool = false {
         didSet {
             if case .roundRect = menuOptions.focusMode {
                 backgroundColor = UIColor.clear
             } else {
-                backgroundColor = selected ? menuOptions.selectedBackgroundColor : menuOptions.backgroundColor
+                backgroundColor = isSelected ? menuOptions.selectedBackgroundColor : menuOptions.backgroundColor
             }
 
             switch menuItemOptions.displayMode {
@@ -46,7 +46,7 @@ open class MenuItemView: UIView {
                 widthConstraint.constant = calculateLabelSize(titleLabel, maxWidth: maxWindowSize).width
                 descriptionWidthConstraint.constant = calculateLabelSize(descriptionLabel, maxWidth: maxWindowSize).width
             case let .image(image, selectedImage):
-                menuImageView.image = selected ? (selectedImage ?? image) : image
+                menuImageView.image = isSelected ? (selectedImage ?? image) : image
             case .custom: break
             }
         }
@@ -167,8 +167,8 @@ open class MenuItemView: UIView {
     }
 
     fileprivate func updateLabel(_ label: UILabel, text: MenuItemText) {
-        label.textColor = selected ? text.selectedColor : text.color
-        label.font = selected ? text.selectedFont : text.font
+        label.textColor = isSelected ? text.selectedColor : text.color
+        label.font = isSelected ? text.selectedFont : text.font
     }
 
     fileprivate func setupImageView(_ image: UIImage) {

Pod/Classes/MenuView.swift

@@ -312,18 +312,18 @@ open class MenuView: UIScrollView {
     }
 
     fileprivate func focusMenuItem() {
-        let selected: (MenuItemView) -> Bool = { self.menuItemViews.index(of: $0) == self.currentPage }
+        let isSelected: (MenuItemView) -> Bool = { self.menuItemViews.index(of: $0) == self.currentPage }
 
         // make selected item focused
         menuItemViews.forEach {
-            $0.selected = selected($0)
-            if $0.selected {
+            $0.isSelected = isSelected($0)
+            if $0.isSelected {
                 self.currentMenuItemView = $0
             }
         }
 
         // make selected item foreground
-        sortedMenuItemViews.forEach { $0.layer.zPosition = selected($0) ? 0 : -1 }
+        sortedMenuItemViews.forEach { $0.layer.zPosition = isSelected($0) ? 0 : -1 }
 
         setNeedsLayout()
         layoutIfNeeded()

Pod/Classes/PagingViewController.swift

@@ -75,7 +75,7 @@ open class PagingViewController: UIViewController {
 
     fileprivate func setupContentScrollView() {
         contentScrollView.backgroundColor = options.backgroundColor
-        contentScrollView.isScrollEnabled = options.scrollEnabled
+        contentScrollView.isScrollEnabled = options.isScrollEnabled
         view.addSubview(contentScrollView)
     }
 

Pod/Classes/Protocols/PagingMenuControllerCustomizable.swift

@@ -11,7 +11,7 @@ import Foundation
 public protocol PagingMenuControllerCustomizable {
     var defaultPage: Int { get }
     var animationDuration: TimeInterval { get }
-    var scrollEnabled: Bool { get }
+    var isScrollEnabled: Bool { get }
     var backgroundColor: UIColor { get }
     var lazyLoadingPage: LazyLoadingPage { get }
     var menuControllerSet: MenuControllerSet { get }
@@ -25,7 +25,7 @@ public extension PagingMenuControllerCustomizable {
     var animationDuration: TimeInterval {
         return 0.3
     }
-    var scrollEnabled: Bool {
+    var isScrollEnabled: Bool {
         return true
     }
     var backgroundColor: UIColor {