Respect safe area for "Reply to post" section on the Comments screen

Author: justtwago

Diff for: WordPress/Classes/ViewRelated/Reader/Comments/ReaderCommentsViewController.m

@@ -148,7 +148,7 @@ - (void)viewDidLoad
     [self configureSuggestionsTableView];
     [self configureKeyboardGestureRecognizer];
     [self configureViewConstraints];
-    [self configureKeyboardManager];
+    [self configureKeyboardObservers];
 }
 
 - (void)viewWillAppear:(BOOL)animated
@@ -195,6 +195,10 @@ - (void)viewWillDisappear:(BOOL)animated
     [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidBecomeActiveNotification object:nil];
 }
 
+- (void)dealloc {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
 - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator
 {
     [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
@@ -359,26 +363,57 @@ - (void)configureKeyboardGestureRecognizer
     [self.view addGestureRecognizer:self.tapOffKeyboardGesture];
 }
 
-- (void)configureKeyboardManager
+- (void)configureKeyboardObservers
 {
-    self.keyboardManager = [[KeyboardDismissHelper alloc] initWithParentView:self.view
-                                                                  scrollView:self.tableView
-                                                          dismissableControl:self.replyTextView
-                                                      bottomLayoutConstraint:self.replyTextViewBottomConstraint];
 
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(keyboardWillShow:)
+                                                 name:UIKeyboardWillShowNotification
+                                               object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(keyboardWillHide:)
+                                                 name:UIKeyboardWillHideNotification
+                                               object:nil];
+}
+
+- (void)keyboardWillShow:(NSNotification *)notification {
+    __weak ReaderCommentsViewController *weakSelf = self;
+    [weakSelf refreshNoResultsView];
+
+    CGRect keyboardFrame = [notification.userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
+    CGFloat keyboardHeight = CGRectGetHeight(keyboardFrame);
+    CGFloat tabBarHeight = self.tabBarController.tabBar.frame.size.height;
+
+    // Calculate the bottom inset, subtracting the tab bar height if the tab bar is not hidden
+    CGFloat bottomInset = keyboardHeight - (self.tabBarController.tabBar.isHidden ? 0 : tabBarHeight);
+
+    [self adjustReplyTextViewBottomConstraint:bottomInset];
+}
+
+- (void)keyboardWillHide:(NSNotification *)notification {
     __weak UITableView *weakTableView = self.tableView;
     __weak ReaderCommentsViewController *weakSelf = self;
-    self.keyboardManager.onWillHide = ^{
-        [weakTableView deselectSelectedRowWithAnimation:YES];
-        [weakSelf refreshNoResultsView];
-    };
-    self.keyboardManager.onWillShow = ^{
-        [weakSelf refreshNoResultsView];
-    };
+    [weakTableView deselectSelectedRowWithAnimation:YES];
+    [weakSelf refreshNoResultsView];
+
+    [self adjustReplyTextViewBottomConstraint:self.view.safeAreaInsets.bottom];
 }
 
 #pragma mark - Autolayout Helpers
 
+- (void)adjustReplyTextViewBottomConstraint:(CGFloat)bottomInset {
+    if (self.replyTextViewBottomConstraint) {
+        [self.view removeConstraint:self.replyTextViewBottomConstraint];
+    }
+
+    self.replyTextViewBottomConstraint = [self.replyTextView.bottomAnchor constraintEqualToAnchor:self.view.bottomAnchor constant:-bottomInset];
+    [self.view addConstraint:self.replyTextViewBottomConstraint];
+
+    [UIView animateWithDuration:0.3 animations:^{
+        [self.view layoutIfNeeded];
+    }];
+}
+
 - (void)configureViewConstraints
 {
     NSMutableDictionary *views = [[NSMutableDictionary alloc] initWithDictionary:@{
@@ -405,13 +440,7 @@ - (void)configureViewConstraints
     [[self.replyTextView.leftAnchor constraintEqualToAnchor:self.tableView.leftAnchor] setActive:YES];
     [[self.replyTextView.rightAnchor constraintEqualToAnchor:self.tableView.rightAnchor] setActive:YES];
 
-    self.replyTextViewBottomConstraint = [NSLayoutConstraint constraintWithItem:self.view
-                                                                      attribute:NSLayoutAttributeBottom
-                                                                      relatedBy:NSLayoutRelationEqual
-                                                                         toItem:self.replyTextView
-                                                                      attribute:NSLayoutAttributeBottom
-                                                                     multiplier:1.0
-                                                                       constant:0.0];
+    self.replyTextViewBottomConstraint = [self.replyTextView.bottomAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.bottomAnchor];
     self.replyTextViewBottomConstraint.priority = UILayoutPriorityDefaultHigh;
 
     [self.view addConstraint:self.replyTextViewBottomConstraint];