Theme review.
This commit is contained in:
parent
4ea5d9b849
commit
d62e07d6f1
|
@ -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];
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue