date break font/color to spec

// FREEBIE
pull/1/head
Michael Kirk 7 years ago
parent 56e5abb2c3
commit f22cb48f85

@ -258,7 +258,7 @@ NS_ASSUME_NONNULL_BEGIN
NSString *dateString = [DateUtil formatDateForConversationDateBreaks:date];
self.dateHeaderLabel.font = self.dateHeaderFont;
self.dateHeaderLabel.textColor = UIColor.lightGrayColor;
self.dateHeaderLabel.textColor = self.conversationStyle.dateBreakTextColor;
self.dateHeaderLabel.text = dateString;
@ -289,7 +289,7 @@ NS_ASSUME_NONNULL_BEGIN
- (UIFont *)dateHeaderFont
{
return UIFont.ows_dynamicTypeCaption1Font;
return UIFont.ows_dynamicTypeCalloutFont;
}
#pragma mark - Avatar

@ -30,8 +30,9 @@ NS_ASSUME_NONNULL_BEGIN
@property (class, readonly, nonatomic) UIFont *ows_dynamicTypeTitle2Font;
@property (class, readonly, nonatomic) UIFont *ows_dynamicTypeTitle3Font;
@property (class, readonly, nonatomic) UIFont *ows_dynamicTypeHeadlineFont;
@property (class, readonly, nonatomic) UIFont *ows_dynamicTypeSubheadlineFont;
@property (class, readonly, nonatomic) UIFont *ows_dynamicTypeBodyFont;
@property (class, readonly, nonatomic) UIFont *ows_dynamicTypeCalloutFont;
@property (class, readonly, nonatomic) UIFont *ows_dynamicTypeSubheadlineFont;
@property (class, readonly, nonatomic) UIFont *ows_dynamicTypeFootnoteFont;
@property (class, readonly, nonatomic) UIFont *ows_dynamicTypeCaption1Font;
@property (class, readonly, nonatomic) UIFont *ows_dynamicTypeCaption2Font;

@ -72,14 +72,19 @@ NS_ASSUME_NONNULL_BEGIN
return [UIFont preferredFontForTextStyle:UIFontTextStyleHeadline];
}
+ (UIFont *)ows_dynamicTypeSubheadlineFont
+ (UIFont *)ows_dynamicTypeBodyFont
{
return [UIFont preferredFontForTextStyle:UIFontTextStyleSubheadline];
return [UIFont preferredFontForTextStyle:UIFontTextStyleBody];
}
+ (UIFont *)ows_dynamicTypeBodyFont
+ (UIFont *)ows_dynamicTypeCalloutFont
{
return [UIFont preferredFontForTextStyle:UIFontTextStyleBody];
return [UIFont preferredFontForTextStyle:UIFontTextStyleCallout];
}
+ (UIFont *)ows_dynamicTypeSubheadlineFont
{
return [UIFont preferredFontForTextStyle:UIFontTextStyleSubheadline];
}
+ (UIFont *)ows_dynamicTypeFootnoteFont

@ -145,6 +145,9 @@ public class ConversationStyle: NSObject {
@objc
public let bubbleColorOutgoingSent = UIColor.ows_darkSkyBlue
@objc
public let dateBreakTextColor = UIColor.ows_light60
@objc
public var primaryColor: UIColor

Loading…
Cancel
Save