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

Enhancement - Messages search display

Browse Source 
- display the full text message
- display room name and sender name
- display attachment if any
- refresh the search result on new joined room or left room.
This commit is contained in:
giomfo
2016-09-30 11:17:12 +02:00
parent ac10335fdf
commit c71825e6be
13 changed files with 838 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vector/ViewController/HomeViewController.m
+22 -21
View File
@@ -27,7 +27,8 @@
#import "SettingsViewController.h"
#import "MXKSearchDataSource.h"
#import "HomeSearchViewController.h"
#import "HomeMessagesSearchViewController.h"
#import "HomeMessagesSearchDataSource.h"
#import "AppDelegate.h"
@@ -38,8 +39,8 @@
RecentsViewController *recentsViewController;
RecentsDataSource *recentsDataSource;
HomeSearchViewController *searchViewController;
MXKSearchDataSource *searchDataSource;
HomeMessagesSearchViewController *messagesSearchViewController;
HomeMessagesSearchDataSource *messagesSearchDataSource;
ContactPickerViewController *contactsViewController;
MXKContact *selectedContact;
@@ -83,8 +84,8 @@
[viewControllers addObject:recentsViewController];
[titles addObject: NSLocalizedStringFromTable(@"search_messages", @"Vector", nil)];
searchViewController = [HomeSearchViewController searchViewController];
[viewControllers addObject:searchViewController];
messagesSearchViewController = [HomeMessagesSearchViewController searchViewController];
[viewControllers addObject:messagesSearchViewController];
// Add search People tab
[titles addObject: NSLocalizedStringFromTable(@"search_people", @"Vector", nil)];
@@ -267,8 +268,8 @@
[recentsViewController displayList:recentsDataSource fromHomeViewController:self];
// Init the search for messages
searchDataSource = [[MXKSearchDataSource alloc] initWithMatrixSession:mainSession];
[searchViewController displaySearch:searchDataSource];
messagesSearchDataSource = [[HomeMessagesSearchDataSource alloc] initWithMatrixSession:mainSession];
[messagesSearchViewController displaySearch:messagesSearchDataSource];
// Check whether there are others sessions
NSArray* mxSessions = self.mxSessions;
@@ -281,7 +282,7 @@
// Add the session to the recents data source
[recentsDataSource addMatrixSession:mxSession];
// FIXME: Update searchDataSource
// FIXME: Update messagesSearchDataSource
}
}
}
@@ -311,7 +312,7 @@
// Add the session to the existing recents data source
[recentsDataSource addMatrixSession:mxSession];
// FIXME: Update searchDataSource
// FIXME: Update messagesSearchDataSource
}
}
@@ -330,7 +331,7 @@
recentsDataSource = nil;
}
// FIXME: Handle correctly searchDataSource
// FIXME: Handle correctly messagesSearchDataSource
[super removeMatrixSession:mxSession];
}
@@ -455,9 +456,9 @@
{
self.backgroundImageView.hidden = (!recentsDataSource.hideRecents || !recentsDataSource.hidePublicRoomsDirectory || (self.keyboardHeight == 0));
}
else if (self.selectedViewController == searchViewController)
else if (self.selectedViewController == messagesSearchViewController)
{
self.backgroundImageView.hidden = ((searchDataSource.serverCount != 0) || !searchViewController.noResultsLabel.isHidden || (self.keyboardHeight == 0));
self.backgroundImageView.hidden = ((messagesSearchDataSource.serverCount != 0) || !messagesSearchViewController.noResultsLabel.isHidden || (self.keyboardHeight == 0));
}
else if (self.selectedViewController == contactsViewController)
{
@@ -679,7 +680,7 @@
{
// Live timeline or timeline from a search result?
MXKRoomDataSource *roomDataSource;
if (!searchViewController.selectedEvent)
if (!messagesSearchViewController.selectedEvent)
{
if (!_selectedEventId)
{
@@ -700,7 +701,7 @@
else
{
// Search result: Create a temp timeline from the selected event
roomDataSource = [[RoomDataSource alloc] initWithRoomId:searchViewController.selectedEvent.roomId initialEventId:searchViewController.selectedEvent.eventId andMatrixSession:searchDataSource.mxSession];
roomDataSource = [[RoomDataSource alloc] initWithRoomId:messagesSearchViewController.selectedEvent.roomId initialEventId:messagesSearchViewController.selectedEvent.eventId andMatrixSession:messagesSearchDataSource.mxSession];
[roomDataSource finalizeInitialization];
// Give the data source ownership to the room view controller.
@@ -842,16 +843,16 @@
[recentsDataSource searchWithPatterns:patterns];
recentsViewController.shouldScrollToTopOnRefresh = YES;
}
else if (self.selectedViewController == searchViewController)
else if (self.selectedViewController == messagesSearchViewController)
{
// Launch the search only if the keyboard is no more visible
if (!self.searchBar.isFirstResponder)
{
// Do it asynchronously to give time to searchViewController to be set up
// Do it asynchronously to give time to messagesSearchViewController to be set up
// so that it can display its loading wheel
dispatch_async(dispatch_get_main_queue(), ^{
[searchDataSource searchMessageText:self.searchBar.text];
searchViewController.shouldScrollToBottomOnRefresh = YES;
[messagesSearchDataSource searchMessageText:self.searchBar.text force:NO];
messagesSearchViewController.shouldScrollToBottomOnRefresh = YES;
});
}
}
@@ -868,9 +869,9 @@
// Reset search result (if any)
[recentsDataSource searchWithPatterns:nil];
if (searchDataSource.searchText.length)
if (messagesSearchDataSource.searchText.length)
{
[searchDataSource searchMessageText:nil];
[messagesSearchDataSource searchMessageText:nil force:NO];
}
[contactsViewController searchWithPattern:nil];
}
@@ -903,7 +904,7 @@
{
[searchBar resignFirstResponder];
if (self.selectedViewController == searchViewController)
if (self.selectedViewController == messagesSearchViewController)
{
// As the messages search is done homeserver-side, launch it only on the "Search" button
[self updateSearch];