Improve the people invite screens

#904 - Keep visible the Local contacts header even if no local contacts is displayed in order to keep visible the check box "Matrix user only".
element-hq · Jan 27, 2017 · 9f8f8f1 · 9f8f8f1
1 parent 44eb705
commit 9f8f8f1
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/Vector/ViewController/ContactsTableViewController.m b/Vector/ViewController/ContactsTableViewController.m
@@ -505,10 +505,8 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
     {
         searchInputSection = count++;
 
-        if (filteredLocalContacts.count)
-        {
-            filteredLocalContactsSection = count++;
-        }
+        // Keep visible the Local contacts header even if no local contacts is displayed in order to keep visible the check box "Matrix user only".
+        filteredLocalContactsSection = count++;
 
         if (filteredMatrixContacts.count)
         {
@@ -523,10 +521,8 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
             filteredLocalContacts = [self unfilteredLocalContactsArray];
         }
 
-        if (filteredLocalContacts.count)
-        {
-            filteredLocalContactsSection = count++;
-        }
+        // Keep visible the Local contacts header even if no local contacts is displayed in order to keep visible the check box "Matrix user only".
+        filteredLocalContactsSection = count++;
     }
 
     // Enable the section shrinking only when all the contacts sections are displayed.
@@ -685,12 +681,13 @@ - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger
 
         if (section == filteredLocalContactsSection)
         {
-            headerLabel.text = NSLocalizedStringFromTable(@"contacts_address_book_section", @"Vector", nil);
+            headerLabel.text = [NSString stringWithFormat:@"%@ (%tu)", NSLocalizedStringFromTable(@"contacts_address_book_section", @"Vector", nil), filteredLocalContacts.count];
+
             sectionBitwise = CONTACTS_TABLEVC_LOCALCONTACTS_BITWISE;
         }
         else //if (section == filteredMatrixContactsSection)
         {
-            headerLabel.text = NSLocalizedStringFromTable(@"contacts_matrix_users_section", @"Vector", nil);
+            headerLabel.text = [NSString stringWithFormat:@"%@ (%tu)", NSLocalizedStringFromTable(@"contacts_matrix_users_section", @"Vector", nil), filteredMatrixContacts.count];
             sectionBitwise = CONTACTS_TABLEVC_KNOWNCONTACTS_BITWISE;
         }