Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces

# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
This commit is contained in:
Gil Eluard
2022-01-13 16:30:55 +01:00
294 changed files with 5987 additions and 914 deletions
@@ -29,6 +29,7 @@
#import "InviteRecentTableViewCell.h"
#import "DirectoryRecentTableViewCell.h"
#import "RoomIdOrAliasTableViewCell.h"
#import "TableViewCellWithCollectionView.h"
#import "GeneratedInterface-Swift.h"
@@ -1006,9 +1007,32 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
- (void)dataSource:(MXKDataSource *)dataSource didCellChange:(id)changes
{
[super dataSource:dataSource didCellChange:changes];
BOOL cellReloaded = NO;
if ([changes isKindOfClass:NSNumber.class])
{
NSInteger section = ((NSNumber *)changes).integerValue;
if (section >= 0)
{
NSIndexPath *indexPath = [NSIndexPath indexPathForRow:0 inSection:section];
UITableViewCell *cell = [self.recentsTableView cellForRowAtIndexPath:indexPath];
if ([cell isKindOfClass:TableViewCellWithCollectionView.class])
{
TableViewCellWithCollectionView *collectionViewCell = (TableViewCellWithCollectionView *)cell;
[collectionViewCell.collectionView reloadData];
cellReloaded = YES;
}
}
}
[self showEmptyViewIfNeeded];
if (!cellReloaded)
{
[super dataSource:dataSource didCellChange:changes];
}
if (changes == nil)
{
[self showEmptyViewIfNeeded];
}
if (dataSource.state == MXKDataSourceStateReady)
{