From 572de11763b3b49d582e11d48768e80a9c91899c Mon Sep 17 00:00:00 2001 From: Matthew Chen <charlesmchen@gmail.com> Date: Thu, 16 Nov 2017 17:41:41 -0500 Subject: [PATCH] Apply dynamic type sizing to Jumbomoji. --- .../ConversationView/Cells/OWSMessageCell.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m index dc42f6c38..41a36838c 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m @@ -252,17 +252,18 @@ NS_ASSUME_NONNULL_BEGIN { OWSAssert(DisplayableText.kMaxJumbomojiCount == 5); + CGFloat basePointSize = [UIFont ows_dynamicTypeBodyFont].pointSize; switch (self.displayableText.jumbomojiCount) { case 0: break; case 1: - return [UIFont ows_regularFontWithSize:35.f]; + return [UIFont ows_regularFontWithSize:basePointSize * 2.f]; case 2: - return [UIFont ows_regularFontWithSize:30.f]; + return [UIFont ows_regularFontWithSize:basePointSize * 1.666f]; case 3: case 4: case 5: - return [UIFont ows_regularFontWithSize:25.f]; + return [UIFont ows_regularFontWithSize:basePointSize * 1.333f]; default: OWSFail(@"%@ Unexpected jumbomoji count: %zd", self.logTag, self.displayableText.jumbomojiCount); break;