Refactors the QuickType bar detection and implementation for disabling it on auto-completion.

dzenbot · dzenbot · commit 47aba94df5ac · 2014-11-02T23:31:02.000-03:00
diff --git a/Source/Additions/SLKUIConstants.h b/Source/Additions/SLKUIConstants.h
@@ -26,12 +26,6 @@
 #define SLK_INPUT_ACCESSORY_DEBUG 0             // Renders a translucent red area representing the keyboard accessory view
 #define SLK_KEYBOARD_NOTIFICATION_DEBUG 0       // Logs every keyboard notification being sent
 
-typedef NS_ENUM(NSUInteger, SLKQuicktypeBarMode) {
-    SLKQuicktypeBarModeHidden,
-    SLKQuicktypeBarModeCollapsed,
-    SLKQuicktypeBarModeExpanded,
-};
-
 inline static CGFloat minimumKeyboardHeight()
 {
     if (UI_IS_IPAD) {
@@ -48,61 +42,6 @@ inline static CGFloat minimumKeyboardHeight()
     }
 }
 
-inline static CGFloat SLKQuicktypeBarHeightForMode(SLKQuicktypeBarMode mode)
-{
-    if (UI_IS_IPAD) {
-        switch (mode) {
-            case SLKQuicktypeBarModeHidden:
-                return 0.f;
-                
-            case SLKQuicktypeBarModeCollapsed:
-                return 10.f;
-                
-            case SLKQuicktypeBarModeExpanded :
-                return 39.f;
-        }
-    }
-    if (UI_IS_IPHONE6PLUS) {
-        switch (mode) {
-            case SLKQuicktypeBarModeHidden:
-                return 0.f;
-                
-            case SLKQuicktypeBarModeCollapsed:
-                return 9.f;
-                
-            case SLKQuicktypeBarModeExpanded :
-                if (UI_IS_LANDSCAPE) return 32.f;
-                else return 45.f;
-        }
-    }
-    else {
-        switch (mode) {
-            case SLKQuicktypeBarModeHidden:
-                return 0.f;
-                
-            case SLKQuicktypeBarModeCollapsed:
-                return 8.f;
-                
-            case SLKQuicktypeBarModeExpanded :
-                if (UI_IS_LANDSCAPE) return 31.f;
-                else return 37.f;
-        }
-    }
-}
-
-inline static SLKQuicktypeBarMode SLKQuicktypeBarModeForHeight(CGFloat height)
-{
-    if (height > 0.f && height <= 10.f) {
-        return SLKQuicktypeBarModeCollapsed;
-    }
-    
-    if (height > 10.f && height <= 45.f) {
-        return SLKQuicktypeBarModeExpanded ;
-    }
-    
-    return SLKQuicktypeBarModeHidden;
-}
-
 inline static CGRect SLKRectInvert(CGRect rect)
 {
     CGRect invert = CGRectZero;
diff --git a/Source/Classes/SLKTextViewController.m b/Source/Classes/SLKTextViewController.m
@@ -309,6 +309,16 @@ - (BOOL)isPresentedInPopover
     return _presentedInPopover && UI_IS_IPAD;
 }
 
+- (BOOL)isQuickTypeBarVisible
+{
+    CGFloat quickTypeBarHeight = self.keyboardHC.constant-minimumKeyboardHeight();
+    
+    if (UI_IS_IOS8_AND_HIGHER && quickTypeBarHeight > 0.0 && self.textView.autocorrectionType != UITextAutocorrectionTypeNo) {
+        return YES;
+    }
+    return NO;
+}
+
 - (SLKTextView *)textView
 {
     return self.textInputbar.textView;
@@ -532,14 +542,6 @@ - (void)setAutoCompleting:(BOOL)autoCompleting
     _autoCompleting = autoCompleting;
     
     self.scrollViewProxy.scrollEnabled = !autoCompleting;
-    
-    if (UI_IS_IOS8_AND_HIGHER) {
-        // Updates the iOS8 QuickType bar mode based on the keyboard height constant
-        CGFloat quicktypeBarHeight = self.keyboardHC.constant-minimumKeyboardHeight();
-        
-        // Updates the QuickType bar mode based on the keyboard height constant
-        self.quicktypeBarMode = SLKQuicktypeBarModeForHeight(quicktypeBarHeight);
-    }
 }
 
 - (void)setInverted:(BOOL)inverted
@@ -636,6 +638,11 @@ - (void)textWillUpdate
 
 - (void)textDidUpdate:(BOOL)animated
 {
+    // Disables animation if not first responder
+    if (![self.textView isFirstResponder]) {
+        animated = NO;
+    }
+    
     self.textInputbar.rightButton.enabled = [self canPressRightButton];
     self.textInputbar.editortRightButton.enabled = [self canPressRightButton];
     
@@ -872,8 +879,7 @@ - (void)scrollToBottomIfNeeded
 
 - (void)enableTypingSuggestionIfNeeded
 {
-    // Skips if the QuickType Bar is minimised
-    if (self.quicktypeBarMode == SLKQuicktypeBarModeCollapsed) {
+    if (![self.textView isFirstResponder]) {
         return;
     }
     
@@ -883,8 +889,12 @@ - (void)enableTypingSuggestionIfNeeded
         enable = NO;
     }
     
-    // On iOS8, when the predictive mode is enabled, the QuicktypeBar is hidden
-    // On iOS7, it should always disable auto-correction and spell checking if autocompletion is enabled.
+    // Skips if the QuickType Bar isn't visible and it's trying to disable it. And the inverted logic.
+    if (UI_IS_IOS8_AND_HIGHER && ((enable == NO && !self.isQuickTypeBarVisible) || (enable == YES && self.isQuickTypeBarVisible))) {
+        return;
+    }
+    
+    // During text autocompletion, the iOS 8 QuickType bar is hidden and auto-correction and spell checking are disabled.
     [self.textView setTypingSuggestionEnabled:enable];
 }
 
diff --git a/Source/Docs/UIKeyboard_constants.txt b/Source/Docs/UIKeyboard_constants.txt
