diff --git a/HidingNavigationBar/HidingNavigationBarManager.swift b/HidingNavigationBar/HidingNavigationBarManager.swift index ae594d8..936d56d 100644 --- a/HidingNavigationBar/HidingNavigationBarManager.swift +++ b/HidingNavigationBar/HidingNavigationBarManager.swift @@ -31,7 +31,7 @@ class HidingNavigationBarManager: NSObject, UIScrollViewDelegate, UIGestureRecog var extensionView: UIView? // Control the resistance when scrolling up/down before the navbar expands/contracts again. - var expansionResistance: CGFloat = 200 + var expansionResistance: CGFloat = 0 private var contractionResistance: CGFloat = 0 var delegate: HidingNavigationBarManagerDelegate? diff --git a/HidingNavigationBarSample/HidingNavigationBarSample/HidingNavExtensionViewController.swift b/HidingNavigationBarSample/HidingNavigationBarSample/HidingNavExtensionViewController.swift index cc288e7..a827a00 100644 --- a/HidingNavigationBarSample/HidingNavigationBarSample/HidingNavExtensionViewController.swift +++ b/HidingNavigationBarSample/HidingNavigationBarSample/HidingNavExtensionViewController.swift @@ -24,7 +24,13 @@ class HidingNavExtensionViewController: UIViewController, UITableViewDataSource, view.addSubview(tableView) let extensionView = UIView(frame: CGRectMake(0, 0, view.frame.size.width, 40)) - extensionView.backgroundColor = UIColor(red: 35/255, green: 255/255, blue: 127/255, alpha: 1) + extensionView.layer.borderColor = UIColor.lightGrayColor().CGColor + extensionView.layer.borderWidth = 1 + extensionView.backgroundColor = UIColor(white: 230/255, alpha: 1) + let label = UILabel(frame: extensionView.frame) + label.text = "Extension View" + label.textAlignment = NSTextAlignment.Center + extensionView.addSubview(label) hidingNavBarManager = HidingNavigationBarManager(viewController: self, scrollView: tableView) hidingNavBarManager?.addExtensionView(extensionView) diff --git a/HidingNavigationBarSample/HidingNavigationBarSample/HidingNavTabViewController.swift b/HidingNavigationBarSample/HidingNavigationBarSample/HidingNavTabViewController.swift index f488cae..efb1ee4 100644 --- a/HidingNavigationBarSample/HidingNavigationBarSample/HidingNavTabViewController.swift +++ b/HidingNavigationBarSample/HidingNavigationBarSample/HidingNavTabViewController.swift @@ -30,6 +30,7 @@ class HidingNavTabViewController: UIViewController, UITableViewDataSource, UITab hidingNavBarManager = HidingNavigationBarManager(viewController: self, scrollView: tableView) if let tabBar = navigationController?.tabBarController?.tabBar { hidingNavBarManager?.manageBottomBar(tabBar) + tabBar.barTintColor = UIColor(white: 230/255, alpha: 1) } } diff --git a/HidingNavigationBarSample/HidingNavigationBarSample/HidingNavToolbarViewController.swift b/HidingNavigationBarSample/HidingNavigationBarSample/HidingNavToolbarViewController.swift index abfec52..d1841dd 100644 --- a/HidingNavigationBarSample/HidingNavigationBarSample/HidingNavToolbarViewController.swift +++ b/HidingNavigationBarSample/HidingNavigationBarSample/HidingNavToolbarViewController.swift @@ -25,7 +25,7 @@ class HidingNavToolbarViewController: UIViewController, UITableViewDataSource, U view.addSubview(tableView) toolbar = UIToolbar(frame: CGRectMake(0, view.bounds.size.height - 44, view.bounds.width, 44)) - toolbar.barTintColor = UIColor(red: 35/255, green: 255/255, blue: 127/255, alpha: 1) + toolbar.barTintColor = UIColor(white: 230/255, alpha: 1) view.addSubview(toolbar) hidingNavBarManager = HidingNavigationBarManager(viewController: self, scrollView: tableView) diff --git a/screenshots/hidingNav.gif b/screenshots/hidingNav.gif index eb6e1a6..031f3a9 100644 Binary files a/screenshots/hidingNav.gif and b/screenshots/hidingNav.gif differ diff --git a/screenshots/hidingNavExtension.gif b/screenshots/hidingNavExtension.gif index c5b2488..734fa71 100644 Binary files a/screenshots/hidingNavExtension.gif and b/screenshots/hidingNavExtension.gif differ diff --git a/screenshots/hidingNavTabBar.gif b/screenshots/hidingNavTabBar.gif index 46e2320..3b6f2cb 100644 Binary files a/screenshots/hidingNavTabBar.gif and b/screenshots/hidingNavTabBar.gif differ diff --git a/screenshots/hidingNavToolbar.gif b/screenshots/hidingNavToolbar.gif index 6e23277..2841b4c 100644 Binary files a/screenshots/hidingNavToolbar.gif and b/screenshots/hidingNavToolbar.gif differ