Added showNavBarAnimated:

andreamazz · Mar 24, 2014 · 359c2ef · 359c2ef
1 parent 813f15d
commit 359c2ef
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 6 deletions.
diff --git a/AMScrollingNavbar/AMScrollingCollectionViewController.h b/AMScrollingNavbar/AMScrollingCollectionViewController.h
@@ -38,6 +38,14 @@
  */
 - (void)showNavbar;
 
+/** Navbar slide down
+ *
+ * Manually show the navbar
+ *
+ * @param animated Animates the navbar scrolling
+ */
+- (void)showNavBarAnimated:(BOOL)animated;
+
 /** Navbar refresh
  *
  * Use this method when you manually change the navbar items to re-enable the fadeout

diff --git a/AMScrollingNavbar/AMScrollingNavbarTableViewController.h b/AMScrollingNavbar/AMScrollingNavbarTableViewController.h
@@ -37,6 +37,14 @@
  */
 - (void)showNavbar;
 
+/** Navbar slide down
+ *
+ * Manually show the navbar
+ *
+ * @param animated Animates the navbar scrolling
+ */
+- (void)showNavBarAnimated:(BOOL)animated;
+
 /** Navbar refresh
  *
  * Use this method when you manually change the navbar items to re-enable the fadeout

diff --git a/AMScrollingNavbar/AMScrollingNavbarTableViewController.m b/AMScrollingNavbar/AMScrollingNavbarTableViewController.m
@@ -134,8 +134,9 @@ - (void)calculateConstants
     }
 }
 
-- (void)showNavbar
+- (void)showNavBarAnimated:(BOOL)animated
 {
+	NSTimeInterval interval = animated ? 0.2 : 0;
 	if (self.scrollableView != nil) {
 		if (self.isCollapsed) {
 			CGRect rect;
@@ -150,7 +151,7 @@ - (void)showNavbar
 			} else {
 				self.scrollableView.frame = rect;
 			}
-			[UIView animateWithDuration:0.2 animations:^{
+			[UIView animateWithDuration:interval animations:^{
 				self.lastContentOffset = 0;
 				[self scrollWithDelta:-self.compatibilityHeight];
 			}];
@@ -160,6 +161,11 @@ - (void)showNavbar
 	}
 }
 
+- (void)showNavbar
+{
+	[self showNavBarAnimated:YES];
+}
+
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
 {
 	return YES;

diff --git a/AMScrollingNavbar/AMScrollingNavbarViewController.h b/AMScrollingNavbar/AMScrollingNavbarViewController.h
@@ -39,6 +39,14 @@
  */
 - (void)showNavbar;
 
+/** Navbar slide down
+ *
+ * Manually show the navbar
+ *
+ * @param animated Animates the navbar scrolling
+ */
+- (void)showNavBarAnimated:(BOOL)animated;
+
 /** Navbar refresh
  *
  * Use this method when you manually change the navbar items to re-enable the fadeout

diff --git a/AMScrollingNavbar/AMScrollingNavbarViewController.m b/AMScrollingNavbar/AMScrollingNavbarViewController.m
@@ -134,8 +134,9 @@ - (void)calculateConstants
     }
 }
 
-- (void)showNavbar
+- (void)showNavBarAnimated:(BOOL)animated
 {
+	NSTimeInterval interval = animated ? 0.2 : 0;
 	if (self.scrollableView != nil) {
 		if (self.isCollapsed) {
 			CGRect rect;
@@ -150,7 +151,7 @@ - (void)showNavbar
 			} else {
 				self.scrollableView.frame = rect;
 			}
-			[UIView animateWithDuration:0.2 animations:^{
+			[UIView animateWithDuration:interval animations:^{
 				self.lastContentOffset = 0;
 				[self scrollWithDelta:-self.compatibilityHeight];
 			}];
@@ -160,6 +161,11 @@ - (void)showNavbar
 	}
 }
 
+- (void)showNavbar
+{
+	[self showNavBarAnimated:YES];
+}
+
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
 {
 	return YES;

diff --git a/AMScrollingNavbar/AMSrcollingCollectionViewController.m b/AMScrollingNavbar/AMSrcollingCollectionViewController.m
@@ -134,8 +134,9 @@ - (void)calculateConstants
     }
 }
 
-- (void)showNavbar
+- (void)showNavBarAnimated:(BOOL)animated
 {
+	NSTimeInterval interval = animated ? 0.2 : 0;
 	if (self.scrollableView != nil) {
 		if (self.isCollapsed) {
 			CGRect rect;
@@ -150,7 +151,7 @@ - (void)showNavbar
 			} else {
 				self.scrollableView.frame = rect;
 			}
-			[UIView animateWithDuration:0.2 animations:^{
+			[UIView animateWithDuration:interval animations:^{
 				self.lastContentOffset = 0;
 				[self scrollWithDelta:-self.compatibilityHeight];
 			}];
@@ -160,6 +161,11 @@ - (void)showNavbar
 	}
 }
 
+- (void)showNavbar
+{
+	[self showNavBarAnimated:YES];
+}
+
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
 {
 	return YES;