Bug Fix: Directory should be accessible from search even if the search field is empty

https://github.com/vector-im/vector-ios/issues/104
This commit is contained in:
giomfo
2016-05-30 13:42:45 +02:00
parent 982aa45362
commit d7f9011a0b
5 changed files with 82 additions and 36 deletions
@@ -37,13 +37,23 @@
case MXKDataSourceStateReady:
{
// Concatenate all patterns into one string
NSString *filter = [publicRoomsDirectoryDataSource.searchPatternsList componentsJoinedByString:@" "];
self.titleLabel.text = NSLocalizedStringFromTable(@"directory_search_results_title", @"Vector", nil);
self.descriptionLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"directory_search_results", @"Vector", nil),
publicRoomsDirectoryDataSource.filteredRooms.count,
filter];
if (publicRoomsDirectoryDataSource.searchPatternsList)
{
// Concatenate all patterns into one string
NSString *filter = [publicRoomsDirectoryDataSource.searchPatternsList componentsJoinedByString:@" "];
self.titleLabel.text = NSLocalizedStringFromTable(@"directory_search_results_title", @"Vector", nil);
self.descriptionLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"directory_search_results", @"Vector", nil),
publicRoomsDirectoryDataSource.filteredRooms.count,
filter];
}
else
{
self.titleLabel.text = NSLocalizedStringFromTable(@"directory_title", @"Vector", nil);
self.descriptionLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"directory_description", @"Vector", nil),
publicRoomsDirectoryDataSource.filteredRooms.count];
}
if (publicRoomsDirectoryDataSource.filteredRooms.count)
{