Merge branch 'mlin/PR/SafetyNumberSheetStyle' into release/5.0.0

Author: michelle-signal

Signal/src/ViewControllers/SafetyNumberConfirmationSheet.swift

@@ -94,20 +94,16 @@ open class ActionSheetController: OWSViewController {
         }
         action.button.applyActionSheetTheme(theme)
 
-        let hairline = UIView()
-        hairline.backgroundColor = theme.hairlineColor
-        hairline.autoSetDimension(.height, toSize: 1)
-
         // If we've already added a cancel action, any non-cancel actions should come before it
         // This matches how UIAlertController handles cancel actions.
         if action.style != .cancel,
             let firstCancelAction = firstCancelAction,
             let index = stackView.arrangedSubviews.firstIndex(of: firstCancelAction.button) {
             // The hairline we're inserting is the divider between the new button and the cancel button
-            stackView.insertArrangedSubview(hairline, at: index)
+            stackView.insertHairline(with: theme.hairlineColor, at: index)
             stackView.insertArrangedSubview(action.button, at: index)
         } else {
-            stackView.addArrangedSubview(hairline)
+            stackView.addHairline(with: theme.hairlineColor)
             stackView.addArrangedSubview(action.button)
         }
         action.button.contentAlignment = contentAlignment
@@ -172,11 +168,11 @@ open class ActionSheetController: OWSViewController {
         //
         // This means that the backdrop view will extend outside of the bounds of the content view as the user
         // scrolls the content out of the safe area
-        let backdropView = theme.createBackdropView()
-        contentView.addSubview(backdropView)
-        backdropView.autoPinWidthToSuperview()
-        backdropView.autoPinEdge(.top, to: .top, of: contentView)
-        scrollView.frameLayoutGuide.bottomAnchor.constraint(equalTo: backdropView.bottomAnchor).isActive = true
+        let backgroundView = theme.createBackgroundView()
+        contentView.addSubview(backgroundView)
+        backgroundView.autoPinWidthToSuperview()
+        backgroundView.autoPinEdge(.top, to: .top, of: contentView)
+        scrollView.frameLayoutGuide.bottomAnchor.constraint(equalTo: backgroundView.bottomAnchor).isActive = true
 
         // Stack views don't support corner masking pre-iOS 14
         // Instead we add our stack view to a wrapper view with masksToBounds: true
@@ -192,7 +188,7 @@ open class ActionSheetController: OWSViewController {
         // view's bounds. But its two subviews are pinned at same top edge. We can just apply corner
         // radii to each layer individually to get a similar effect.
         let cornerRadius: CGFloat = 16
-        [backdropView, stackViewContainer].forEach { subview in
+        [backgroundView, stackViewContainer].forEach { subview in
             subview.layer.cornerRadius = cornerRadius
             subview.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
             subview.layer.masksToBounds = true
@@ -465,7 +461,7 @@ public class ActionSheetAction: NSObject {
             fatalError("init(coder:) has not been implemented")
         }
 
-        func applyActionSheetTheme(_ theme: Theme.ActionSheet) {
+        public func applyActionSheetTheme(_ theme: Theme.ActionSheet) {
             // Recolor everything based on the requested theme
             setBackgroundImage(UIImage(color: theme.buttonHighlightColor), for: .highlighted)
 

SignalMessaging/ViewControllers/ActionSheetController.swift

@@ -12,6 +12,8 @@ extern const CGFloat kContactCellAvatarTextMargin;
 
 @interface ContactCellView : UIStackView
 
+@property (assign, nonatomic) BOOL forceDarkAppearance;
+
 @property (nonatomic, nullable) NSString *accessoryMessage;
 
 @property (nonatomic, nullable) NSAttributedString *customName;

SignalMessaging/Views/ContactCellView.h

@@ -117,9 +117,17 @@ - (void)configureFontsAndColors
     self.subtitleLabel.font = [UIFont ows_regularFontWithSize:11.f];
     self.accessoryLabel.font = [UIFont ows_semiboldFontWithSize:12.f];
 
-    self.nameLabel.textColor = Theme.primaryTextColor;
-    self.subtitleLabel.textColor = Theme.secondaryTextAndIconColor;
+    self.nameLabel.textColor = self.forceDarkAppearance ? Theme.darkThemePrimaryColor : Theme.primaryTextColor;
+    self.subtitleLabel.textColor
+        = self.forceDarkAppearance ? Theme.darkThemeSecondaryTextAndIconColor : Theme.secondaryTextAndIconColor;
     self.accessoryLabel.textColor = Theme.middleGrayColor;
+
+    if (self.nameLabel.attributedText.string.length > 0) {
+        NSString *nameLabelText = self.nameLabel.attributedText.string;
+        NSDictionary *updatedAttributes = @{ NSForegroundColorAttributeName : self.nameLabel.textColor };
+        self.nameLabel.attributedText = [[NSAttributedString alloc] initWithString:nameLabelText
+                                                                        attributes:updatedAttributes];
+    }
 }
 
 - (void)configureWithRecipientAddress:(SignalServiceAddress *)address
@@ -178,7 +186,7 @@ - (void)configureWithThread:(TSThread *)thread transaction:(SDSAnyReadTransactio
         NSAttributedString *attributedText =
             [[NSAttributedString alloc] initWithString:threadName
                                             attributes:@{
-                                                NSForegroundColorAttributeName : Theme.primaryTextColor,
+                                                NSForegroundColorAttributeName : self.nameLabel.textColor,
                                             }];
         self.nameLabel.attributedText = attributedText;
     }
@@ -231,6 +239,14 @@ - (NSUInteger)avatarSize
     return self.useSmallAvatars ? kSmallAvatarSize : kStandardAvatarSize;
 }
 
+- (void)setForceDarkAppearance:(BOOL)forceDarkAppearance
+{
+    if (_forceDarkAppearance != forceDarkAppearance) {
+        _forceDarkAppearance = forceDarkAppearance;
+        [self configureFontsAndColors];
+    }
+}
+
 - (void)updateNameLabels
 {
     BOOL hasCustomName = self.customName.length > 0;
@@ -250,6 +266,7 @@ - (void)prepareForReuse
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 
+    self.forceDarkAppearance = NO;
     self.thread = nil;
     self.accessoryMessage = nil;
     self.nameLabel.text = nil;

SignalMessaging/Views/ContactCellView.m

@@ -10,6 +10,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface ContactTableViewCell : UITableViewCell
 
+@property (assign, nonatomic) BOOL forceDarkAppearance;
+
 + (NSString *)reuseIdentifier;
 
 - (nullable instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;

SignalMessaging/Views/ContactTableViewCell.h

@@ -129,6 +129,16 @@ - (void)setUseSmallAvatars
     self.cellView.useSmallAvatars = YES;
 }
 
+- (BOOL)forceDarkAppearance
+{
+    return self.cellView.forceDarkAppearance;
+}
+
+- (void)setForceDarkAppearance:(BOOL)forceDarkAppearance
+{
+    self.cellView.forceDarkAppearance = forceDarkAppearance;
+}
+
 - (void)prepareForReuse
 {
     [super prepareForReuse];

SignalMessaging/Views/ContactTableViewCell.m

@@ -142,12 +142,17 @@ public class OWSFlatButton: UIView {
 
     // MARK: Methods
 
+    @objc
+    public func setTitleColor(_ color: UIColor) {
+        button.setTitleColor(color, for: .normal)
+    }
+
     @objc
     public func setTitle(title: String, font: UIFont,
                          titleColor: UIColor ) {
         button.setTitle(title, for: .normal)
-        button.setTitleColor(titleColor, for: .normal)
         button.titleLabel!.font = font
+        setTitleColor(titleColor)
     }
 
     @objc

SignalMessaging/Views/OWSFlatButton.swift

@@ -340,7 +340,7 @@ extension Theme {
         public var hairlineColor: UIColor {
             switch self {
             case .default: return isDarkThemeEnabled ? .ows_gray65 : .ows_gray05
-            case .translucentDark: return .ows_gray65
+            case .translucentDark: return .ows_whiteAlpha20
             }
         }
 
@@ -365,6 +365,20 @@ extension Theme {
             }
         }
 
+        public var safetyNumberChangeButtonBackgroundColor: UIColor {
+            switch self {
+            case .default: return Theme.conversationButtonBackgroundColor
+            case .translucentDark: return .ows_gray75
+            }
+        }
+
+        public var safetyNumberChangeButtonTextColor: UIColor {
+            switch self {
+            case .default: return Theme.conversationButtonTextColor
+            case .translucentDark: return .ows_accentBlueDark
+            }
+        }
+
         public var destructiveButtonTextColor: UIColor {
             return .ows_accentRed
         }
@@ -383,15 +397,15 @@ extension Theme {
             }
         }
 
-        public func createBackdropView() -> UIView {
+        public func createBackgroundView() -> UIView {
             switch self {
             case .default:
-                let backdrop = UIView()
-                backdrop.backgroundColor = backgroundColor
-                return backdrop
+                let background = UIView()
+                background.backgroundColor = backgroundColor
+                return background
             case .translucentDark:
-                let backdrop = UIVisualEffectView(effect: UIBlurEffect(style: .dark))
-                return backdrop
+                let background = UIVisualEffectView(effect: UIBlurEffect(style: .dark))
+                return background
             }
         }
     }

SignalMessaging/appearance/Theme+OWS.swift

@@ -150,8 +150,10 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value);
 
 @interface UIStackView (OWS)
 
-- (UIView *)addBackgroundViewWithBackgroundColor:(UIColor *)backgroundColor;
+- (void)addHairlineWithColor:(UIColor *)color;
+- (void)insertHairlineWithColor:(UIColor *)color atIndex:(NSInteger)index;
 
+- (UIView *)addBackgroundViewWithBackgroundColor:(UIColor *)backgroundColor;
 - (UIView *)addBackgroundViewWithBackgroundColor:(UIColor *)backgroundColor cornerRadius:(CGFloat)cornerRadius;
 
 - (UIView *)addBorderViewWithColor:(UIColor *)color strokeWidth:(CGFloat)strokeWidth cornerRadius:(CGFloat)cornerRadius;

SignalMessaging/categories/UIView+OWS.h

@@ -566,6 +566,20 @@ - (BOOL)applyScrollViewInsetsFix
 
 @implementation UIStackView (OWS)
 
+- (void)addHairlineWithColor:(UIColor *)color
+{
+    [self insertHairlineWithColor:color atIndex:self.arrangedSubviews.count];
+}
+
+- (void)insertHairlineWithColor:(UIColor *)color atIndex:(NSInteger)index
+{
+    UIView *hairlineView = [[UIView alloc] init];
+    hairlineView.backgroundColor = color;
+    [hairlineView autoSetDimension:ALDimensionHeight toSize:1];
+
+    [self insertArrangedSubview:hairlineView atIndex:index];
+}
+
 - (UIView *)addBackgroundViewWithBackgroundColor:(UIColor *)backgroundColor
 {
     return [self addBackgroundViewWithBackgroundColor:backgroundColor cornerRadius:0.f];