signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Merge branch 'charlesmchen/dynamicJumbomoji'

Browse Source
This commit is contained in:
Matthew Chen 2017-11-16 18:26:12 -05:00
commit 334cecf5a0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
View File

@ -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;