From 8da96e979cd334d6e0df443466cfacc399767009 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Tue, 7 Aug 2018 17:29:48 -0400
Subject: [PATCH] Refine theme.

---
 .../DomainFrontingCountryViewController.m     |  6 +++---
 .../ViewControllers/CallViewController.swift  |  3 ++-
 .../ContactViewController.swift               | 21 +++++++++++--------
 .../src/ViewControllers/ContactsPicker.swift  |  1 -
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Signal/src/ViewControllers/AppSettings/DomainFrontingCountryViewController.m b/Signal/src/ViewControllers/AppSettings/DomainFrontingCountryViewController.m
index 70a477b26..d20bc594b 100644
--- a/Signal/src/ViewControllers/AppSettings/DomainFrontingCountryViewController.m
+++ b/Signal/src/ViewControllers/AppSettings/DomainFrontingCountryViewController.m
@@ -5,6 +5,7 @@
 #import "DomainFrontingCountryViewController.h"
 #import "OWSCountryMetadata.h"
 #import "OWSTableViewController.h"
+#import "UIColor+OWS.h"
 #import "UIFont+OWS.h"
 #import "UIView+OWS.h"
 #import <SignalServiceKit/OWSSignalService.h>
@@ -30,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
     self.title = NSLocalizedString(
         @"CENSORSHIP_CIRCUMVENTION_COUNTRY_VIEW_TITLE", @"Title for the 'censorship circumvention country' view.");
 
-    self.view.backgroundColor = [UIColor whiteColor];
+    self.view.backgroundColor = Theme.backgroundColor;
 
     [self createViews];
 }
@@ -63,9 +64,8 @@ NS_ASSUME_NONNULL_BEGIN
         [section addItem:[OWSTableItem
                              itemWithCustomCellBlock:^{
                                  UITableViewCell *cell = [OWSTableItem newCell];
+                                 [OWSTableItem configureCell:cell];
                                  cell.textLabel.text = countryMetadata.localizedCountryName;
-                                 cell.textLabel.font = [UIFont ows_regularFontWithSize:18.f];
-                                 cell.textLabel.textColor = [UIColor blackColor];
 
                                  if ([countryMetadata.countryCode isEqualToString:currentCountryCode]) {
                                      cell.accessoryType = UITableViewCellAccessoryCheckmark;
diff --git a/Signal/src/ViewControllers/CallViewController.swift b/Signal/src/ViewControllers/CallViewController.swift
index 9401f0a55..562a92061 100644
--- a/Signal/src/ViewControllers/CallViewController.swift
+++ b/Signal/src/ViewControllers/CallViewController.swift
@@ -189,8 +189,9 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver,
 
     override func loadView() {
         self.view = UIView()
-
+        self.view.backgroundColor = UIColor.black
         self.view.layoutMargins = UIEdgeInsets(top: 16, left: 20, bottom: 16, right: 20)
+
         createViews()
         createViewConstraints()
     }
diff --git a/Signal/src/ViewControllers/ContactViewController.swift b/Signal/src/ViewControllers/ContactViewController.swift
index 1f420462a..987842473 100644
--- a/Signal/src/ViewControllers/ContactViewController.swift
+++ b/Signal/src/ViewControllers/ContactViewController.swift
@@ -172,7 +172,7 @@ class ContactViewController: OWSViewController, ContactShareViewHelperDelegate {
 
         // This view provides a background "below the fold".
         let bottomView = UIView.container()
-        bottomView.backgroundColor = UIColor.white
+        bottomView.backgroundColor = Theme.backgroundColor
         self.view.addSubview(bottomView)
         bottomView.layoutMargins = .zero
         bottomView.autoPinWidthToSuperview()
@@ -197,7 +197,9 @@ class ContactViewController: OWSViewController, ContactShareViewHelperDelegate {
     }
 
     private func heroBackgroundColor() -> UIColor {
-        return UIColor(rgbHex: 0xefeff4)
+        return (Theme.isDarkThemeEnabled()
+        ? UIColor(rgbHex: 0x272727)
+        : UIColor(rgbHex: 0xefeff4))
     }
 
     private func createTopView() -> UIView {
@@ -226,7 +228,7 @@ class ContactViewController: OWSViewController, ContactShareViewHelperDelegate {
         }
         let backIconView = UIImageView(image: backIconImage.withRenderingMode(.alwaysTemplate))
         backIconView.contentMode = .scaleAspectFit
-        backIconView.tintColor = UIColor.black.withAlphaComponent(0.6)
+        backIconView.tintColor = Theme.primaryColor.withAlphaComponent(0.6)
         backButton.addSubview(backIconView)
         backIconView.autoCenterInSuperview()
 
@@ -242,7 +244,7 @@ class ContactViewController: OWSViewController, ContactShareViewHelperDelegate {
         let nameLabel = UILabel()
         nameLabel.text = contactShare.displayName
         nameLabel.font = UIFont.ows_dynamicTypeTitle1
-        nameLabel.textColor = UIColor.black
+        nameLabel.textColor = Theme.primaryColor
         nameLabel.lineBreakMode = .byTruncatingTail
         nameLabel.textAlignment = .center
         topView.addSubview(nameLabel)
@@ -256,7 +258,7 @@ class ContactViewController: OWSViewController, ContactShareViewHelperDelegate {
             let phoneNumberLabel = UILabel()
             phoneNumberLabel.text = PhoneNumber.bestEffortLocalizedPhoneNumber(withE164: phoneNumber)
             phoneNumberLabel.font = UIFont.ows_dynamicTypeFootnote
-            phoneNumberLabel.textColor = UIColor.black
+            phoneNumberLabel.textColor = Theme.primaryColor
             phoneNumberLabel.lineBreakMode = .byTruncatingTail
             phoneNumberLabel.textAlignment = .center
             topView.addSubview(phoneNumberLabel)
@@ -427,7 +429,7 @@ class ContactViewController: OWSViewController, ContactShareViewHelperDelegate {
         button.autoSetDimension(.width, toSize: buttonSize, relation: .greaterThanOrEqual)
 
         let circleView = UIView()
-        circleView.backgroundColor = UIColor.white
+        circleView.backgroundColor = Theme.backgroundColor
         circleView.autoSetDimension(.width, toSize: buttonSize)
         circleView.autoSetDimension(.height, toSize: buttonSize)
         circleView.layer.cornerRadius = buttonSize * 0.5
@@ -439,14 +441,15 @@ class ContactViewController: OWSViewController, ContactShareViewHelperDelegate {
             owsFail("\(logTag) missing image.")
             return button
         }
-        let imageView = UIImageView(image: image)
+        let imageView = UIImageView(image: image.withRenderingMode(.alwaysTemplate))
+        imageView.tintColor = Theme.primaryColor.withAlphaComponent(0.6)
         circleView.addSubview(imageView)
         imageView.autoCenterInSuperview()
 
         let label = UILabel()
         label.text = text
         label.font = UIFont.ows_dynamicTypeCaption2
-        label.textColor = UIColor.black
+        label.textColor = Theme.primaryColor
         label.lineBreakMode = .byTruncatingTail
         label.textAlignment = .center
         button.addSubview(label)
@@ -460,7 +463,7 @@ class ContactViewController: OWSViewController, ContactShareViewHelperDelegate {
 
     private func createLargePillButton(text: String, actionBlock : @escaping () -> Void) -> UIView {
         let button = TappableView(actionBlock: actionBlock)
-        button.backgroundColor = UIColor.white
+        button.backgroundColor = Theme.backgroundColor
         button.layoutMargins = .zero
         button.autoSetDimension(.height, toSize: 45)
         button.layer.cornerRadius = 5
diff --git a/Signal/src/ViewControllers/ContactsPicker.swift b/Signal/src/ViewControllers/ContactsPicker.swift
index d9f204854..964bdfdc7 100644
--- a/Signal/src/ViewControllers/ContactsPicker.swift
+++ b/Signal/src/ViewControllers/ContactsPicker.swift
@@ -106,7 +106,6 @@ public class ContactsPicker: OWSViewController, UITableViewDelegate, UITableView
         self.searchBar = searchBar
         searchBar.searchBarStyle = .minimal
         searchBar.delegate = self
-        searchBar.backgroundColor = .white
         searchBar.sizeToFit()
 
         tableView.tableHeaderView = searchBar