mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-24 10:32:46 +02:00
Merge branch 'develop' into gil/SP1_space_creation
This commit is contained in:
@@ -103,8 +103,6 @@
|
||||
- (void)viewWillAppear:(BOOL)animated
|
||||
{
|
||||
[super viewWillAppear:animated];
|
||||
|
||||
[AppDelegate theDelegate].masterTabBarController.navigationItem.title = [VectorL10n titleHome];
|
||||
|
||||
[ThemeService.shared.theme applyStyleOnNavigationBar:[AppDelegate theDelegate].masterTabBarController.navigationController.navigationBar];
|
||||
|
||||
@@ -113,7 +111,6 @@
|
||||
if (recentsDataSource)
|
||||
{
|
||||
// Take the lead on the shared data source.
|
||||
recentsDataSource.areSectionsShrinkable = NO;
|
||||
[recentsDataSource setDelegate:self andRecentsDataSourceMode:RecentsDataSourceModeHome];
|
||||
}
|
||||
|
||||
@@ -337,9 +334,16 @@
|
||||
{
|
||||
// Edit the potential selected room (see `onCollectionViewCellLongPress`).
|
||||
editedRoomId = selectedRoomId;
|
||||
|
||||
// Each rooms section is represented by only one collection view.
|
||||
return 1;
|
||||
|
||||
if ([recentsDataSource isSectionShrinkedAt:section])
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Each rooms section is represented by only one collection view.
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
|
||||
|
||||
Reference in New Issue
Block a user