Add "Add Contact" options in contacts search

submodules/ContactListUI/Sources/ContactsController.swift

@@ -279,6 +279,19 @@ public class ContactsController: ViewController {
             openPeer(peer, false)
         }
         
+        self.contactsNode.requestAddContact = { [weak self] phoneNumber in
+            if let strongSelf = self {
+                strongSelf.view.endEditing(true)
+                strongSelf.context.sharedContext.openAddContact(context: strongSelf.context, firstName: "", lastName: "", phoneNumber: phoneNumber, label: defaultContactLabel, present: { [weak self] controller, arguments in
+                    self?.present(controller, in: .window(.root), with: arguments)
+                }, pushController: { [weak self] controller in
+                    (self?.navigationController as? NavigationController)?.pushViewController(controller)
+                }, completed: {
+                    self?.deactivateSearch(animated: false)
+                })
+            }
+        }
+        
         self.contactsNode.openPeopleNearby = { [weak self] in
             let _ = (DeviceAccess.authorizationStatus(subject: .location(.tracking))
             |> take(1)

submodules/ContactListUI/Sources/ContactsControllerNode.swift

@@ -55,6 +55,7 @@ final class ContactsControllerNode: ASDisplayNode {
     
     var requestDeactivateSearch: (() -> Void)?
     var requestOpenPeerFromSearch: ((ContactListPeer) -> Void)?
+    var requestAddContact: ((String) -> Void)?
     var openPeopleNearby: (() -> Void)?
     var openInvite: (() -> Void)?
     
@@ -184,7 +185,11 @@ final class ContactsControllerNode: ASDisplayNode {
             return
         }
         
-        self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ContactsSearchContainerNode(context: self.context, onlyWriteable: false, categories: [.cloudContacts, .global, .deviceContacts], openPeer: { [weak self] peer in
+        self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ContactsSearchContainerNode(context: self.context, onlyWriteable: false, categories: [.cloudContacts, .global, .deviceContacts], addContact: { [weak self] phoneNumber in
+            if let requestAddContact = self?.requestAddContact {
+                requestAddContact(phoneNumber)
+            }
+        }, openPeer: { [weak self] peer in
             if let requestOpenPeerFromSearch = self?.requestOpenPeerFromSearch {
                 requestOpenPeerFromSearch(peer)
             }

submodules/ContactListUI/Sources/ContactsSearchContainerNode.swift

@@ -23,93 +23,151 @@ private enum ContactListSearchGroup {
     case deviceContacts
 }
 
-private struct ContactListSearchEntry: Identifiable, Comparable {
-    let index: Int
-    let theme: PresentationTheme
-    let strings: PresentationStrings
-    let peer: ContactListPeer
-    let presence: PeerPresence?
-    let group: ContactListSearchGroup
-    let enabled: Bool
+private enum ContactListSearchEntryId: Hashable {
+    case addContact
+    case peerId(ContactListPeerId)
     
-    var stableId: ContactListPeerId {
-        return self.peer.id
+    static func <(lhs: ContactListSearchEntryId, rhs: ContactListSearchEntryId) -> Bool {
+        return lhs.hashValue < rhs.hashValue
+    }
+    
+    static func ==(lhs: ContactListSearchEntryId, rhs: ContactListSearchEntryId) -> Bool {
+        switch lhs {
+            case .addContact:
+                switch rhs {
+                    case .addContact:
+                        return true
+                    default:
+                        return false
+                }
+            case let .peerId(lhsId):
+                switch rhs {
+                    case let .peerId(rhsId):
+                        return lhsId == rhsId
+                    default:
+                        return false
+                }
+        }
+    }
+}
+
+private enum ContactListSearchEntry: Comparable, Identifiable {
+    case addContact(PresentationTheme, PresentationStrings, String)
+    case peer(Int, PresentationTheme, PresentationStrings, ContactListPeer, PeerPresence?, ContactListSearchGroup, Bool)
+    
+    var stableId: ContactListSearchEntryId {
+        switch self {
+            case .addContact:
+                return .addContact
+            case let .peer(_, _, _, peer, _, _, _):
+                return .peerId(peer.id)
+        }
     }
     
     static func ==(lhs: ContactListSearchEntry, rhs: ContactListSearchEntry) -> Bool {
-        if lhs.index != rhs.index {
-            return false
+        switch lhs {
+            case let .addContact(lhsTheme, lhsStrings, lhsPhoneNumber):
+                if case let .addContact(rhsTheme, rhsStrings, rhsPhoneNumber) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsPhoneNumber == rhsPhoneNumber {
+                    return true
+                } else {
+                    return false
+                }
+            case let .peer(lhsIndex, lhsTheme, lhsStrings, lhsPeer, lhsPresence, lhsGroup, lhsEnabled):
+                switch rhs {
+                    case let .peer(rhsIndex, rhsTheme, rhsStrings, rhsPeer, rhsPresence, rhsGroup, rhsEnabled):
+                        if lhsIndex != rhsIndex {
+                            return false
+                        }
+                        if lhsTheme !== rhsTheme {
+                            return false
+                        }
+                        if lhsStrings !== rhsStrings {
+                            return false
+                        }
+                        if lhsPeer != rhsPeer {
+                            return false
+                        }
+                        if let lhsPresence = lhsPresence, let rhsPresence = rhsPresence {
+                            if !lhsPresence.isEqual(to: rhsPresence) {
+                                return false
+                            }
+                        } else if (lhsPresence != nil) != (rhsPresence != nil) {
+                            return false
+                        }
+                        if lhsGroup != rhsGroup {
+                            return false
+                        }
+                        if lhsEnabled != rhsEnabled {
+                            return false
+                        }
+                        return true
+                    default:
+                        return false
+                }
         }
-        if lhs.theme !== rhs.theme {
-            return false
-        }
-        if lhs.strings !== rhs.strings {
-            return false
-        }
-        if lhs.peer != rhs.peer {
-            return false
-        }
-        if let lhsPresence = lhs.presence, let rhsPresence = rhs.presence {
-            if !lhsPresence.isEqual(to: rhsPresence) {
-                return false
-            }
-        } else if (lhs.presence != nil) != (rhs.presence != nil) {
-            return false
-        }
-        if lhs.group != rhs.group {
-            return false
-        }
-        if lhs.enabled != rhs.enabled {
-            return false
-        }
-        return true
     }
-    
+
     static func <(lhs: ContactListSearchEntry, rhs: ContactListSearchEntry) -> Bool {
-        return lhs.index < rhs.index
+        switch lhs {
+            case .addContact:
+                return true
+            case let .peer(lhsIndex, _, _, _, _, _, _):
+                switch rhs {
+                    case .addContact:
+                        return false
+                    case let .peer(rhsIndex, _, _, _, _, _, _):
+                        return lhsIndex < rhsIndex
+                }
+        }
     }
     
-    func item(context: AccountContext, presentationData: PresentationData, nameSortOrder: PresentationPersonNameOrder, nameDisplayOrder: PresentationPersonNameOrder, timeFormat: PresentationDateTimeFormat, openPeer: @escaping (ContactListPeer) -> Void, contextAction: ((Peer, ASDisplayNode, ContextGesture?) -> Void)?) -> ListViewItem {
-        let header: ListViewItemHeader
-        let status: ContactsPeerItemStatus
-        switch self.group {
-            case .contacts:
-                header = ChatListSearchItemHeader(type: .contacts, theme: self.theme, strings: self.strings, actionTitle: nil, action: nil)
-                if let presence = self.presence {
-                    status = .presence(presence, timeFormat)
-                } else {
-                    status = .none
+    func item(context: AccountContext, presentationData: PresentationData, nameSortOrder: PresentationPersonNameOrder, nameDisplayOrder: PresentationPersonNameOrder, timeFormat: PresentationDateTimeFormat, addContact: ((String) -> Void)?, openPeer: @escaping (ContactListPeer) -> Void, contextAction: ((Peer, ASDisplayNode, ContextGesture?) -> Void)?) -> ListViewItem {
+        switch self {
+            case let .addContact(theme, strings, phoneNumber):
+                return ContactsAddItem(theme: theme, strings: strings, phoneNumber: phoneNumber, header: ChatListSearchItemHeader(type: .phoneNumber, theme: theme, strings: strings, actionTitle: nil, action: nil), action: {
+                    addContact?(phoneNumber)
+                })
+            case let .peer(_, theme, strings, peer, presence, group, enabled):
+                let header: ListViewItemHeader
+                let status: ContactsPeerItemStatus
+                switch group {
+                    case .contacts:
+                        header = ChatListSearchItemHeader(type: .contacts, theme: theme, strings: strings, actionTitle: nil, action: nil)
+                        if let presence = presence {
+                            status = .presence(presence, timeFormat)
+                        } else {
+                            status = .none
+                        }
+                    case .global:
+                        header = ChatListSearchItemHeader(type: .globalPeers, theme: theme, strings: strings, actionTitle: nil, action: nil)
+                        if case let .peer(peer, _, _) = peer, let _ = peer.addressName {
+                            status = .addressName("")
+                        } else {
+                            status = .none
+                        }
+                    case .deviceContacts:
+                        header = ChatListSearchItemHeader(type: .deviceContacts, theme: theme, strings: strings, actionTitle: nil, action: nil)
+                        status = .none
                 }
-            case .global:
-                header = ChatListSearchItemHeader(type: .globalPeers, theme: self.theme, strings: self.strings, actionTitle: nil, action: nil)
-                if case let .peer(peer, _, _) = self.peer, let _ = peer.addressName {
-                    status = .addressName("")
-                } else {
-                    status = .none
+                var nativePeer: Peer?
+                let peerItem: ContactsPeerItemPeer
+                switch peer {
+                    case let .peer(peer, _, _):
+                        peerItem = .peer(peer: peer, chatPeer: peer)
+                        nativePeer = peer
+                    case let .deviceContact(stableId, contact):
+                        peerItem = .deviceContact(stableId: stableId, contact: contact)
                 }
-            case .deviceContacts:
-                header = ChatListSearchItemHeader(type: .deviceContacts, theme: self.theme, strings: self.strings, actionTitle: nil, action: nil)
-                status = .none
+                return ContactsPeerItem(presentationData: ItemListPresentationData(presentationData), sortOrder: nameSortOrder, displayOrder: nameDisplayOrder, context: context, peerMode: .peer, peer: peerItem, status: status, enabled: enabled, selection: .none, editing: ContactsPeerItemEditing(editable: false, editing: false, revealed: false), index: nil, header: header, action: { _ in
+                    openPeer(peer)
+                }, contextAction: contextAction.flatMap { contextAction in
+                    return nativePeer.flatMap { nativePeer in
+                        return { node, gesture in
+                            contextAction(nativePeer, node, gesture)
+                        }
+                    }
+                })
         }
-        let peer = self.peer
-        var nativePeer: Peer?
-        let peerItem: ContactsPeerItemPeer
-        switch peer {
-            case let .peer(peer, _, _):
-                peerItem = .peer(peer: peer, chatPeer: peer)
-                nativePeer = peer
-            case let .deviceContact(stableId, contact):
-                peerItem = .deviceContact(stableId: stableId, contact: contact)
-        }
-        return ContactsPeerItem(presentationData: ItemListPresentationData(presentationData), sortOrder: nameSortOrder, displayOrder: nameDisplayOrder, context: context, peerMode: .peer, peer: peerItem, status: status, enabled: self.enabled, selection: .none, editing: ContactsPeerItemEditing(editable: false, editing: false, revealed: false), index: nil, header: header, action: { _ in
-            openPeer(peer)
-        }, contextAction: contextAction.flatMap { contextAction in
-            return nativePeer.flatMap { nativePeer in
-                return { node, gesture in
-                    contextAction(nativePeer, node, gesture)
-                }
-            }
-        })
     }
 }
 
@@ -120,12 +178,12 @@ struct ContactListSearchContainerTransition {
     let isSearching: Bool
 }
 
-private func contactListSearchContainerPreparedRecentTransition(from fromEntries: [ContactListSearchEntry], to toEntries: [ContactListSearchEntry], isSearching: Bool, context: AccountContext, presentationData: PresentationData, nameSortOrder: PresentationPersonNameOrder, nameDisplayOrder: PresentationPersonNameOrder, timeFormat: PresentationDateTimeFormat, openPeer: @escaping (ContactListPeer) -> Void, contextAction: ((Peer, ASDisplayNode, ContextGesture?) -> Void)?) -> ContactListSearchContainerTransition {
+private func contactListSearchContainerPreparedRecentTransition(from fromEntries: [ContactListSearchEntry], to toEntries: [ContactListSearchEntry], isSearching: Bool, context: AccountContext, presentationData: PresentationData, nameSortOrder: PresentationPersonNameOrder, nameDisplayOrder: PresentationPersonNameOrder, timeFormat: PresentationDateTimeFormat, addContact: ((String) -> Void)?, openPeer: @escaping (ContactListPeer) -> Void, contextAction: ((Peer, ASDisplayNode, ContextGesture?) -> Void)?) -> ContactListSearchContainerTransition {
     let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: fromEntries, rightList: toEntries)
     
     let deletions = deleteIndices.map { ListViewDeleteItem(index: $0, directionHint: nil) }
-    let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, presentationData: presentationData, nameSortOrder: nameSortOrder, nameDisplayOrder: nameDisplayOrder, timeFormat: timeFormat, openPeer: openPeer, contextAction: contextAction), directionHint: nil) }
-    let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, presentationData: presentationData, nameSortOrder: nameSortOrder, nameDisplayOrder: nameDisplayOrder, timeFormat: timeFormat, openPeer: openPeer, contextAction: contextAction), directionHint: nil) }
+    let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, presentationData: presentationData, nameSortOrder: nameSortOrder, nameDisplayOrder: nameDisplayOrder, timeFormat: timeFormat, addContact: addContact, openPeer: openPeer, contextAction: contextAction), directionHint: nil) }
+    let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, presentationData: presentationData, nameSortOrder: nameSortOrder, nameDisplayOrder: nameDisplayOrder, timeFormat: timeFormat, addContact: addContact, openPeer: openPeer, contextAction: contextAction), directionHint: nil) }
     
     return ContactListSearchContainerTransition(deletions: deletions, insertions: insertions, updates: updates, isSearching: isSearching)
 }
@@ -144,6 +202,7 @@ public struct ContactsSearchCategories: OptionSet {
 
 public final class ContactsSearchContainerNode: SearchDisplayControllerContentNode {
     private let context: AccountContext
+    private let addContact: ((String) -> Void)?
     private let openPeer: (ContactListPeer) -> Void
     private let contextAction: ((Peer, ASDisplayNode, ContextGesture?) -> Void)?
     
@@ -163,8 +222,9 @@ public final class ContactsSearchContainerNode: SearchDisplayControllerContentNo
         return true
     }
     
-    public init(context: AccountContext, onlyWriteable: Bool, categories: ContactsSearchCategories, filters: [ContactListFilter] = [.excludeSelf], openPeer: @escaping (ContactListPeer) -> Void, contextAction: ((Peer, ASDisplayNode, ContextGesture?) -> Void)?) {
+    public init(context: AccountContext, onlyWriteable: Bool, categories: ContactsSearchCategories, filters: [ContactListFilter] = [.excludeSelf], addContact: ((String) -> Void)?, openPeer: @escaping (ContactListPeer) -> Void, contextAction: ((Peer, ASDisplayNode, ContextGesture?) -> Void)?) {
         self.context = context
+        self.addContact = addContact
         self.openPeer = openPeer
         self.contextAction = contextAction
         
@@ -250,7 +310,7 @@ public final class ContactsSearchContainerNode: SearchDisplayControllerContentNo
                         if onlyWriteable {
                             enabled = canSendMessagesToPeer(peer)
                         }
-                        entries.append(ContactListSearchEntry(index: index, theme: themeAndStrings.0, strings: themeAndStrings.1, peer: .peer(peer: peer, isGlobal: false, participantCount: nil), presence: localPeersAndPresences.1[peer.id], group: .contacts, enabled: enabled))
+                        entries.append(.peer(index, themeAndStrings.0, themeAndStrings.1, .peer(peer: peer, isGlobal: false, participantCount: nil), localPeersAndPresences.1[peer.id], .contacts, enabled))
                         if searchDeviceContacts, let user = peer as? TelegramUser, let phone = user.phone {
                             existingNormalizedPhoneNumbers.insert(DeviceContactNormalizedPhoneNumber(rawValue: formatPhoneNumber(phone)))
                         }
@@ -269,7 +329,7 @@ public final class ContactsSearchContainerNode: SearchDisplayControllerContentNo
                                     enabled = canSendMessagesToPeer(peer.peer)
                                 }
                                 
-                                entries.append(ContactListSearchEntry(index: index, theme: themeAndStrings.0, strings: themeAndStrings.1, peer: .peer(peer: peer.peer, isGlobal: true, participantCount: peer.subscribers), presence: nil, group: .global, enabled: enabled))
+                                entries.append(.peer(index, themeAndStrings.0, themeAndStrings.1, .peer(peer: peer.peer, isGlobal: true, participantCount: peer.subscribers), nil, .global, enabled))
                                 if searchDeviceContacts, let user = peer.peer as? TelegramUser, let phone = user.phone {
                                     existingNormalizedPhoneNumbers.insert(DeviceContactNormalizedPhoneNumber(rawValue: formatPhoneNumber(phone)))
                                 }
@@ -288,7 +348,7 @@ public final class ContactsSearchContainerNode: SearchDisplayControllerContentNo
                                     enabled = canSendMessagesToPeer(peer.peer)
                                 }
                                 
-                                entries.append(ContactListSearchEntry(index: index, theme: themeAndStrings.0, strings: themeAndStrings.1, peer: .peer(peer: peer.peer, isGlobal: true, participantCount: peer.subscribers), presence: nil, group: .global, enabled: enabled))
+                                entries.append(.peer(index, themeAndStrings.0, themeAndStrings.1, .peer(peer: peer.peer, isGlobal: true, participantCount: peer.subscribers), nil, .global, enabled))
                                 if searchDeviceContacts, let user = peer.peer as? TelegramUser, let phone = user.phone {
                                     existingNormalizedPhoneNumbers.insert(DeviceContactNormalizedPhoneNumber(rawValue: formatPhoneNumber(phone)))
                                 }
@@ -309,10 +369,15 @@ public final class ContactsSearchContainerNode: SearchDisplayControllerContentNo
                                     continue outer
                                 }
                             }
-                            entries.append(ContactListSearchEntry(index: index, theme: themeAndStrings.0, strings: themeAndStrings.1, peer: .deviceContact(stableId, contact.0), presence: nil, group: .deviceContacts, enabled: true))
+                            entries.append(.peer(index, themeAndStrings.0, themeAndStrings.1, .deviceContact(stableId, contact.0), nil, .deviceContacts, true))
                             index += 1
                         }
                     }
+                    
+                    if let _ = addContact, isViablePhoneNumber(query) {
+                        entries.append(.addContact(themeAndStrings.0, themeAndStrings.1, query))
+                    }
+                    
                     return entries
                 }
             } else {
@@ -328,7 +393,16 @@ public final class ContactsSearchContainerNode: SearchDisplayControllerContentNo
             if let strongSelf = self {
                 let previousItems = previousSearchItems.swap(items ?? [])
                 
-                let transition = contactListSearchContainerPreparedRecentTransition(from: previousItems, to: items ?? [], isSearching: items != nil, context: context, presentationData: strongSelf.presentationData, nameSortOrder: strongSelf.presentationData.nameSortOrder, nameDisplayOrder: strongSelf.presentationData.nameDisplayOrder, timeFormat: strongSelf.presentationData.dateTimeFormat, openPeer: { peer in self?.listNode.clearHighlightAnimated(true)
+                var addContact: ((String) -> Void)?
+                if let originalAddContact = strongSelf.addContact {
+                    addContact = { [weak self] phoneNumber in
+                        self?.listNode.clearHighlightAnimated(true)
+                        originalAddContact(phoneNumber)
+                    }
+                }
+                
+                let transition = contactListSearchContainerPreparedRecentTransition(from: previousItems, to: items ?? [], isSearching: items != nil, context: context, presentationData: strongSelf.presentationData, nameSortOrder: strongSelf.presentationData.nameSortOrder, nameDisplayOrder: strongSelf.presentationData.nameDisplayOrder, timeFormat: strongSelf.presentationData.dateTimeFormat, addContact: addContact, openPeer: { peer in
+                    self?.listNode.clearHighlightAnimated(true)
                     self?.openPeer(peer)
                 }, contextAction: strongSelf.contextAction)
                 

submodules/ContactListUI/Sources/InviteContactsControllerNode.swift

@@ -505,7 +505,7 @@ final class InviteContactsControllerNode: ASDisplayNode {
             return
         }
         
-        self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ContactsSearchContainerNode(context: self.context, onlyWriteable: false, categories: [.deviceContacts], openPeer: { [weak self] peer in
+        self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ContactsSearchContainerNode(context: self.context, onlyWriteable: false, categories: [.deviceContacts], addContact: nil, openPeer: { [weak self] peer in
             if let strongSelf = self, case let .deviceContact(id, _) = peer {
                 strongSelf.selectionState = strongSelf.selectionState.withSelectedContactId(id)
                 strongSelf.requestDeactivateSearch?()

submodules/TelegramUI/Sources/ComposeControllerNode.swift

@@ -124,7 +124,7 @@ final class ComposeControllerNode: ASDisplayNode {
             return
         }
         
-        self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ContactsSearchContainerNode(context: self.context, onlyWriteable: false, categories: [.cloudContacts, .global], openPeer: { [weak self] peer in
+        self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ContactsSearchContainerNode(context: self.context, onlyWriteable: false, categories: [.cloudContacts, .global], addContact: nil, openPeer: { [weak self] peer in
             if let requestOpenPeerFromSearch = self?.requestOpenPeerFromSearch, case let .peer(peer, _, _) = peer {
                 requestOpenPeerFromSearch(peer.id)
             }

submodules/TelegramUI/Sources/ContactSelectionControllerNode.swift

@@ -123,7 +123,7 @@ final class ContactSelectionControllerNode: ASDisplayNode {
         } else {
             categories.insert(.global)
         }
-        self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ContactsSearchContainerNode(context: self.context, onlyWriteable: false, categories: categories, openPeer: { [weak self] peer in
+        self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ContactsSearchContainerNode(context: self.context, onlyWriteable: false, categories: categories, addContact: nil, openPeer: { [weak self] peer in
             self?.requestOpenPeerFromSearch?(peer)
         }, contextAction: nil), cancel: { [weak self] in
             if let requestDeactivateSearch = self?.requestDeactivateSearch {

submodules/TelegramUI/Sources/PeerSelectionControllerNode.swift

@@ -248,7 +248,7 @@ final class PeerSelectionControllerNode: ASDisplayNode {
             }, placeholder: placeholderNode)
             
         } else if let contactListNode = self.contactListNode, contactListNode.supernode != nil {
-            self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ContactsSearchContainerNode(context: self.context, onlyWriteable: true, categories: [.cloudContacts, .global], openPeer: { [weak self] peer in
+            self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ContactsSearchContainerNode(context: self.context, onlyWriteable: true, categories: [.cloudContacts, .global], addContact: nil, openPeer: { [weak self] peer in
                 if let strongSelf = self {
                     switch peer {
                         case let .peer(peer, _, _):