Tweak theme

This commit is contained in:
Michael Kirk 2018-08-09 16:43:25 -06:00
parent 73174d7943
commit ebd2e6d5ac
4 changed files with 11 additions and 5 deletions

View file

@ -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;
}
}

View file

@ -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;
}

View file

@ -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 -

View file

@ -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