From 7634e3a44de4ea9e78a7f13978cef151a67c1eca Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Thu, 28 Jun 2018 13:16:59 -0400
Subject: [PATCH] Respond to CR.

---
 .../ConversationView/Cells/OWSAudioMessageView.m             | 1 -
 .../ConversationView/Cells/OWSContactOffersCell.m            | 2 --
 .../ConversationView/Cells/OWSContactShareView.m             | 1 -
 .../ConversationView/Cells/OWSMessageBubbleView.m            | 5 -----
 Signal/src/ViewControllers/HomeView/HomeViewCell.m           | 2 ++
 SignalMessaging/Views/ContactCellView.m                      | 1 -
 SignalMessaging/Views/ContactTableViewCell.m                 | 1 +
 7 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m
index 79cbe3ab9..02988d157 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m
@@ -212,7 +212,6 @@ NS_ASSUME_NONNULL_BEGIN
     UIStackView *labelsView = [UIStackView new];
     labelsView.axis = UILayoutConstraintAxisVertical;
     labelsView.spacing = [OWSAudioMessageView labelVSpacing];
-    labelsView.alignment = UIStackViewAlignmentFill;
     [self addArrangedSubview:labelsView];
 
     NSString *filename = self.attachmentStream.sourceFilename;
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactOffersCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactOffersCell.m
index adfc7894a..e7af806eb 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactOffersCell.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactOffersCell.m
@@ -72,8 +72,6 @@ NS_ASSUME_NONNULL_BEGIN
     ]];
     buttonStackView.axis = UILayoutConstraintAxisVertical;
     buttonStackView.spacing = self.vSpacing;
-    // Ensure all of the buttons have the same width.
-    buttonStackView.alignment = UIStackViewAlignmentFill;
 
     self.stackView = [[UIStackView alloc] initWithArrangedSubviews:@[
         self.titleLabel,
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareView.m
index ca6c04e97..fcc555e68 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareView.m
@@ -224,7 +224,6 @@ NS_ASSUME_NONNULL_BEGIN
     UIStackView *vStackView = [UIStackView new];
     vStackView.axis = UILayoutConstraintAxisVertical;
     vStackView.spacing = 0;
-    vStackView.alignment = UIStackViewAlignmentFill;
     [self addSubview:vStackView];
     [vStackView autoPinToSuperviewEdges];
     [vStackView addArrangedSubview:hStackView];
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
index 1ff883d54..69f3256a0 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
@@ -87,7 +87,6 @@ NS_ASSUME_NONNULL_BEGIN
 
     self.stackView = [UIStackView new];
     self.stackView.axis = UILayoutConstraintAxisVertical;
-    self.stackView.alignment = UIStackViewAlignmentFill;
 
     self.senderNameLabel = [UILabel new];
 
@@ -485,9 +484,6 @@ NS_ASSUME_NONNULL_BEGIN
     return (self.hasBodyMediaWithThumbnail || self.cellType == OWSMessageCellType_ContactShare);
 }
 
-// Returns YES if there is a footer displayed _at the bottom_
-// of the message bubble (as opposed to overlaid on a body media
-// thumbnail).
 - (BOOL)canFooterOverlayMedia
 {
     return self.hasBodyMediaWithThumbnail;
@@ -507,7 +503,6 @@ NS_ASSUME_NONNULL_BEGIN
 
     UIStackView *textStackView = [[UIStackView alloc] initWithArrangedSubviews:textViews];
     textStackView.axis = UILayoutConstraintAxisVertical;
-    textStackView.alignment = UIStackViewAlignmentFill;
     // TODO: Review
     textStackView.spacing = self.textViewVSpacing;
     textStackView.layoutMarginsRelativeArrangement = YES;
diff --git a/Signal/src/ViewControllers/HomeView/HomeViewCell.m b/Signal/src/ViewControllers/HomeView/HomeViewCell.m
index 90228c83c..ffa9e4988 100644
--- a/Signal/src/ViewControllers/HomeView/HomeViewCell.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewCell.m
@@ -122,6 +122,8 @@ NS_ASSUME_NONNULL_BEGIN
     [self.unreadLabel autoCenterInSuperview];
     [self.unreadLabel setContentHuggingHigh];
     [self.unreadLabel setCompressionResistanceHigh];
+
+    self.payloadView.userInteractionEnabled = NO;
 }
 
 - (void)dealloc
diff --git a/SignalMessaging/Views/ContactCellView.m b/SignalMessaging/Views/ContactCellView.m
index e353063e1..56b2026f8 100644
--- a/SignalMessaging/Views/ContactCellView.m
+++ b/SignalMessaging/Views/ContactCellView.m
@@ -78,7 +78,6 @@ const CGFloat kContactCellAvatarTextMargin = 12;
         self.subtitleLabel,
     ]];
     self.nameContainerView.axis = UILayoutConstraintAxisVertical;
-    self.nameContainerView.alignment = UIStackViewAlignmentFill;
 
     [self.avatarView setContentHuggingHorizontalHigh];
     [self.nameContainerView setContentHuggingHorizontalLow];
diff --git a/SignalMessaging/Views/ContactTableViewCell.m b/SignalMessaging/Views/ContactTableViewCell.m
index 90d9e3316..c990bcb02 100644
--- a/SignalMessaging/Views/ContactTableViewCell.m
+++ b/SignalMessaging/Views/ContactTableViewCell.m
@@ -45,6 +45,7 @@ NS_ASSUME_NONNULL_BEGIN
     self.cellView = [ContactCellView new];
     [self.contentView addSubview:self.cellView];
     [self.cellView autoPinEdgesToSuperviewMargins];
+    self.cellView.userInteractionEnabled = NO;
 }
 
 - (void)configureWithSignalAccount:(SignalAccount *)signalAccount contactsManager:(OWSContactsManager *)contactsManager