Merge branch 'mkirk/profile-colors'

Signal/src/ViewControllers/ProfileViewController.m

@@ -249,12 +249,12 @@ NSString *const kProfileView_LastPresentedDate = @"kProfileView_LastPresentedDat
 
         if (lastRow == nameRow || lastRow == avatarRow) {
             UIView *separator = [UIView containerView];
-            separator.backgroundColor = Theme.secondaryColor;
+            separator.backgroundColor = Theme.cellSeparatorColor;
             [contentView addSubview:separator];
             [separator autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:lastRow withOffset:5.f];
             [separator autoPinLeadingToSuperviewMarginWithInset:18.f];
             [separator autoPinTrailingToSuperviewMarginWithInset:18.f];
-            [separator autoSetDimension:ALDimensionHeight toSize:1.f];
+            [separator autoSetDimension:ALDimensionHeight toSize:CGHairlineWidth()];
             lastRow = separator;
         }
     }

SignalMessaging/ViewControllers/OWSTableViewController.m

@@ -114,7 +114,7 @@ const CGFloat kOWSTable_DefaultCellHeight = 45.f;
     cell.detailTextLabel.textColor = [Theme secondaryColor];
 
     UIView *selectedBackgroundView = [UIView new];
-    selectedBackgroundView.backgroundColor = [Theme.cellSelectedColor colorWithAlphaComponent:0.08];
+    selectedBackgroundView.backgroundColor = Theme.cellSelectedColor;
     cell.selectedBackgroundView = selectedBackgroundView;
 }
 

SignalMessaging/Views/OWSNavigationBar.swift

@@ -159,7 +159,8 @@ public class OWSNavigationBar: UINavigationBar {
     @objc
     public func makeClear() {
         self.backgroundColor = .clear
-        self.setBackgroundImage(nil, for: .default)
+        // Making a toolbar transparent requires setting an empty uiimage
+        self.setBackgroundImage(UIImage(), for: .default)
         self.shadowImage = UIImage()
         self.clipsToBounds = true
         self.blurEffectView?.isHidden = true

SignalMessaging/categories/Theme.h

@@ -40,6 +40,7 @@ extern NSString *const ThemeDidChangeNotification;
 @property (class, readonly, nonatomic) UIColor *conversationButtonBackgroundColor;
 
 @property (class, readonly, nonatomic) UIColor *cellSelectedColor;
+@property (class, readonly, nonatomic) UIColor *cellSeparatorColor;
 
 #pragma mark -
 

SignalMessaging/categories/Theme.m

@@ -57,7 +57,7 @@ NSString *const ThemeKeyThemeEnabled = @"ThemeKeyThemeEnabled";
 + (UIColor *)offBackgroundColor
 {
     return (
-        Theme.isDarkThemeEnabled ? [UIColor colorWithWhite:0.2f alpha:1.f] : [UIColor colorWithWhite:0.9f alpha:1.f]);
+        Theme.isDarkThemeEnabled ? [UIColor colorWithWhite:0.2f alpha:1.f] : [UIColor colorWithWhite:0.94f alpha:1.f]);
 }
 
 + (UIColor *)primaryColor
@@ -110,7 +110,12 @@ NSString *const ThemeKeyThemeEnabled = @"ThemeKeyThemeEnabled";
 
 + (UIColor *)cellSelectedColor
 {
-    return (Theme.isDarkThemeEnabled ? UIColor.ows_whiteColor : UIColor.ows_blackColor);
+    return (Theme.isDarkThemeEnabled ? [UIColor colorWithWhite:0.2 alpha:1] : [UIColor colorWithWhite:0.92 alpha:1]);
+}
+
++ (UIColor *)cellSeparatorColor
+{
+    return [UIColor colorWithWhite:0.78f alpha:1];
 }
 
 + (UIColor *)conversationButtonBackgroundColor