From 9108c893291f2fd4706f5a1fb699e7fe712d3e94 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 2 Jul 2018 23:57:43 -0600 Subject: [PATCH 1/3] ContactView is now a stackView --- Signal/src/ViewControllers/MessageDetailViewController.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Signal/src/ViewControllers/MessageDetailViewController.swift b/Signal/src/ViewControllers/MessageDetailViewController.swift index d32c10745b..aaff87bdcf 100644 --- a/Signal/src/ViewControllers/MessageDetailViewController.swift +++ b/Signal/src/ViewControllers/MessageDetailViewController.swift @@ -254,6 +254,7 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele // Table view cells don't layout properly outside the // context of a table view. let cellView = ContactCellView() + cellView.isLayoutMarginsRelativeArrangement = true cellView.layoutMargins = UIEdgeInsets(top: 8, left: 20, bottom: 8, right: 20) // We use the "short" status message to avoid being redundant with the section title. cellView.accessoryMessage = shortStatusMessage From 6d5c0cd291f2f218b710e08a22e57d4a74ce2d20 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 2 Jul 2018 23:58:15 -0600 Subject: [PATCH 2/3] image corner radius is small --- Signal/src/ViewControllers/MediaGalleryViewController.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/MediaGalleryViewController.swift b/Signal/src/ViewControllers/MediaGalleryViewController.swift index c1bf2908c3..86cc9bb7f1 100644 --- a/Signal/src/ViewControllers/MediaGalleryViewController.swift +++ b/Signal/src/ViewControllers/MediaGalleryViewController.swift @@ -342,8 +342,7 @@ class MediaGalleryViewController: OWSNavigationController, MediaGalleryDataSourc detailView.backgroundColor = .clear self.view.backgroundColor = .clear - // TODO: Sync with (possibly assymetrical) corner rounding in message bubbles. - self.presentationView.layer.cornerRadius = kOWSMessageCellCornerRadius_Large + self.presentationView.layer.cornerRadius = kOWSMessageCellCornerRadius_Small fromViewController.present(self, animated: false) { From bd9696fede80e4b094d63a635cfaf57690580ca6 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 3 Jul 2018 10:16:41 -0600 Subject: [PATCH 3/3] canary in case we change margins later --- Signal/src/ViewControllers/MessageDetailViewController.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Signal/src/ViewControllers/MessageDetailViewController.swift b/Signal/src/ViewControllers/MessageDetailViewController.swift index aaff87bdcf..659eacbb83 100644 --- a/Signal/src/ViewControllers/MessageDetailViewController.swift +++ b/Signal/src/ViewControllers/MessageDetailViewController.swift @@ -254,6 +254,8 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele // Table view cells don't layout properly outside the // context of a table view. let cellView = ContactCellView() + // canary in case we later add margins in the ContactCellView initializer. + assert(!cellView.isLayoutMarginsRelativeArrangement) cellView.isLayoutMarginsRelativeArrangement = true cellView.layoutMargins = UIEdgeInsets(top: 8, left: 20, bottom: 8, right: 20) // We use the "short" status message to avoid being redundant with the section title.