From c76c571d87b689952dc0fd91c4f7c6dc1edbd307 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Mon, 2 Jul 2018 15:58:28 -0400
Subject: [PATCH] Fix quoted reply margin.

---
 .../ConversationView/ConversationInputToolbar.m        | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
index 7a7fc7824..ab5bf1ad7 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
@@ -92,6 +92,7 @@ static const CGFloat ConversationInputToolbarBorderViewHeight = 0.5;
     // to determine the height of the rendered inputAccessoryView.
     CGFloat height = self.toolbarHeight + ConversationInputToolbarBorderViewHeight;
     if (self.quotedMessagePreview) {
+        height += self.quotedMessageTopMargin;
         height += self.quotedMessagePreview.intrinsicContentSize.height;
     }
     CGSize newSize = CGSizeMake(self.bounds.size.width, height);
@@ -127,6 +128,8 @@ static const CGFloat ConversationInputToolbarBorderViewHeight = 0.5;
     _composeContainer = [UIView containerView];
     _contentStackView = [[UIStackView alloc] initWithArrangedSubviews:@[ _composeContainer ]];
     _contentStackView.axis = UILayoutConstraintAxisVertical;
+    _contentStackView.layoutMargins = UIEdgeInsetsZero;
+    _contentStackView.layoutMarginsRelativeArrangement = YES;
 
     [self addSubview:_contentStackView];
     [_contentStackView autoPinEdgesToSuperviewEdges];
@@ -289,6 +292,12 @@ static const CGFloat ConversationInputToolbarBorderViewHeight = 0.5;
 
     // TODO animate
     [self.contentStackView insertArrangedSubview:self.quotedMessagePreview atIndex:0];
+    self.contentStackView.layoutMargins = UIEdgeInsetsMake(self.quotedMessageTopMargin, 0, 0, 0);
+}
+
+- (CGFloat)quotedMessageTopMargin
+{
+    return 5.f;
 }
 
 - (void)clearQuotedMessagePreview
@@ -299,6 +308,7 @@ static const CGFloat ConversationInputToolbarBorderViewHeight = 0.5;
         [self.quotedMessagePreview removeFromSuperview];
         self.quotedMessagePreview = nil;
     }
+    self.contentStackView.layoutMargins = UIEdgeInsetsZero;
 }
 
 - (void)beginEditingTextMessage