felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-28 20:26:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into ismail/4384_room_summary_store

Browse Source
This commit is contained in:
ismailgulek
2021-10-12 11:49:55 +03:00
parent 665fa5fa9d ad37f87210
commit 32bb4c668a
120 changed files with 3683 additions and 1012 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m
+1 -1
View File
@@ -243,7 +243,7 @@
// Update here the index of the current selected cell (if any) - Useful in landscape mode with split view controller.
NSIndexPath *currentSelectedCellIndexPath = nil;
if (masterTabBarController.currentRoomViewController)
if (masterTabBarController.selectedRoomId)
{
// Look for the rank of this selected room in displayed recents
currentSelectedCellIndexPath = [dataSource cellIndexPathWithRoomId:masterTabBarController.selectedRoomId andMatrixSession:masterTabBarController.selectedRoomSession];
Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
+2
View File
@@ -91,6 +91,7 @@
[titles addObject:[VectorL10n searchPeople]];
peopleSearchViewController = [ContactsTableViewController contactsTableViewController];
peopleSearchViewController.contactsTableViewControllerDelegate = self;
peopleSearchViewController.disableFindYourContactsFooter = YES;
[viewControllers addObject:peopleSearchViewController];
// add Files tab
@@ -247,6 +248,7 @@
// Init the search for people
peopleSearchDataSource = [[ContactsDataSource alloc] initWithMatrixSession:mainSession];
peopleSearchDataSource.showLocalContacts = NO;
peopleSearchDataSource.areSectionsShrinkable = YES;
peopleSearchDataSource.displaySearchInputInContactsList = YES;
peopleSearchDataSource.contactCellAccessoryImage = [[UIImage imageNamed: @"disclosure_icon"] vc_tintedImageUsingColor:ThemeService.shared.theme.textSecondaryColor];;