Moves implementation back to SLKTextInputbar

Author: ignacio

Source/Classes/SLKTextInputbar.h

@@ -57,6 +57,12 @@ typedef NS_ENUM(NSUInteger, SLKCounterPosition) {
 /** The inner padding to use when laying out content in the view. Default is {5, 8, 5, 8}. */
 @property (nonatomic, assign) UIEdgeInsets contentInset;
 
+/** The minimum height based on the intrinsic content size's. */
+@property (nonatomic, readonly) CGFloat minimumInputbarHeight;
+
+/** The most appropriate height calculated based on the amount of lines of text and other factors. */
+@property (nonatomic, readonly) CGFloat appropriateHeight;
+
 
 #pragma mark - Initialization
 ///------------------------------------------------

Source/Classes/SLKTextInputbar.m

@@ -242,17 +242,66 @@ - (UILabel *)charCountLabel
     return _charCountLabel;
 }
 
-- (NSUInteger)slk_defaultNumberOfLines
+- (BOOL)isViewVisible
 {
-    if (SLK_IS_IPAD) {
-        return 8;
+    SEL selector = NSSelectorFromString(@"isViewVisible");
+    
+    if ([self.controller respondsToSelector:selector]) {
+        
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+        BOOL visible = (BOOL)[self.controller performSelector:selector];
+#pragma clang diagnostic pop
+        
+        return visible;
     }
-    if (SLK_IS_IPHONE4) {
-        return 4;
+    return NO;
+}
+
+- (CGFloat)minimumInputbarHeight
+{
+    return self.intrinsicContentSize.height;
+}
+
+- (CGFloat)appropriateHeight
+{
+    CGFloat height = 0.0;
+    CGFloat minimumHeight = [self minimumInputbarHeight];
+    
+    if (self.textView.numberOfLines == 1) {
+        height = minimumHeight;
+    }
+    else if (self.textView.numberOfLines < self.textView.maxNumberOfLines) {
+        height = [self slk_inputBarHeightForLines:self.textView.numberOfLines];
     }
     else {
-        return 6;
+        height = [self slk_inputBarHeightForLines:self.textView.maxNumberOfLines];
+    }
+    
+    if (height < minimumHeight) {
+        height = minimumHeight;
+    }
+    
+    if (self.isEditing) {
+        height += self.editorContentViewHeight;
     }
+    
+    return roundf(height);
+}
+
+- (CGFloat)slk_deltaInputbarHeight
+{
+    return self.textView.intrinsicContentSize.height-self.textView.font.lineHeight;
+}
+
+- (CGFloat)slk_inputBarHeightForLines:(NSUInteger)numberOfLines
+{
+    CGFloat height = [self slk_deltaInputbarHeight];
+    
+    height += roundf(self.textView.font.lineHeight*numberOfLines);
+    height += self.contentInset.top+self.contentInset.bottom;
+    
+    return height;
 }
 
 - (BOOL)limitExceeded
@@ -285,24 +334,20 @@ - (CGFloat)slk_appropriateRightButtonMargin
             return 0.0;
         }
     }
-    
     return self.contentInset.right;
 }
 
-- (BOOL)isViewVisible
+- (NSUInteger)slk_defaultNumberOfLines
 {
-    SEL selector = NSSelectorFromString(@"isViewVisible");
-    
-    if ([self.controller respondsToSelector:selector]) {
-        
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-        BOOL visible = (BOOL)[self.controller performSelector:selector];
-#pragma clang diagnostic pop
-        
-        return visible;
+    if (SLK_IS_IPAD) {
+        return 8;
+    }
+    if (SLK_IS_IPHONE4) {
+        return 4;
+    }
+    else {
+        return 6;
     }
-    return NO;
 }
 
 

Source/Classes/SLKTextViewController.m

@@ -381,52 +381,6 @@ - (UIModalPresentationStyle)modalPresentationStyle
     return [super modalPresentationStyle];
 }
 
-- (CGFloat)slk_deltaInputbarHeight
-{
-    return self.textView.intrinsicContentSize.height-self.textView.font.lineHeight;
-}
-
-- (CGFloat)slk_minimumInputbarHeight
-{
-    return self.textInputbar.intrinsicContentSize.height;
-}
-
-- (CGFloat)slk_inputBarHeightForLines:(NSUInteger)numberOfLines
-{
-    CGFloat height = [self slk_deltaInputbarHeight];
-    
-    height += roundf(self.textView.font.lineHeight*numberOfLines);
-    height += self.textInputbar.contentInset.top+self.textInputbar.contentInset.bottom;
-    
-    return height;
-}
-
-- (CGFloat)slk_appropriateInputbarHeight
-{
-    CGFloat height = 0.0;
-    CGFloat minimumHeight = [self slk_minimumInputbarHeight];
-    
-    if (self.textView.numberOfLines == 1) {
-        height = minimumHeight;
-    }
-    else if (self.textView.numberOfLines < self.textView.maxNumberOfLines) {
-        height = [self slk_inputBarHeightForLines:self.textView.numberOfLines];
-    }
-    else {
-        height = [self slk_inputBarHeightForLines:self.textView.maxNumberOfLines];
-    }
-    
-    if (height < minimumHeight) {
-        height = minimumHeight;
-    }
-    
-    if (self.textInputbar.isEditing) {
-        height += self.textInputbar.editorContentViewHeight;
-    }
-    
-    return roundf(height);
-}
-
 - (CGFloat)slk_appropriateKeyboardHeight:(NSNotification *)notification
 {
     CGFloat keyboardHeight = 0.0;
@@ -724,11 +678,11 @@ - (void)textWillUpdate
 
 - (void)textDidUpdate:(BOOL)animated
 {
+    CGFloat inputbarHeight = self.textInputbar.appropriateHeight;
+    
     self.textInputbar.rightButton.enabled = [self canPressRightButton];
     self.textInputbar.editortRightButton.enabled = [self canPressRightButton];
 
-    CGFloat inputbarHeight = [self slk_appropriateInputbarHeight];
-    
     if (inputbarHeight != self.textInputbarHC.constant)
     {
         self.textInputbarHC.constant = inputbarHeight;
@@ -1876,7 +1830,7 @@ - (void)slk_setupViewConstraints
     self.textInputbarHC = [self.view slk_constraintForAttribute:NSLayoutAttributeHeight firstItem:self.textInputbar secondItem:nil];
     self.keyboardHC = [self.view slk_constraintForAttribute:NSLayoutAttributeBottom firstItem:self.view secondItem:self.textInputbar];
 
-    self.textInputbarHC.constant = [self slk_minimumInputbarHeight];
+    self.textInputbarHC.constant = self.textInputbar.minimumInputbarHeight;
     self.scrollViewHC.constant = [self slk_appropriateScrollViewHeight];
 
     if (self.textInputbar.isEditing) {