From cb827169fb8e296e24f3510ea4eddd1ed2245ab5 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Wed, 22 Aug 2018 16:30:12 -0400
Subject: [PATCH] Respond to CR.

---
 .../AppSettings/OWSLinkedDevicesTableViewController.m     | 2 +-
 Signal/src/ViewControllers/ContactsPicker.swift           | 2 +-
 .../HomeView/ConversationSearchViewController.swift       | 8 +++-----
 Signal/src/ViewControllers/HomeView/HomeViewController.m  | 2 +-
 SignalMessaging/ViewControllers/OWSTableViewController.m  | 2 +-
 SignalMessaging/categories/Theme.m                        | 2 +-
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m b/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m
index aa3d4ed24..f600c7f5c 100644
--- a/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m
+++ b/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m
@@ -48,7 +48,7 @@ int const OWSLinkedDevicesTableViewControllerSectionAddDevice = 1;
     self.isExpectingMoreDevices = NO;
     self.tableView.rowHeight = UITableViewAutomaticDimension;
     self.tableView.estimatedRowHeight = 60;
-    self.tableView.separatorColor = Theme.hairlineColor;
+    self.tableView.separatorColor = Theme.cellSeparatorColor;
 
     [self.tableView applyScrollViewInsetsFix];
 
diff --git a/Signal/src/ViewControllers/ContactsPicker.swift b/Signal/src/ViewControllers/ContactsPicker.swift
index f629c749a..fda207abb 100644
--- a/Signal/src/ViewControllers/ContactsPicker.swift
+++ b/Signal/src/ViewControllers/ContactsPicker.swift
@@ -96,7 +96,7 @@ public class ContactsPicker: OWSViewController, UITableViewDelegate, UITableView
         self.view = UIView()
         let tableView = UITableView()
         self.tableView = tableView
-        self.tableView.separatorColor = Theme.hairlineColor
+        self.tableView.separatorColor = Theme.cellSeparatorColor
 
         view.addSubview(tableView)
         tableView.autoPinEdgesToSuperviewEdges()
diff --git a/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift b/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift
index 05eb6840e..2f7b16119 100644
--- a/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift
+++ b/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift
@@ -60,7 +60,7 @@ class ConversationSearchViewController: UITableViewController {
 
         tableView.rowHeight = UITableViewAutomaticDimension
         tableView.estimatedRowHeight = 60
-        tableView.separatorColor = Theme.hairlineColor
+        tableView.separatorColor = Theme.cellSeparatorColor
 
         tableView.register(EmptySearchResultCell.self, forCellReuseIdentifier: EmptySearchResultCell.reuseIdentifier)
         tableView.register(HomeViewCell.self, forCellReuseIdentifier: HomeViewCell.cellReuseIdentifier())
@@ -278,10 +278,10 @@ class ConversationSearchViewController: UITableViewController {
     }
 
     override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        guard let view = self.tableView(tableView, viewForHeaderInSection: section) else {
+        guard nil != self.tableView(tableView, titleForHeaderInSection: section) else {
             return 0
         }
-        return view.height()
+        return UITableViewAutomaticDimension
     }
 
     override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
@@ -294,7 +294,6 @@ class ConversationSearchViewController: UITableViewController {
         label.text = title
         label.font = UIFont.ows_dynamicTypeBody.ows_mediumWeight()
         label.tag = section
-        label.sizeToFit()
 
         let hMargin: CGFloat = 15
         let vMargin: CGFloat = 4
@@ -303,7 +302,6 @@ class ConversationSearchViewController: UITableViewController {
         wrapper.addSubview(label)
         label.autoPinWidthToSuperview(withMargin: hMargin)
         label.autoPinHeightToSuperview(withMargin: vMargin)
-        wrapper.frame = CGRect(x: 0, y: 0, width: label.width() + 2 * hMargin, height: label.height() + 2 * vMargin)
 
         return wrapper
     }
diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m
index b78a7fdb0..d2423deff 100644
--- a/Signal/src/ViewControllers/HomeView/HomeViewController.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m
@@ -318,7 +318,7 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-    self.tableView.separatorColor = Theme.hairlineColor;
+    self.tableView.separatorColor = Theme.cellSeparatorColor;
     [self.tableView registerClass:[HomeViewCell class] forCellReuseIdentifier:HomeViewCell.cellReuseIdentifier];
     [self.tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:kArchivedConversationsReuseIdentifier];
     [self.view addSubview:self.tableView];
diff --git a/SignalMessaging/ViewControllers/OWSTableViewController.m b/SignalMessaging/ViewControllers/OWSTableViewController.m
index 6a4619b37..01294c2d6 100644
--- a/SignalMessaging/ViewControllers/OWSTableViewController.m
+++ b/SignalMessaging/ViewControllers/OWSTableViewController.m
@@ -721,7 +721,7 @@ NSString *const kOWSTableCellIdentifier = @"kOWSTableCellIdentifier";
 
     self.view.backgroundColor = Theme.backgroundColor;
     self.tableView.backgroundColor = Theme.backgroundColor;
-    self.tableView.separatorColor = Theme.hairlineColor;
+    self.tableView.separatorColor = Theme.cellSeparatorColor;
 }
 
 @end
diff --git a/SignalMessaging/categories/Theme.m b/SignalMessaging/categories/Theme.m
index d8268e934..a046ec60d 100644
--- a/SignalMessaging/categories/Theme.m
+++ b/SignalMessaging/categories/Theme.m
@@ -124,7 +124,7 @@ NSString *const ThemeKeyThemeEnabled = @"ThemeKeyThemeEnabled";
 
 + (UIColor *)cellSeparatorColor
 {
-    return [UIColor colorWithWhite:0.78f alpha:1];
+    return Theme.hairlineColor;
 }
 
 + (UIColor *)conversationButtonBackgroundColor