From 089e4a4a026f38db63cc1c5a95fbf8cc38166442 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 17 Nov 2017 09:51:37 -0500 Subject: [PATCH 1/2] Fix layout of table views vs. nav bar. --- .../ViewControllers/ConversationView/Cells/OWSMessageCell.m | 6 +++--- Signal/src/ViewControllers/OWSTableViewController.m | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m index 41a36838c..d13763a1d 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m @@ -257,13 +257,13 @@ NS_ASSUME_NONNULL_BEGIN case 0: break; case 1: - return [UIFont ows_regularFontWithSize:basePointSize * 2.f]; + return [UIFont ows_regularFontWithSize:basePointSize + 18.f]; case 2: - return [UIFont ows_regularFontWithSize:basePointSize * 1.666f]; + return [UIFont ows_regularFontWithSize:basePointSize + 12.f]; case 3: case 4: case 5: - return [UIFont ows_regularFontWithSize:basePointSize * 1.333f]; + return [UIFont ows_regularFontWithSize:basePointSize + 6.f]; default: OWSFail(@"%@ Unexpected jumbomoji count: %zd", self.logTag, self.displayableText.jumbomojiCount); break; diff --git a/Signal/src/ViewControllers/OWSTableViewController.m b/Signal/src/ViewControllers/OWSTableViewController.m index bfa2006d9..55c1787ad 100644 --- a/Signal/src/ViewControllers/OWSTableViewController.m +++ b/Signal/src/ViewControllers/OWSTableViewController.m @@ -398,7 +398,9 @@ NSString * const kOWSTableCellIdentifier = @"kOWSTableCellIdentifier"; #pragma clang diagnostic pop } [self.view addSubview:self.tableView]; - [self.tableView autoPinToSuperviewEdges]; + [self.tableView autoPinWidthToSuperview]; + [self.tableView autoPinToTopLayoutGuideOfViewController:self withInset:0]; + [self.tableView autoPinToBottomLayoutGuideOfViewController:self withInset:0]; [self.tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:kOWSTableCellIdentifier]; } From e79613184aa5a3702af89846a4a36303234b5c8a Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 17 Nov 2017 16:04:54 -0500 Subject: [PATCH 2/2] Respond to CR. // FREEBIE --- .../ViewControllers/ConversationView/Cells/OWSMessageCell.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m index d13763a1d..41a36838c 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m @@ -257,13 +257,13 @@ NS_ASSUME_NONNULL_BEGIN case 0: break; case 1: - return [UIFont ows_regularFontWithSize:basePointSize + 18.f]; + return [UIFont ows_regularFontWithSize:basePointSize * 2.f]; case 2: - return [UIFont ows_regularFontWithSize:basePointSize + 12.f]; + return [UIFont ows_regularFontWithSize:basePointSize * 1.666f]; case 3: case 4: case 5: - return [UIFont ows_regularFontWithSize:basePointSize + 6.f]; + return [UIFont ows_regularFontWithSize:basePointSize * 1.333f]; default: OWSFail(@"%@ Unexpected jumbomoji count: %zd", self.logTag, self.displayableText.jumbomojiCount); break;