Merge pull request #134 from arielpollack/master

Ability to use custom pull to refresh controls
telly · May 16, 2016 · c8b056d · c8b056d
2 parents c9df95a + fadc4d2
commit c8b056d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/TLYShyNavBar/ShyControllers/TLYShyScrollViewController.h b/TLYShyNavBar/ShyControllers/TLYShyScrollViewController.h
@@ -18,6 +18,8 @@
 @property (nonatomic, weak) UIRefreshControl *refreshControl;
 @property (nonatomic, weak) TLYShyViewController *parent;
 
+@property (nonatomic, assign) BOOL hasCustomRefreshControl;
+
 - (CGFloat)updateLayoutIfNeeded;
 
 @end
diff --git a/TLYShyNavBar/ShyControllers/TLYShyScrollViewController.m b/TLYShyNavBar/ShyControllers/TLYShyScrollViewController.m
@@ -36,7 +36,7 @@ - (CGFloat)updateLayoutIfNeeded
     {
         CGFloat delta = insets.top - self.scrollView.contentInset.top;
 
-        if (self.refreshControl == nil || [self.refreshControl isHidden]) {
+        if (!self.hasCustomRefreshControl && (self.refreshControl == nil || [self.refreshControl isHidden])) {
             [self.scrollView tly_setInsets:insets];
         }
 

diff --git a/TLYShyNavBar/TLYShyNavBarManager.h b/TLYShyNavBar/TLYShyNavBarManager.h
@@ -67,6 +67,10 @@
  */
 @property (nonatomic) TLYShyNavBarFade fadeBehavior;
 
+/* Use this to set if the controller have any kind of custom refresh control
+ */
+@property (nonatomic) BOOL hasCustomRefreshControl;
+
 /* Set NO to disable shyNavBar behavior temporarily.
  * Defaults to NO
  */

diff --git a/TLYShyNavBar/TLYShyNavBarManager.m b/TLYShyNavBar/TLYShyNavBarManager.m
@@ -196,6 +196,18 @@ - (void)setDisable:(BOOL)disable
     }
 }
 
+- (void)setHasCustomRefreshControl:(BOOL)hasCustomRefreshControl
+{
+    if (_hasCustomRefreshControl == hasCustomRefreshControl)
+    {
+        return;
+    }
+
+    _hasCustomRefreshControl = hasCustomRefreshControl;
+
+    self.scrollViewController.hasCustomRefreshControl = hasCustomRefreshControl;
+}
+
 - (BOOL)stickyNavigationBar
 {
     return self.navBarController.sticky;