From edc455c93d6fc37900c44f068e2bc108cece7b60 Mon Sep 17 00:00:00 2001
From: Scott Ludwig <scottlu@gmail.com>
Date: Tue, 12 Jan 2016 15:32:10 -0800
Subject: [PATCH] Respond to keyboardWillChangeFrame for improved keyboard
 handling

- Fixes press chat / press done bug that gets chat into a weird state
- Handles keyboard height changing dynamically (predictive typing bar,
  emoji keyboards etc).

  This change is from Nathan Fulton, https://github.com/N104.
---
 game/iphone/chatviewcontroller.h  |  1 -
 game/iphone/chatviewcontroller.mm | 82 +++++++++++++------------------
 2 files changed, 34 insertions(+), 49 deletions(-)

diff --git a/game/iphone/chatviewcontroller.h b/game/iphone/chatviewcontroller.h
index e456cee..6f2d6a1 100644
--- a/game/iphone/chatviewcontroller.h
+++ b/game/iphone/chatviewcontroller.h
@@ -25,7 +25,6 @@ class ChatController;
     UITableView *tableView_;
     UIToolbar *toolbar_;
     UITextField *textField_;
-    bool keyboardShown_;
     NSMutableArray *chatEntries_;
     UIFont *entryFont_;
     CGFloat width10Spaces_;
diff --git a/game/iphone/chatviewcontroller.mm b/game/iphone/chatviewcontroller.mm
index 79c9a61..ff7199f 100644
--- a/game/iphone/chatviewcontroller.mm
+++ b/game/iphone/chatviewcontroller.mm
@@ -26,7 +26,6 @@
     tableView_ = nil;
     toolbar_ = nil;
     textField_ = nil;
-    keyboardShown_ = false;
     chatQueue_ = [[NSMutableArray alloc] initWithCapacity:CHAT_QUEUE];
     suspended_ = NO;
     chatEntries_ = [[NSMutableArray alloc] initWithCapacity:CHAT_HISTORY];
@@ -79,13 +78,18 @@
 {
     [[NSNotificationCenter defaultCenter] addObserver:self
             selector:@selector(onKeyboardShown:)
-            name:UIKeyboardDidShowNotification object:nil];
+            name:UIKeyboardDidShowNotification
+            object:nil];
  
     [[NSNotificationCenter defaultCenter] addObserver:self
             selector:@selector(onKeyboardHidden:)
-            name:UIKeyboardDidHideNotification object:nil];
+            name:UIKeyboardDidHideNotification
+            object:nil];
 
-    keyboardShown_ = false;
+    [[NSNotificationCenter defaultCenter] addObserver:self
+            selector:@selector(keyboardWillChangeFrame:)
+            name:UIKeyboardWillChangeFrameNotification
+            object:nil];
 }
 
 - (void)loadView
@@ -340,57 +344,39 @@
 
 - (void)onKeyboardShown:(NSNotification *)notification
 {
-    if (keyboardShown_) {
-        return;
-    }
-    keyboardShown_ = true;
-
-    NSDictionary *info = [notification userInfo];
-
-    CGRect rectKeyboard;
-    [[info objectForKey:UIKeyboardFrameEndUserInfoKey] getValue:&rectKeyboard];
-    CGSize sizeKeyboard = rectKeyboard.size;
-
-    CGRect rcToolbar = toolbar_.frame;
-    rcToolbar = CGRectOffset(rcToolbar, 0, -sizeKeyboard.height);
-    toolbar_.frame = rcToolbar;
-
-    CGRect rcTableView = tableView_.frame;
-    rcTableView.size.height -= sizeKeyboard.height;
-    tableView_.frame = rcTableView;
-
     [self scrollToBottom];
 }
 
 - (void)onKeyboardHidden:(NSNotification *)notification
-{
-    if (!keyboardShown_) {
-        return;
-    }
-    keyboardShown_ = false;
-
-    NSDictionary *info = [notification userInfo];
-
-    CGRect rectKeyboard;
-    [[info objectForKey:UIKeyboardFrameEndUserInfoKey] getValue:&rectKeyboard];
-    CGSize sizeKeyboard = rectKeyboard.size;
-
-    CGRect rcToolbar = toolbar_.frame;
-    rcToolbar = CGRectOffset(rcToolbar, 0, sizeKeyboard.height);
-    toolbar_.frame = rcToolbar;
-
-    CGRect rcTableView = tableView_.frame;
-    rcTableView.size.height += sizeKeyboard.height;
-    tableView_.frame = rcTableView;
-}
-
-#if 0
-// Fires on the simulator, but not the device. Go figure.
-- (void)viewDidAppear:(BOOL)animated
 {
     [self scrollToBottom];
 }
-#endif
+
+- (void)keyboardWillChangeFrame:(NSNotification *)notification {
+    NSDictionary *info = [notification userInfo];
+    UIApplication *app = [UIApplication sharedApplication];
+    CGRect rcEnd = [[info objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue];
+    CGRect rcToolbar = [toolbar_ frame];
+    int nMajorOSVersion = [[[UIDevice currentDevice] systemVersion] intValue];
+
+    if (nMajorOSVersion <= 7) {
+        // The rcEnd rect is based on portrait, but self.frame and its
+        // subviews' frames are landscape.
+        if ([app statusBarOrientation] == UIDeviceOrientationLandscapeRight) {
+            rcToolbar.origin.y = rcEnd.origin.x - toolbar_.frame.size.height;
+        }
+        if ([app statusBarOrientation] == UIDeviceOrientationLandscapeLeft) {
+            rcToolbar.origin.y = view_.frame.size.height - rcEnd.origin.x - rcEnd.size.width - toolbar_.frame.size.height;
+        }
+    } else {
+        rcToolbar.origin.y = rcEnd.origin.y - rcToolbar.size.height;
+    }
+    [toolbar_ setFrame:rcToolbar];
+    [view_ bringSubviewToFront:toolbar_];
+
+    // Resize the table view
+    [self layoutTableView];
+}
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
     return 1;