keyboard pinning vs iPhoneX

Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift

@@ -188,7 +188,7 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect
 
         bottomBanner.autoPinEdge(toSuperviewEdge: .top)
         bottomBanner.autoPinWidthToSuperview()
-        self.autoPinView(toBottomGuideOrKeyboard: bottomBanner)
+        self.autoPinView(toBottomOfViewControllerOrKeyboard: bottomBanner)
 
         // The Giphy API requires us to "show their trademark prominently" in our GIF experience.
         let logoImage = UIImage(named: "giphy_logo")

Signal/src/ViewControllers/NewContactThreadViewController.m

@@ -125,7 +125,7 @@ NS_ASSUME_NONNULL_BEGIN
     [_tableViewController.view autoPinWidthToSuperview];
 
     [_tableViewController.view autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:contactsPermissionReminderView];
-    [self autoPinViewToBottomGuideOrKeyboard:self.tableViewController.view];
+    [self autoPinViewToBottomOfViewControllerOrKeyboard:self.tableViewController.view];
     _tableViewController.tableView.tableHeaderView = searchBar;
 
     _noSignalContactsView = [self createNoSignalContactsView];

Signal/src/ViewControllers/NewGroupViewController.m

@@ -124,7 +124,7 @@ const NSUInteger kNewGroupViewControllerAvatarWidth = 68;
     [self.view addSubview:self.tableViewController.view];
     [_tableViewController.view autoPinWidthToSuperview];
     [_tableViewController.view autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:firstSection];
-    [self autoPinViewToBottomGuideOrKeyboard:self.tableViewController.view];
+    [self autoPinViewToBottomOfViewControllerOrKeyboard:self.tableViewController.view];
 
     [self updateTableContents];
 }

Signal/src/ViewControllers/ThreadSettings/UpdateGroupViewController.m

@@ -120,7 +120,7 @@ NS_ASSUME_NONNULL_BEGIN
     [self.view addSubview:self.tableViewController.view];
     [_tableViewController.view autoPinWidthToSuperview];
     [_tableViewController.view autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:firstSection];
-    [self autoPinViewToBottomGuideOrKeyboard:self.tableViewController.view];
+    [self autoPinViewToBottomOfViewControllerOrKeyboard:self.tableViewController.view];
 
     [self updateTableContents];
 }

SignalMessaging/ViewControllers/OWSViewController.h

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>
@@ -10,12 +10,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic) BOOL shouldIgnoreKeyboardChanges;
 
-// We often want to pin one view to the bottom guide
+// We often want to pin one view to the bottom of a view controller
-// of a view controller BUT adjust its location upward
+// BUT adjust its location upward if the keyboard appears.
-// if the keyboard appears.
+- (void)autoPinViewToBottomOfViewControllerOrKeyboard:(UIView *)view;
-//
-// Use this method in lieu of autoPinToBottomLayoutGuideOfViewController:
-- (void)autoPinViewToBottomGuideOrKeyboard:(UIView *)view;
 
 @end
 

SignalMessaging/ViewControllers/OWSViewController.m

@@ -2,8 +2,8 @@
 //  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
+#import "OWSViewController.h"
 #import "UIView+OWS.h"
-#import <SignalMessaging/OWSViewController.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
-- (void)autoPinViewToBottomGuideOrKeyboard:(UIView *)view
+- (void)autoPinViewToBottomOfViewControllerOrKeyboard:(UIView *)view
 {
     OWSAssert(view);
     OWSAssert(!self.bottomLayoutConstraint);
@@ -57,7 +57,7 @@ NS_ASSUME_NONNULL_BEGIN
                                                object:nil];
 
     self.bottomLayoutView = view;
-    self.bottomLayoutConstraint = [view autoPinToBottomLayoutGuideOfViewController:self withInset:0];
+    self.bottomLayoutConstraint = [view autoPinEdge:ALEdgeBottom toEdge:ALEdgeBottom ofView:self.view];
 }
 
 - (void)keyboardWillShow:(NSNotification *)notification