oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Proper color for compose screen avatars 

ConversationCell#thread is nullable

// FREEBIE
This commit is contained in:
Michael Kirk 2018-06-29 15:27:01 -06:00
parent 2b293b7625
commit de56eb9d6b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SignalMessaging/Views/ContactCellView.m
View File

@ -29,7 +29,7 @@ const CGFloat kContactCellAvatarTextMargin = 12;
@property (nonatomic) UIView *accessoryViewContainer;
@property (nonatomic) OWSContactsManager *contactsManager;
@property (nonatomic) TSThread *thread;
@property (nonatomic, nullable) TSThread *thread;
@property (nonatomic) NSString *recipientId;
@end
@ -196,7 +196,14 @@ const CGFloat kContactCellAvatarTextMargin = 12;
return;
}
NSString *colorName = self.thread.conversationColorName;
NSString *colorName = ^{
if (self.thread) {
return self.thread.conversationColorName;
} else {
OWSAssert(self.recipientId);
return [TSThread stableConversationColorNameForString:self.recipientId];
}
}();
UIColor *color = [UIColor ows_conversationColorForColorName:colorName];
self.avatarView.image = [[[OWSContactAvatarBuilder alloc] initWithSignalId:recipientId