oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Respond to CR.

Browse source
This commit is contained in:
Matthew Chen 2018-04-05 10:35:57 -04:00
parent cac85508cc
commit 822aa64b14
6 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.h
View file

@ -10,8 +10,6 @@ NS_ASSUME_NONNULL_BEGIN
+ (NSString *)cellReuseIdentifier;
+ (UIFont *)defaultTextMessageFont;
@end
NS_ASSUME_NONNULL_END

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

@ -147,16 +147,11 @@ NS_ASSUME_NONNULL_BEGIN
return NSStringFromClass([self class]);
}
+ (UIFont *)defaultTextMessageFont
{
return [UIFont ows_dynamicTypeBodyFont];
}
- (UIFont *)textMessageFont
{
OWSAssert(DisplayableText.kMaxJumbomojiCount == 5);
CGFloat basePointSize = self.class.defaultTextMessageFont.pointSize;
CGFloat basePointSize = [UIFont ows_dynamicTypeBodyFont].pointSize;
switch (self.displayableBodyText.jumbomojiCount) {
case 0:
break;

2
Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.h
View file

@ -20,9 +20,11 @@ NS_ASSUME_NONNULL_BEGIN
// Measurement
- (CGSize)sizeForMaxWidth:(CGFloat)maxWidth;
// Factory method for "message bubble" views.
+ (OWSQuotedMessageView *)quotedMessageViewForConversation:(TSQuotedMessage *)quotedMessage
displayableQuotedText:(nullable DisplayableText *)displayableQuotedText;
// Factory method for "message compose" views.
+ (OWSQuotedMessageView *)quotedMessageViewForPreview:(TSQuotedMessage *)quotedMessage;
@end

7
Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
View file

@ -6,7 +6,6 @@
#import "ConversationViewItem.h"
#import "Environment.h"
#import "OWSBubbleStrokeView.h"
#import "OWSMessageCell.h"
#import "Signal-Swift.h"
#import <SignalMessaging/OWSContactsManager.h>
#import <SignalMessaging/SignalMessaging-Swift.h>
@ -68,7 +67,7 @@ NS_ASSUME_NONNULL_BEGIN
_quotedMessage = quotedMessage;
_displayableQuotedText = displayableQuotedText;
_textMessageFont = OWSMessageCell.defaultTextMessageFont;
_textMessageFont = [UIFont ows_dynamicTypeBodyFont];
return self;
}
@ -76,13 +75,13 @@ NS_ASSUME_NONNULL_BEGIN
- (BOOL)hasQuotedAttachment
{
return (self.quotedMessage.contentType.length > 0
&& ![NSObject isNullableObject:self.quotedMessage.contentType equalTo:OWSMimeTypeOversizeTextMessage]);
&& ![OWSMimeTypeOversizeTextMessage isEqualToString:self.quotedMessage.contentType]);
}
- (BOOL)hasQuotedAttachmentThumbnail
{
return (self.quotedMessage.contentType.length > 0
&& ![NSObject isNullableObject:self.quotedMessage.contentType equalTo:OWSMimeTypeOversizeTextMessage] &&
&& ![OWSMimeTypeOversizeTextMessage isEqualToString:self.quotedMessage.contentType] &&
[TSAttachmentStream hasThumbnailForMimeType:self.quotedMessage.contentType]);
}

2
SignalMessaging/categories/UIFont+OWS.h
View file

@ -18,6 +18,8 @@ NS_ASSUME_NONNULL_BEGIN
+ (UIFont *)ows_boldFontWithSize:(CGFloat)size;
+ (UIFont *)ows_dynamicTypeBodyFont:(CGFloat)size;
#pragma mark - Icon Fonts
+ (UIFont *)ows_fontAwesomeFont:(CGFloat)size;

5
SignalMessaging/categories/UIFont+OWS.m
View file

@ -33,6 +33,11 @@ NS_ASSUME_NONNULL_BEGIN
return [UIFont boldSystemFontOfSize:size];
}
+ (UIFont *)ows_dynamicTypeBodyFont:(CGFloat)size
{
return [UIFont ows_dynamicTypeBodyFont];
}
#pragma mark - Icon Fonts
+ (UIFont *)ows_fontAwesomeFont:(CGFloat)size