Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 08:12:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Room summary: beginning

Browse source
This commit is contained in:
manuroe 2017-01-11 09:58:09 +01:00
parent 516e438f49
commit c7a480d4b3
6 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Vector/Categories/MXRoom+Vector.m
View file

@ -66,7 +66,7 @@
} }
#pragma mark - Room display name #pragma mark - Room display name
// @TODO: May worth to refactor to use MXRoomSummary
- (NSString *)vectorDisplayname - (NSString *)vectorDisplayname
{ {
// this algo is the one defined in // this algo is the one defined in

2
Vector/Model/RoomList/RecentCellData.m
View file

@ -26,7 +26,7 @@
- (void)update - (void)update
{ {
[super update]; [super update];
roomDisplayname = self.roomDataSource.room.vectorDisplayname; roomDisplayname = self.roomSummary.room.vectorDisplayname;
if (!roomDisplayname.length) if (!roomDisplayname.length)
{ {
roomDisplayname = NSLocalizedStringFromTable(@"room_displayname_no_title", @"Vector", nil); roomDisplayname = NSLocalizedStringFromTable(@"room_displayname_no_title", @"Vector", nil);

4
Vector/Model/RoomList/RecentsDataSource.m
View file

@ -532,7 +532,7 @@
{ {
id<MXKRecentCellDataStoring> cellDataStoring = [cellDataArray objectAtIndex:index]; id<MXKRecentCellDataStoring> cellDataStoring = [cellDataArray objectAtIndex:index];
if ([roomId isEqualToString:cellDataStoring.roomDataSource.roomId] && (matrixSession == cellDataStoring.roomDataSource.mxSession)) if ([roomId isEqualToString:cellDataStoring.roomSummary.roomId] && (matrixSession == cellDataStoring.roomSummary.room.mxSession))
{ {
return index; return index;
} }
@ -667,7 +667,7 @@
{ {
NSUInteger pos; NSUInteger pos;
id<MXKRecentCellDataStoring> recentCellDataStoring = [recentsDataSource cellDataAtIndex:index]; id<MXKRecentCellDataStoring> recentCellDataStoring = [recentsDataSource cellDataAtIndex:index];
MXRoom* room = recentCellDataStoring.roomDataSource.room; MXRoom* room = recentCellDataStoring.roomSummary.room;
if ((pos = [sortedFavRooms indexOfObject:room]) != NSNotFound) if ((pos = [sortedFavRooms indexOfObject:room]) != NSNotFound)
{ {

4
Vector/ViewController/RecentsViewController.m
View file

@ -330,7 +330,7 @@
{ {
id<MXKRecentCellDataStoring> cellDataStoring = (id<MXKRecentCellDataStoring> )cellData; id<MXKRecentCellDataStoring> cellDataStoring = (id<MXKRecentCellDataStoring> )cellData;
if (NSNotFound == [cellDataStoring.recentsDataSource.mxSession.invitedRooms indexOfObject:cellDataStoring.roomDataSource.room]) if (NSNotFound == [cellDataStoring.recentsDataSource.mxSession.invitedRooms indexOfObject:cellDataStoring.roomSummary.room])
{ {
return RecentTableViewCell.class; return RecentTableViewCell.class;
} }
@ -344,7 +344,7 @@
{ {
id<MXKRecentCellDataStoring> cellDataStoring = (id<MXKRecentCellDataStoring> )cellData; id<MXKRecentCellDataStoring> cellDataStoring = (id<MXKRecentCellDataStoring> )cellData;
if (NSNotFound == [cellDataStoring.recentsDataSource.mxSession.invitedRooms indexOfObject:cellDataStoring.roomDataSource.room]) if (NSNotFound == [cellDataStoring.recentsDataSource.mxSession.invitedRooms indexOfObject:cellDataStoring.roomSummary.room])
{ {
return RecentTableViewCell.defaultReuseIdentifier; return RecentTableViewCell.defaultReuseIdentifier;
} }

4
Vector/Views/RoomList/InviteRecentTableViewCell.m
View file

@ -62,7 +62,7 @@ NSString *const kInviteRecentTableViewCellRoomKey = @"kInviteRecentTableViewCell
{ {
if (self.delegate) if (self.delegate)
{ {
MXRoom *room = roomCellData.roomDataSource.room; MXRoom *room = roomCellData.roomSummary.room;
if (room) if (room)
{ {
@ -75,7 +75,7 @@ NSString *const kInviteRecentTableViewCellRoomKey = @"kInviteRecentTableViewCell
{ {
if (self.delegate) if (self.delegate)
{ {
MXRoom *room = roomCellData.roomDataSource.room; MXRoom *room = roomCellData.roomSummary.room;
if (room) if (room)
{ {

9
Vector/Views/RoomList/RecentTableViewCell.m
View file

@ -127,11 +127,14 @@
self.roomAvatar.backgroundColor = [UIColor clearColor]; self.roomAvatar.backgroundColor = [UIColor clearColor];
self.directRoomIcon.hidden = !roomCellData.roomDataSource.room.isDirect; // @TODO
self.directRoomIcon.hidden = !roomCellData.roomSummary.room.isDirect;
self.encryptedRoomIcon.hidden = !roomCellData.roomDataSource.room.state.isEncrypted; // @TODO
self.encryptedRoomIcon.hidden = !roomCellData.roomSummary.room.state.isEncrypted;
[roomCellData.roomDataSource.room setRoomAvatarImageIn:self.roomAvatar]; // @TODO
[roomCellData.roomSummary.room setRoomAvatarImageIn:self.roomAvatar];
} }
else else
{ {