From 3fa2f22bebe6d2be5fec43b875e0837dd88119f5 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Tue, 24 Oct 2017 11:43:42 -0400
Subject: [PATCH] Fixes for input toolbar.

// FREEBIE
---
 .../ConversationView/ConversationInputTextView.m   | 14 +-------------
 .../ConversationView/ConversationInputToolbar.h    |  2 +-
 .../ConversationView/ConversationInputToolbar.m    |  7 +------
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m
index 8f9abde5b..7f38b299f 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputTextView.m
@@ -12,7 +12,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic) UILabel *placeholderView;
 @property (nonatomic) NSArray<NSLayoutConstraint *> *placeholderConstraints;
-@property (nonatomic) BOOL isEditing;
 
 @end
 
@@ -119,7 +118,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)updatePlaceholderVisibility
 {
-    self.placeholderView.hidden = self.text.length > 0 || self.isEditing;
+    self.placeholderView.hidden = self.text.length > 0;
 }
 
 - (void)setText:(NSString *_Nullable)text
@@ -129,13 +128,6 @@ NS_ASSUME_NONNULL_BEGIN
     [self updatePlaceholderVisibility];
 }
 
-- (void)setIsEditing:(BOOL)isEditing
-{
-    _isEditing = isEditing;
-
-    [self updatePlaceholderVisibility];
-}
-
 - (BOOL)canBecomeFirstResponder
 {
     return YES;
@@ -193,8 +185,6 @@ NS_ASSUME_NONNULL_BEGIN
     // TODO: Is this necessary?
 
     [textView becomeFirstResponder];
-
-    self.isEditing = YES;
 }
 
 - (void)textViewDidChange:(UITextView *)textView
@@ -209,8 +199,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)textViewDidEndEditing:(UITextView *)textView
 {
     [textView resignFirstResponder];
-
-    self.isEditing = NO;
 }
 
 - (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.h b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.h
index e5da95fb6..c1a0798c7 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.h
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.h
@@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @protocol ConversationInputTextViewDelegate;
 
-@interface ConversationInputToolbar : UIToolbar
+@interface ConversationInputToolbar : UIView
 
 @property (nonatomic, weak) id<ConversationInputToolbarDelegate> inputToolbarDelegate;
 
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
index 57930f0f8..54bfea801 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
@@ -72,12 +72,7 @@ static void *kConversationInputTextViewObservingContext = &kConversationInputTex
 {
     self.layoutMargins = UIEdgeInsetsZero;
 
-    // TODO: I think there's an easier to get the right appearance,
-    // but I can't figure it out.
-    UIView *backgroundView = [UIView new];
-    backgroundView.backgroundColor = [UIColor colorWithWhite:249 / 255.f alpha:1.f];
-    [self addSubview:backgroundView];
-    [backgroundView autoPinEdgesToSuperviewEdges];
+    self.backgroundColor = [UIColor colorWithWhite:249 / 255.f alpha:1.f];
 
     _contentView = [UIView containerView];
     [self addSubview:self.contentView];