Merge branch 'develop' into ismail/4384_room_summary_store

This commit is contained in:
ismailgulek
2021-09-28 17:30:39 +03:00
319 changed files with 12712 additions and 2440 deletions
@@ -76,7 +76,7 @@
self.lastEventDate.text = roomCellData.lastEventDate;
// Manage lastEventAttributedTextMessage optional property
if ([roomCellData respondsToSelector:@selector(lastEventAttributedTextMessage)])
if (!roomCellData.spaceChildInfo && [roomCellData respondsToSelector:@selector(lastEventAttributedTextMessage)])
{
// Force the default text color for the last message (cancel highlighted message color)
NSMutableAttributedString *lastEventDescription = [[NSMutableAttributedString alloc] initWithAttributedString:roomCellData.lastEventAttributedTextMessage];
@@ -124,8 +124,9 @@
self.roomTitle.font = [UIFont systemFontOfSize:17 weight:UIFontWeightMedium];
}
MXRoomSummary *summary = [roomCellData.mxSession roomSummaryWithRoomId:roomCellData.roomSummary.roomId];
[summary setRoomAvatarImageIn:self.roomAvatar];
[self.roomAvatar vc_setRoomAvatarImageWith:roomCellData.avatarUrl
displayName:roomCellData.roomDisplayname
mediaManager:roomCellData.mxSession.mediaManager];
}
else
{