Merge pull request #394 from slackhq/revert-390-textbar-dismissal-public

Revert "Make dismissTextInputBar method public"

Author: Tosin Afolabi

Source/SLKTextViewController.h

@@ -208,16 +208,6 @@ NS_CLASS_AVAILABLE_IOS(7_0) @interface SLKTextViewController : UIViewController
  */
 - (void)dismissKeyboard:(BOOL)animated;
 
-/**
- Dismisses the text input bar, if not already
- 
- The recommended method to use is forceTextInputbarAdjustmentForResponder:
- Only if that doesn't dismiss the textInputBar should this be used.
- 
- @param animated YES if the textInputBar should be dismissed using an animation.
- */
-- (void)dismissTextInputbar:(BOOL)animated;
-
 /**
  Verifies if the text input bar should still move up/down even if it is not first responder. Default is NO.
  You can override this method to perform additional tasks associated with presenting the view.

Source/SLKTextViewController.m

@@ -892,32 +892,6 @@ - (void)setTextInputbarHidden:(BOOL)hidden animated:(BOOL)animated
     }
 }
 
-- (void)dismissTextInputbar:(BOOL)animated
-{
-    if (self.keyboardHC.constant == 0) {
-        return;
-    }
-    
-    __weak typeof(self) weakSelf = self;
-    
-    [self slk_hideAutoCompletionViewIfNeeded];
-    
-    void (^animations)() = ^void(){
-        
-        weakSelf.keyboardHC.constant = 0.0;
-        weakSelf.scrollViewHC.constant = [weakSelf slk_appropriateScrollViewHeight];
-
-        [weakSelf.view layoutIfNeeded];
-    };
-    
-    if (animated) {
-        [UIView animateWithDuration:0.25 animations:animations completion:nil];
-    }
-    else {
-        animations();
-    }
-}
-
 
 #pragma mark - Private Methods
 
@@ -1186,6 +1160,20 @@ - (void)slk_enableTypingSuggestionIfNeeded
     [self.textView setTypingSuggestionEnabled:enable];
 }
 
+- (void)slk_dismissTextInputbarIfNeeded
+{
+    if (self.keyboardHC.constant == 0) {
+        return;
+    }
+    
+    self.keyboardHC.constant = 0.0;
+    self.scrollViewHC.constant = [self slk_appropriateScrollViewHeight];
+    
+    [self slk_hideAutoCompletionViewIfNeeded];
+    
+    [self.view layoutIfNeeded];
+}
+
 - (void)slk_detectKeyboardStatesInNotification:(NSNotification *)notification
 {
     // Tear down
@@ -1355,7 +1343,7 @@ - (void)slk_willShowOrHideKeyboard:(NSNotification *)notification
             return;
         }
         else if (![self forceTextInputbarAdjustmentForResponder:currentResponder]) {
-            return [self dismissTextInputbar:NO];
+            return [self slk_dismissTextInputbarIfNeeded];
         }
     }