From 9980266b6213b0678e45a79465de0cb9d910d949 Mon Sep 17 00:00:00 2001 From: Jesse Squires Date: Fri, 19 Dec 2014 15:42:21 -0500 Subject: [PATCH] address code review comments from PR #646, ref #645, #314, #640 --- .../Controllers/JSQMessagesKeyboardController.h | 4 +--- .../Controllers/JSQMessagesKeyboardController.m | 5 +---- .../Controllers/JSQMessagesViewController.m | 6 +++--- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/JSQMessagesViewController/Controllers/JSQMessagesKeyboardController.h b/JSQMessagesViewController/Controllers/JSQMessagesKeyboardController.h index 2b72f4b14..d2578c6bd 100644 --- a/JSQMessagesViewController/Controllers/JSQMessagesKeyboardController.h +++ b/JSQMessagesViewController/Controllers/JSQMessagesKeyboardController.h @@ -59,14 +59,12 @@ FOUNDATION_EXPORT NSString * const JSQMessagesKeyboardControllerUserInfoKeyKeybo */ - (void)keyboardController:(JSQMessagesKeyboardController *)keyboardController keyboardDidChangeFrame:(CGRect)keyboardFrame; -@optional - /** * Tells the delegate that the keyboard has been hidden. * * @param keyboardController The keyboard controller that is notifying the delegate. */ -- (void)keyboardControllerDidReceiveKeyboardHideNotification:(JSQMessagesKeyboardController *)keyboardController; +- (void)keyboardControllerKeyboardDidHide:(JSQMessagesKeyboardController *)keyboardController; @end diff --git a/JSQMessagesViewController/Controllers/JSQMessagesKeyboardController.m b/JSQMessagesViewController/Controllers/JSQMessagesKeyboardController.m index 8fabacc8e..8a4e160d8 100644 --- a/JSQMessagesViewController/Controllers/JSQMessagesKeyboardController.m +++ b/JSQMessagesViewController/Controllers/JSQMessagesKeyboardController.m @@ -214,10 +214,7 @@ - (void)jsq_didReceiveKeyboardDidHideNotification:(NSNotification *)notification [self jsq_handleKeyboardNotification:notification completion:^(BOOL finished) { [self.panGestureRecognizer removeTarget:self action:NULL]; - if ([self.delegate respondsToSelector:@selector(keyboardControllerDidReceiveKeyboardHideNotification:)]) { - [self.delegate keyboardControllerDidReceiveKeyboardHideNotification:self]; - } - + [self.delegate keyboardControllerKeyboardDidHide:self]; }]; } diff --git a/JSQMessagesViewController/Controllers/JSQMessagesViewController.m b/JSQMessagesViewController/Controllers/JSQMessagesViewController.m index 3363d0d33..d00341dc6 100644 --- a/JSQMessagesViewController/Controllers/JSQMessagesViewController.m +++ b/JSQMessagesViewController/Controllers/JSQMessagesViewController.m @@ -768,10 +768,10 @@ - (void)keyboardController:(JSQMessagesKeyboardController *)keyboardController k } -- (void)keyboardControllerDidReceiveKeyboardHideNotification:(JSQMessagesKeyboardController *)keyboardController { - +- (void)keyboardControllerKeyboardDidHide:(JSQMessagesKeyboardController *)keyboardController +{ [self jsq_setToolbarBottomLayoutGuideConstant:0.0f]; - + [self.inputToolbar.contentView.textView resignFirstResponder]; } - (void)jsq_setToolbarBottomLayoutGuideConstant:(CGFloat)constant