Merge branch 'master' into AllowDisableNavBarCover

Author: dwas

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.2.7 Release notes (2017-04-13)
+
+## Enhancements
+
+* fixed bug 
+
 # 0.2.6 Release notes (2017-03-30)
 
 ## Enhancements

Demo/TabPageViewControllerDemo/ViewController.swift

@@ -29,8 +29,8 @@ class ViewController: UIViewController {
         tc.tabItems = [(vc1, "First"), (vc2, "Second")]
         var option = TabPageOption()
         option.tabWidth = view.frame.width / CGFloat(tc.tabItems.count)
+        option.hidesTopViewOnSwipeType = .all
         tc.option = option
-        tc.option.hidesTabBarOnSwipe = true
         navigationController?.pushViewController(tc, animated: true)
     }
 

Sources/TabPageOption.swift

@@ -8,6 +8,13 @@
 
 import UIKit
 
+public enum HidesTopContentsOnSwipeType {
+    case none
+    case tabBar
+    case navigationBar
+    case all
+}
+
 public struct TabPageOption {
 
     public init() {}
@@ -22,7 +29,7 @@ public struct TabPageOption {
     public var tabBackgroundColor: UIColor = .white
     public var pageBackgoundColor: UIColor = UIColor.white
     public var isTranslucent: Bool = true
-    public var hidesTabBarOnSwipe: Bool = false
+    public var hidesTopViewOnSwipeType: HidesTopContentsOnSwipeType = .none
     public var coverNavBar: Bool = false
 
     internal var tabBarAlpha: CGFloat {

Sources/TabPageViewController.swift

@@ -240,12 +240,25 @@ extension TabPageViewController {
     public func updateNavigationBarHidden(_ hidden: Bool, animated: Bool) {
         guard let navigationController = navigationController else { return }
 
-        if option.hidesTabBarOnSwipe {
+        switch option.hidesTopViewOnSwipeType {
+        case .tabBar:
             updateTabBarOrigin(hidden: hidden)
+        case .navigationBar:
+            if hidden {
+                navigationController.setNavigationBarHidden(true, animated: true)
+            } else {
+                showNavigationBar()
+            }
+        case .all:
+            updateTabBarOrigin(hidden: hidden)
+            if hidden {
+                navigationController.setNavigationBarHidden(true, animated: true)
+            } else {
+                showNavigationBar()
+            }
+        default:
+            break
         }
-
-        navigationController.setNavigationBarHidden(hidden, animated: animated)
-
         if statusView == nil {
             setupStatusView()
         }
@@ -258,7 +271,7 @@ extension TabPageViewController {
         guard navigationController.isNavigationBarHidden  else { return }
         guard let tabBarTopConstraint = tabBarTopConstraint else { return }
 
-        if option.hidesTabBarOnSwipe {
+        if option.hidesTopViewOnSwipeType != .none {
             tabBarTopConstraint.constant = 0.0
             UIView.animate(withDuration: TimeInterval(UINavigationControllerHideShowBarDuration)) {
                 self.view.layoutIfNeeded()

Sources/TabView.swift

@@ -255,9 +255,8 @@ extension TabView {
                     if !animated && shouldScroll {
                         cell.isCurrent = true
                     }
-                    if !self.isInfinity {
-                        self.updateCollectionViewUserInteractionEnabled(true)
-                    }
+                    
+                    self.updateCollectionViewUserInteractionEnabled(true)
             })
         }
         beforeIndex = currentIndex

TabPageViewController.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "TabPageViewController"
-  s.version          = "0.2.6"
+  s.version          = "0.2.7"
   s.summary          = "Custom UIPageViewController"
 
 # This description is used to generate tags and improve search results.

TabPageViewController.xcodeproj/TabPageViewController_Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.6</string>
+	<string>0.2.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>