Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prepare UX Rework - People tab:

Browse source 
- Hide the known contacts section when no filter is defined
This commit is contained in:
Giom Foret 2017-05-09 10:35:00 +02:00
parent 477020c6bf
commit 0742c727f8
2 changed files with 10 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Riot/Assets/en.lproj/Vector.strings
View file

@ -160,7 +160,6 @@
"contacts_address_book_matrix_users_toggle" = "Matrix users only";
"contacts_address_book_no_contact" = "No local contacts";
"contacts_matrix_users_section" = "KNOWN CONTACTS";
"contacts_matrix_users_search_prompt" = "Too many contacts, please use the search field";
// Chat participants
"room_participants_title" = "Participants";

40
Riot/Model/Contact/ContactsDataSource.m
View file

@ -398,6 +398,10 @@
{
searchInputSection = count++;
}
// Keep visible the header for the both contact sections, even if their are empty.
filteredLocalContactsSection = count++;
filteredMatrixContactsSection = count++;
}
else
{
@ -406,11 +410,12 @@
{
filteredLocalContacts = [self unfilteredLocalContactsArray];
}
// Keep visible the local contact header, even if the section is empty.
filteredLocalContactsSection = count++;
}
// Keep visible the header for the both contact sections, even if their are empty.
filteredLocalContactsSection = count++;
filteredMatrixContactsSection = count++;
return count;
}
@ -430,16 +435,8 @@
}
else if (section == filteredMatrixContactsSection && !(shrinkedSectionsBitMask & CONTACTSDATASOURCE_KNOWNCONTACTS_BITWISE))
{
if (currentSearchText.length)
{
// Display a default cell when no contacts is available.
count = filteredMatrixContacts.count ? filteredMatrixContacts.count : 1;
}
else
{
// Display a message to invite the user to use the search field.
count = 1;
}
// Display a default cell when no contacts is available.
count = filteredMatrixContacts.count ? filteredMatrixContacts.count : 1;
}
return count;
@ -447,23 +444,6 @@
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
// Consider first the case of the known contacts section when no search is in progress.
if (!currentSearchText.length && indexPath.section == filteredMatrixContactsSection && indexPath.row == 0)
{
UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"defaultKnownContactCell"];
if (!cell)
{
cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"defaultKnownContactCell"];
}
cell.textLabel.text = NSLocalizedStringFromTable(@"contacts_matrix_users_search_prompt", @"Vector", nil);
cell.textLabel.numberOfLines = 2;
cell.textLabel.textColor = kRiotTextColorGray;
cell.textLabel.font = [UIFont systemFontOfSize:15.0];
cell.selectionStyle = UITableViewCellSelectionStyleNone;
return cell;
}
// Prepare a contact cell here
MXKContact *contact;
BOOL showMatrixIdInDisplayName = NO;