Merge branch 'mkirk/fix-mute-icon'

pull/1/head
Michael Kirk 7 years ago
commit c8c89e539b

@ -177,18 +177,16 @@ NS_ASSUME_NONNULL_BEGIN
self.payloadView.spacing = 0.f; self.payloadView.spacing = 0.f;
self.topRowView.spacing = self.topRowHSpacing; self.topRowView.spacing = self.topRowHSpacing;
// We update the fonts every time this cell is configured to ensure that
// changes to the dynamic type settings are reflected.
self.snippetLabel.font = [self snippetFont];
if (overrideSnippet) { if (overrideSnippet) {
self.snippetLabel.attributedText = overrideSnippet; self.snippetLabel.attributedText = overrideSnippet;
} else { } else {
self.snippetLabel.attributedText = self.snippetLabel.attributedText =
[self attributedSnippetForThread:thread blockedPhoneNumberSet:blockedPhoneNumberSet]; [self attributedSnippetForThread:thread blockedPhoneNumberSet:blockedPhoneNumberSet];
} }
// We update the fonts every time this cell is configured to ensure that
// changes to the dynamic type settings are reflected.
//
// Note: we apply this font _after_ we set the attributed text to
// override any font attributes.
self.snippetLabel.font = [self snippetFont];
self.dateTimeLabel.text self.dateTimeLabel.text
= (overrideDate ? [self stringForDate:overrideDate] : [self stringForDate:thread.lastMessageDate]); = (overrideDate ? [self stringForDate:overrideDate] : [self stringForDate:thread.lastMessageDate]);

Loading…
Cancel
Save