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

Keep the fav / low priority order

Browse source
This commit is contained in:
yannick 2015-12-02 18:10:22 +01:00
parent c4084a4e68
commit ccd57f177f
1 changed files with 50 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -220,6 +220,33 @@
#pragma mark - MXKDataSourceDelegate
// create an array filled with NSNull and with the same size as sourceArray
- (NSMutableArray*)createEmptyArray:(NSArray*)sourceArray
{
NSMutableArray* array = [[NSMutableArray alloc] init];
if (sourceArray && sourceArray.count)
{
for(int i = 0; i < sourceArray.count; i++)
{
[array addObject:[NSNull null]];
}
}
return array;
}
// remove the NSNull from an array
- (void) removeNullItems:(NSMutableArray*)array
{
NSUInteger pos;
while((pos = [array indexOfObject:[NSNull null]]) != NSNotFound)
{
[array removeObjectAtIndex:pos];
}
}
- (void)refreshRoomsSections
{
// displayedRecentsDataSourceArray.count
@ -235,22 +262,35 @@
if (displayedRecentsDataSourceArray.count > 0)
{
MXKSessionRecentsDataSource *recentsDataSource = [displayedRecentsDataSourceArray objectAtIndex:0];
MXSession* session = recentsDataSource.mxSession;
NSArray* sortedFavRooms = [session roomsWithTag:kMXRoomTagFavourite];
NSArray* sortedLowPriorRooms = [session roomsWithTag:kMXRoomTagLowPriority];
favoritesCells = [self createEmptyArray:sortedFavRooms];
lowPriorityCells = [self createEmptyArray:sortedLowPriorRooms];
NSInteger count = recentsDataSource.numberOfCells;
for(int index = 0; index < count; index++)
{
NSUInteger pos;
id<MXKRecentCellDataStoring> recentCellDataStoring = [recentsDataSource cellDataAtIndex:index];
MXRoom* room = recentCellDataStoring.roomDataSource.room;
NSDictionary* tags = room.accountData.tags;
if (tags && [tags objectForKey:kMXRoomTagFavourite])
if ((pos = [sortedFavRooms indexOfObject:room]) != NSNotFound)
{
[favoritesCells addObject:recentCellDataStoring];
if (pos < favoritesCells.count)
{
[favoritesCells replaceObjectAtIndex:pos withObject:recentCellDataStoring];
}
}
else if (tags && [tags objectForKey:kMXRoomTagLowPriority])
else if ((pos = [sortedLowPriorRooms indexOfObject:room]) != NSNotFound)
{
[lowPriorityCells addObject:recentCellDataStoring];
if (pos < lowPriorityCells.count)
{
[lowPriorityCells replaceObjectAtIndex:pos withObject:recentCellDataStoring];
}
}
else
{
@ -260,12 +300,14 @@
int pos = 0;
[self removeNullItems:favoritesCells];
if (favoritesCells.count > 0)
{
favoritesPos = pos;
pos++;
}
[self removeNullItems:conversationCells];
if (conversationCells.count > 0)
{
conversationPos = pos;