From bb9c1fb23da3e4a2448eb507693e71791ad687dd Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Mon, 16 Apr 2018 11:51:07 -0400
Subject: [PATCH] Apply design changes from Myles.

---
 .../ViewControllers/ConversationView/Cells/OWSBubbleView.h    | 3 ++-
 .../ViewControllers/ConversationView/Cells/OWSBubbleView.m    | 3 ++-
 .../ConversationView/Cells/OWSMessageBubbleView.m             | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.h b/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.h
index 0882a50f2..17e2d20a5 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.h
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.h
@@ -13,7 +13,8 @@ extern const CGFloat kBubbleHRounding;
 extern const CGFloat kBubbleThornSideInset;
 extern const CGFloat kBubbleThornVInset;
 extern const CGFloat kBubbleTextHInset;
-extern const CGFloat kBubbleTextVInset;
+extern const CGFloat kBubbleTextTopInset;
+extern const CGFloat kBubbleTextBottomInset;
 
 @class OWSBubbleView;
 
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.m
index ae1527297..88e49856d 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSBubbleView.m
@@ -14,7 +14,8 @@ const CGFloat kBubbleHRounding = kOWSMessageCellCornerRadius;
 const CGFloat kBubbleThornSideInset = 5.f;
 const CGFloat kBubbleThornVInset = 0;
 const CGFloat kBubbleTextHInset = 10.f;
-const CGFloat kBubbleTextVInset = 10.f;
+const CGFloat kBubbleTextTopInset = 8.f;
+const CGFloat kBubbleTextBottomInset = 6.f;
 
 @interface OWSBubbleView ()
 
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
index 0a678bf2e..f581c2ab4 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
@@ -1003,12 +1003,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (CGFloat)textTopMargin
 {
-    return kBubbleTextVInset;
+    return kBubbleTextTopInset;
 }
 
 - (CGFloat)textBottomMargin
 {
-    return kBubbleTextVInset + kBubbleThornVInset;
+    return kBubbleTextBottomInset + kBubbleThornVInset;
 }
 
 - (UIColor *)bodyTextColor