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

Search Screen: add People tab

Browse Source 
- add contact picker view controller
This commit is contained in:
giomfo
2016-06-20 14:16:13 +02:00
parent 88520ce712
commit ea2b75623e
10 changed files with 511 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vector/ViewController/HomeViewController.m
+23 -5
View File
@@ -25,6 +25,7 @@
#import "MXKSearchDataSource.h"
#import "HomeSearchViewController.h"
#import "ContactPickerViewController.h"
#import "AppDelegate.h"
@@ -35,6 +36,8 @@
HomeSearchViewController *searchViewController;
MXKSearchDataSource *searchDataSource;
ContactPickerViewController *contactsViewController;
// Display a gradient view above the screen
CAGradientLayer* tableViewMaskLayer;
@@ -78,10 +81,11 @@
searchViewController = [HomeSearchViewController searchViewController];
[viewControllers addObject:searchViewController];
// FIXME Add search People tab
// [titles addObject: NSLocalizedStringFromTable(@"search_people", @"Vector", nil)];
// MXKViewController *tempPeopleVC = [[MXKViewController alloc] init];
// [viewControllers addObject:tempPeopleVC];
// Add search People tab
[titles addObject: NSLocalizedStringFromTable(@"search_people", @"Vector", nil)];
contactsViewController = [ContactPickerViewController contactPickerViewController];
// TODO add delegate
[viewControllers addObject:contactsViewController];
[self initWithTitles:titles viewControllers:viewControllers defaultSelected:0];
@@ -445,7 +449,11 @@
}
else if (self.selectedViewController == searchViewController)
{
self.backgroundImageView.hidden = (((searchDataSource.serverCount != 0) && !searchViewController.noResultsLabel.isHidden) || (self.keyboardHeight == 0));
self.backgroundImageView.hidden = ((searchDataSource.serverCount != 0) || !searchViewController.noResultsLabel.isHidden || (self.keyboardHeight == 0));
}
else if (self.selectedViewController == contactsViewController)
{
self.backgroundImageView.hidden = (([contactsViewController.contactsTableView numberOfRowsInSection:0] != 0) || !contactsViewController.noResultsLabel.isHidden || (self.keyboardHeight == 0));
}
else
{
@@ -831,6 +839,10 @@
});
}
}
else if (self.selectedViewController == contactsViewController)
{
[contactsViewController searchWithPattern:self.searchBar.text];
}
}
else
{
@@ -844,6 +856,7 @@
{
[searchDataSource searchMessageText:nil];
}
[contactsViewController searchWithPattern:nil];
}
[self checkAndShowBackgroundImage];
@@ -858,6 +871,11 @@
// As the public room search is local, it can be updated on each text change
[self updateSearch];
}
else if (self.selectedViewController == contactsViewController)
{
// As the contact search is local, it can be updated on each text change
[self updateSearch];
}
else if (!self.searchBar.text.length)
{
// Reset message search if any