Merge branch 'charlesmchen/tweakPhoneNumberProfileNames'

7 years ago · 4a4eb9b833
parent c4d52505b7 fdc4fafe7a
commit 4a4eb9b833
2 changed files with 3 additions and 3 deletions
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
@ -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,
    };
 }

--- a/Signal/src/ViewControllers/HomeView/HomeViewCell.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewCell.m
@ -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