Merge branch 'charlesmchen/tweakPhoneNumberProfileNames'

This commit is contained in:
Michael Kirk 2018-07-10 16:49:43 -06:00
commit 4a4eb9b833
2 changed files with 3 additions and 3 deletions

View File

@ -801,8 +801,8 @@ NS_ASSUME_NONNULL_BEGIN
+ (NSDictionary *)senderNameSecondaryAttributes
{
return @{
NSFontAttributeName : UIFont.ows_dynamicTypeCaption2Font,
NSForegroundColorAttributeName : [ConversationStyle.bubbleTextColorIncoming colorWithAlphaComponent:0.75f],
NSFontAttributeName : self.senderNameFont.ows_italic,
NSForegroundColorAttributeName : ConversationStyle.bubbleTextColorIncoming,
};
}

View File

@ -431,7 +431,7 @@ NS_ASSUME_NONNULL_BEGIN
// Used for profile names.
- (UIFont *)nameSecondaryFont
{
return [UIFont ows_dynamicTypeFootnoteFont];
return [UIFont ows_dynamicTypeBodyFont].ows_italic;
}
- (NSUInteger)avatarSize