Debug

Signal/src/Loki/View Controllers/GroupMembersVC.swift

@@ -18,6 +18,7 @@ final class GroupMembersVC : UIViewController, UITableViewDataSource {
         result.separatorStyle = .none
         result.backgroundColor = .clear
         result.showsVerticalScrollIndicator = false
+        result.alwaysBounceVertical = false
         return result
     }()
     
@@ -47,6 +48,7 @@ final class GroupMembersVC : UIViewController, UITableViewDataSource {
         titleLabel.textColor = Colors.text
         titleLabel.font = .boldSystemFont(ofSize: Values.veryLargeFontSize)
         navigationItem.titleView = titleLabel
+        // Set up explanation label
         let explanationLabel = UILabel()
         explanationLabel.textColor = Colors.text.withAlphaComponent(Values.unimportantElementOpacity)
         explanationLabel.font = .systemFont(ofSize: Values.smallFontSize)

Signal/src/Loki/View Controllers/HomeVC.swift

@@ -104,14 +104,14 @@ final class HomeVC : UIViewController, UITableViewDataSource, UITableViewDelegat
         if !hasViewedSeed && isMasterDevice {
             tableViewTopConstraint = tableView.pin(.top, to: .bottom, of: seedReminderView)
         } else {
-            tableViewTopConstraint = tableView.pin(.top, to: .top, of: view)
+            tableViewTopConstraint = tableView.pin(.top, to: .top, of: view, withInset: Values.smallSpacing)
         }
         tableView.pin(.trailing, to: .trailing, of: view)
         tableView.pin(.bottom, to: .bottom, of: view)
         // Set up search bar
-        tableView.tableHeaderView = searchBar
-        searchBar.sizeToFit()
-        tableView.contentOffset = CGPoint(x: 0, y: searchBar.frame.height)
+//        tableView.tableHeaderView = searchBar
+//        searchBar.sizeToFit()
+//        tableView.contentOffset = CGPoint(x: 0, y: searchBar.frame.height)
         // Set up new conversation button
         newConversationButton.addTarget(self, action: #selector(createPrivateChat), for: UIControl.Event.touchUpInside)
         view.addSubview(newConversationButton)
@@ -236,7 +236,7 @@ final class HomeVC : UIViewController, UITableViewDataSource, UITableViewDelegat
     
     @objc private func handleSeedViewedNotification(_ notification: Notification) {
         tableViewTopConstraint.isActive = false
-        tableViewTopConstraint = tableView.pin(.top, to: .top, of: view)
+        tableViewTopConstraint = tableView.pin(.top, to: .top, of: view, withInset: Values.smallSpacing)
         seedReminderView.removeFromSuperview()
     }
     

Signal/src/Loki/View Controllers/NewClosedGroupVC.swift

@@ -73,12 +73,23 @@ final class NewClosedGroupVC : UIViewController, UITableViewDataSource, UITableV
             nameTextField.pin(.leading, to: .leading, of: view, withInset: Values.largeSpacing)
             nameTextField.pin(.top, to: .top, of: view, withInset: Values.mediumSpacing)
             nameTextField.pin(.trailing, to: .trailing, of: view, withInset: -Values.largeSpacing)
+            let explanationLabel = UILabel()
+            explanationLabel.textColor = Colors.text.withAlphaComponent(Values.unimportantElementOpacity)
+            explanationLabel.font = .systemFont(ofSize: Values.smallFontSize)
+            explanationLabel.text = NSLocalizedString("Closed groups are end-to-end encrypted group chats for up to 10 members. They provide the same privacy protections as one-on-one sessions.", comment: "")
+            explanationLabel.numberOfLines = 0
+            explanationLabel.textAlignment = .center
+            explanationLabel.lineBreakMode = .byWordWrapping
+            view.addSubview(explanationLabel)
+            explanationLabel.pin(.leading, to: .leading, of: view, withInset: Values.largeSpacing)
+            explanationLabel.pin(.top, to: .bottom, of: nameTextField, withInset: Values.mediumSpacing)
+            explanationLabel.pin(.trailing, to: .trailing, of: view, withInset: -Values.largeSpacing)
             let separator = UIView()
             separator.backgroundColor = Colors.separator
             separator.set(.height, to: Values.separatorThickness)
             view.addSubview(separator)
             separator.pin(.leading, to: .leading, of: view)
-            separator.pin(.top, to: .bottom, of: nameTextField, withInset: Values.largeSpacing)
+            separator.pin(.top, to: .bottom, of: explanationLabel, withInset: Values.largeSpacing)
             separator.pin(.trailing, to: .trailing, of: view)
             view.addSubview(tableView)
             tableView.pin(.leading, to: .leading, of: view)
@@ -153,6 +164,9 @@ final class NewClosedGroupVC : UIViewController, UITableViewDataSource, UITableV
         guard selectedContacts.count >= 2 else {
             return showError(title: NSLocalizedString("Please pick at least 2 group members", comment: ""))
         }
+        guard selectedContacts.count <= 10 else {
+            return showError(title: NSLocalizedString("A closed group cannot have more than 10 members", comment: ""))
+        }
         let userHexEncodedPublicKey = getUserHexEncodedPublicKey()
         let members = [String](selectedContacts) + [ userHexEncodedPublicKey ]
         let admins = [ userHexEncodedPublicKey ]

Signal/translations/en.lproj/Localizable.strings

@@ -2802,3 +2802,5 @@
 "Search GIFs?" = "Search GIFs?";
 "You will not have full metadata protection when sending GIFs." = "You will not have full metadata protection when sending GIFs.";
 "The ability to add members to a closed group is coming soon." = "The ability to add members to a closed group is coming soon.";
+"A closed group cannot have more than 10 members" = "A closed group cannot have more than 10 members";
+"Closed groups are end-to-end encrypted group chats for up to 10 members. They provide the same privacy protections as one-on-one sessions." = "Closed groups are end-to-end encrypted group chats for up to 10 members. They provide the same privacy protections as one-on-one sessions.";