From d62e07d6f1ee053147e0eb09a8f2716db2196d77 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Thu, 16 Aug 2018 16:22:31 -0400
Subject: [PATCH] Theme review.

---
 .../ConversationView/Cells/OWSContactShareButtonsView.m  | 2 +-
 .../ConversationView/Cells/OWSMessageHeaderView.m        | 4 ++--
 .../src/ViewControllers/MenuActionsViewController.swift  | 9 ++++++++-
 SignalMessaging/categories/Theme.m                       | 4 ++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareButtonsView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareButtonsView.m
index 0e3452766..a3733c3f7 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareButtonsView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareButtonsView.m
@@ -129,7 +129,7 @@ NS_ASSUME_NONNULL_BEGIN
         OWSFail(@"%@ unexpected button state.", self.logTag);
     }
     label.font = OWSContactShareButtonsView.buttonFont;
-    label.textColor = UIColor.ows_materialBlueColor;
+    label.textColor = (Theme.isDarkThemeEnabled ? UIColor.ows_whiteColor : UIColor.ows_materialBlueColor);
     label.textAlignment = NSTextAlignmentCenter;
     [self addSubview:label];
     [label ows_autoPinToSuperviewEdges];
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageHeaderView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageHeaderView.m
index d1837ca13..9fd50d9df 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageHeaderView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageHeaderView.m
@@ -116,9 +116,9 @@ const CGFloat OWSMessageHeaderViewDateHeaderVMargin = 23;
     OWSAssert(viewItem);
 
     if (viewItem.unreadIndicator) {
-        return (Theme.isDarkThemeEnabled ? UIColor.ows_dark60Color : UIColor.ows_light60Color);
+        return Theme.secondaryColor;
     } else {
-        return (Theme.isDarkThemeEnabled ? UIColor.ows_dark30Color : UIColor.ows_light45Color);
+        return Theme.hairlineColor;
     }
 }
 
diff --git a/Signal/src/ViewControllers/MenuActionsViewController.swift b/Signal/src/ViewControllers/MenuActionsViewController.swift
index f65ab1e85..59d515829 100644
--- a/Signal/src/ViewControllers/MenuActionsViewController.swift
+++ b/Signal/src/ViewControllers/MenuActionsViewController.swift
@@ -414,7 +414,14 @@ class MenuActionView: UIButton {
         isUserInteractionEnabled = true
         backgroundColor = defaultBackgroundColor
 
-        let imageView = UIImageView(image: action.image)
+        var image = action.image
+        if Theme.isDarkThemeEnabled {
+            image = image.withRenderingMode(.alwaysTemplate)
+        }
+        let imageView = UIImageView(image: image)
+        if Theme.isDarkThemeEnabled {
+            imageView.tintColor = UIColor.ows_dark30
+        }
         let imageWidth: CGFloat = 24
         imageView.autoSetDimensions(to: CGSize(width: imageWidth, height: imageWidth))
         imageView.isUserInteractionEnabled = false
diff --git a/SignalMessaging/categories/Theme.m b/SignalMessaging/categories/Theme.m
index 490477e90..a6fd5c993 100644
--- a/SignalMessaging/categories/Theme.m
+++ b/SignalMessaging/categories/Theme.m
@@ -86,12 +86,12 @@ NSString *const ThemeKeyThemeEnabled = @"ThemeKeyThemeEnabled";
 
 + (UIColor *)placeholderColor
 {
-    return (Theme.isDarkThemeEnabled ? UIColor.ows_light35Color : UIColor.ows_dark55Color);
+    return (Theme.isDarkThemeEnabled ? UIColor.ows_dark55Color : UIColor.ows_light35Color);
 }
 
 + (UIColor *)hairlineColor
 {
-    return (Theme.isDarkThemeEnabled ? UIColor.ows_light45Color : UIColor.ows_dark60Color);
+    return (Theme.isDarkThemeEnabled ? UIColor.ows_dark60Color : UIColor.ows_light45Color);
 }
 
 #pragma mark - Global App Colors