Merge branch 'invite-friends' into 'development'

Invite friends

See merge request elixxir/client-ios!59

App/client-ios/Resources/Info.plist

@@ -34,10 +34,10 @@
 		</dict>
 		<dict>
 			<key>CFBundleURLName</key>
-			<string>xxmessenger</string>
+			<string>xxnetwork</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>xxmessenger</string>
+				<string>xxnetwork</string>
 			</array>
 		</dict>
 		<dict>

Package.swift

@@ -722,6 +722,13 @@ let package = Package(
                 dependencies: ["DependencyInjection"]
             ),
 
+        // MARK: - AppTests
+
+            .testTarget(
+                name: "AppTests",
+                dependencies: ["App"]
+            ),
+
         // MARK: - ProfileFeatureTests
 
             .testTarget(

Sources/App/AppDelegate.swift

@@ -20,6 +20,7 @@ public class AppDelegate: UIResponder, UIApplicationDelegate {
     @Dependency private var crashReporter: CrashReporter
     @Dependency private var dropboxService: DropboxInterface
 
+    @KeyObject(.invitation, defaultValue: nil) var invitation: String?
     @KeyObject(.hideAppList, defaultValue: false) var hideAppList: Bool
     @KeyObject(.recordingLogs, defaultValue: true) var recordingLogs: Bool
     @KeyObject(.crashReporting, defaultValue: true) var isCrashReportingEnabled: Bool
@@ -142,10 +143,30 @@ public class AppDelegate: UIResponder, UIApplicationDelegate {
         open url: URL,
         options: [UIApplication.OpenURLOptionsKey : Any] = [:]
     ) -> Bool {
-        dropboxService.handleOpenUrl(url)
+        if let username = getUsernameFromInvitationDeepLink(url) {
+            let router = try! DependencyInjection.Container.shared.resolve() as PushRouter
+            invitation = username
+            router.navigateTo(.search, {})
+
+            return true
+        } else {
+            return dropboxService.handleOpenUrl(url)
+        }
     }
 }
 
+func getUsernameFromInvitationDeepLink(_ url: URL) -> String? {
+    if let components = URLComponents(url: url, resolvingAgainstBaseURL: false),
+       components.scheme == "xxnetwork",
+       components.host == "messenger",
+       let queryItem = components.queryItems?.first(where: { $0.name == "invitation" }),
+       let username = queryItem.value {
+        return username
+    }
+
+    return nil
+}
+
 // MARK: Notifications
 
 extension AppDelegate: UNUserNotificationCenterDelegate {

Sources/App/DependencyRegistrator.swift

@@ -113,6 +113,7 @@ struct DependencyRegistrator {
 
         container.register(
             LaunchCoordinator(
+                searchFactory: SearchContainerController.init,
                 requestsFactory: RequestsContainerController.init,
                 chatListFactory: ChatListController.init,
                 onboardingFactory: OnboardingStartController.init(_:),
@@ -250,38 +251,3 @@ struct DependencyRegistrator {
             ) as ChatListCoordinating)
     }
 }
-
-extension PushRouter {
-    static func live(navigationController: UINavigationController) -> PushRouter {
-        PushRouter { route, completion in
-            if let launchController = navigationController.viewControllers.last as? LaunchController {
-                launchController.pendingPushRoute = route
-            } else {
-                switch route {
-                case .requests:
-                    if (navigationController.viewControllers.last as? RequestsContainerController) == nil {
-                        navigationController.setViewControllers([RequestsContainerController()], animated: true)
-                    }
-                case .contactChat(id: let id):
-                    if let session = try? DependencyInjection.Container.shared.resolve() as SessionType,
-                       let contact = try? session.dbManager.fetchContacts(.init(id: [id])).first {
-                        navigationController.setViewControllers([
-                            ChatListController(),
-                            SingleChatController(contact)
-                        ], animated: true)
-                    }
-                case .groupChat(id: let id):
-                    if let session = try? DependencyInjection.Container.shared.resolve() as SessionType,
-                       let info = try? session.dbManager.fetchGroupInfos(.init(groupId: id)).first {
-                        navigationController.setViewControllers([
-                            ChatListController(),
-                            GroupChatController(info)
-                        ], animated: true)
-                    }
-                }
-            }
-
-            completion()
-        }
-    }
-}

Sources/App/PushRouter.swift

+import UIKit
+import PushFeature
+import Integration
+import ChatFeature
+import SearchFeature
+import LaunchFeature
+import ChatListFeature
+import RequestsFeature
+import DependencyInjection
+
+extension PushRouter {
+    static func live(navigationController: UINavigationController) -> PushRouter {
+        PushRouter { route, completion in
+            if let launchController = navigationController.viewControllers.last as? LaunchController {
+                launchController.pendingPushRoute = route
+            } else {
+                switch route {
+                case .search:
+                    if !(navigationController.viewControllers.last is SearchContainerController) {
+                        navigationController.setViewControllers([
+                            ChatListController(),
+                            SearchContainerController()
+                        ], animated: true)
+                    }
+                case .requests:
+                    if !(navigationController.viewControllers.last is RequestsContainerController) {
+                        navigationController.setViewControllers([RequestsContainerController()], animated: true)
+                    }
+                case .contactChat(id: let id):
+                    if let session = try? DependencyInjection.Container.shared.resolve() as SessionType,
+                       let contact = try? session.dbManager.fetchContacts(.init(id: [id])).first {
+                        navigationController.setViewControllers([
+                            ChatListController(),
+                            SingleChatController(contact)
+                        ], animated: true)
+                    }
+                case .groupChat(id: let id):
+                    if let session = try? DependencyInjection.Container.shared.resolve() as SessionType,
+                       let info = try? session.dbManager.fetchGroupInfos(.init(groupId: id)).first {
+                        navigationController.setViewControllers([
+                            ChatListController(),
+                            GroupChatController(info)
+                        ], animated: true)
+                    }
+                }
+            }
+
+            completion()
+        }
+    }
+}

Sources/Defaults/KeyObject.swift

@@ -21,6 +21,7 @@ public enum Key: String {
     // MARK: General
 
     case theme
+    case invitation
 
     // MARK: Requests
 

Sources/Integration/Session/Session+UD.swift

+import Retry
 import Models
+import Combine
 import XXModels
 import Foundation
-import Combine
 
 extension Session {
+    public func waitForNodes(timeout: Int) -> AnyPublisher<Void, Error> {
+        Deferred {
+            Future { promise in
+                retry(max: timeout, retryStrategy: .delay(seconds: 1)) { [weak self] in
+                    guard let self = self else { return }
+                    try self.client.bindings.nodeRegistrationStatus()
+                    promise(.success(()))
+                }.finalCatch {
+                    promise(.failure($0))
+                }
+            }
+        }.eraseToAnyPublisher()
+    }
+
     public func search(fact: String) -> AnyPublisher<Contact, Error> {
         Deferred {
             Future { promise in

Sources/Integration/Session/SessionType.swift

@@ -68,4 +68,6 @@ public protocol SessionType {
     )
 
     func search(fact: String) -> AnyPublisher<Contact, Error>
+
+    func waitForNodes(timeout: Int) -> AnyPublisher<Void, Error>
 }

Sources/LaunchFeature/LaunchController.swift

@@ -5,7 +5,6 @@ import Combine
 import PushFeature
 import DependencyInjection
 
-
 public final class LaunchController: UIViewController {
     @Dependency private var hud: HUD
     @Dependency private var coordinator: LaunchCoordinating
@@ -50,9 +49,14 @@ public final class LaunchController: UIViewController {
             .receive(on: DispatchQueue.main)
             .sink { [unowned self] in
                 switch $0 {
+                case .search:
+                    coordinator.toSearch(from: self)
                 case .chats:
                     if let pushRoute = pendingPushRoute {
                         switch pushRoute {
+                        case .search:
+                            coordinator.toSearch(from: self)
+
                         case .requests:
                             coordinator.toRequests(from: self)
 

Sources/LaunchFeature/LaunchCoordinator.swift

@@ -5,6 +5,7 @@ import Presentation
 
 public protocol LaunchCoordinating {
     func toChats(from: UIViewController)
+    func toSearch(from: UIViewController)
     func toRequests(from: UIViewController)
     func toOnboarding(with: String, from: UIViewController)
     func toSingleChat(with: Contact, from: UIViewController)
@@ -14,6 +15,7 @@ public protocol LaunchCoordinating {
 public struct LaunchCoordinator: LaunchCoordinating {
     var replacePresenter: Presenting = ReplacePresenter()
 
+    var searchFactory: () -> UIViewController
     var requestsFactory: () -> UIViewController
     var chatListFactory: () -> UIViewController
     var onboardingFactory: (String) -> UIViewController
@@ -21,12 +23,14 @@ public struct LaunchCoordinator: LaunchCoordinating {
     var groupChatFactory: (GroupInfo) -> UIViewController
 
     public init(
+        searchFactory: @escaping () -> UIViewController,
         requestsFactory: @escaping () -> UIViewController,
         chatListFactory: @escaping () -> UIViewController,
         onboardingFactory: @escaping (String) -> UIViewController,
         singleChatFactory: @escaping (Contact) -> UIViewController,
         groupChatFactory: @escaping (GroupInfo) -> UIViewController
     ) {
+        self.searchFactory = searchFactory
         self.requestsFactory = requestsFactory
         self.chatListFactory = chatListFactory
         self.groupChatFactory = groupChatFactory
@@ -36,6 +40,12 @@ public struct LaunchCoordinator: LaunchCoordinating {
 }
 
 public extension LaunchCoordinator {
+    func toSearch(from parent: UIViewController) {
+        let screen = searchFactory()
+        let chatListScreen = chatListFactory()
+        replacePresenter.present(chatListScreen, screen, from: parent)
+    }
+
     func toChats(from parent: UIViewController) {
         let screen = chatListFactory()
         replacePresenter.present(screen, from: parent)

Sources/LaunchFeature/LaunchViewModel.swift

@@ -24,6 +24,7 @@ struct Update {
 
 enum LaunchRoute {
     case chats
+    case search
     case update(Update)
     case onboarding(String)
 }
@@ -36,6 +37,7 @@ final class LaunchViewModel {
     @Dependency private var permissionHandler: PermissionHandling
 
     @KeyObject(.username, defaultValue: nil) var username: String?
+    @KeyObject(.invitation, defaultValue: nil) var invitation: String?
     @KeyObject(.biometrics, defaultValue: false) var isBiometricsOn: Bool
 
     var hudPublisher: AnyPublisher<HUDStatus, Never> {
@@ -180,17 +182,28 @@ final class LaunchViewModel {
     private func checkBiometrics() {
         if permissionHandler.isBiometricsAvailable && isBiometricsOn {
             permissionHandler.requestBiometrics { [weak self] in
+                guard let self = self else { return }
+
                 switch $0 {
                 case .success(let granted):
                     guard granted else { return }
-                    self?.routeSubject.send(.chats)
+
+                    if self.invitation != nil {
+                        self.routeSubject.send(.search)
+                    } else {
+                        self.routeSubject.send(.chats)
+                    }
 
                 case .failure(let error):
-                    self?.hudSubject.send(.error(HUDError(with: error)))
+                    self.hudSubject.send(.error(HUDError(with: error)))
                 }
             }
         } else {
-            routeSubject.send(.chats)
+            if self.invitation != nil {
+                self.routeSubject.send(.search)
+            } else {
+                self.routeSubject.send(.chats)
+            }
         }
     }
 }

Sources/MenuFeature/Controllers/MenuController.swift

@@ -9,6 +9,7 @@ public enum MenuItem {
     case join
     case scan
     case chats
+    case share
     case profile
     case contacts
     case requests
@@ -171,6 +172,19 @@ public final class MenuController: UIViewController {
                 }
             }.store(in: &cancellables)
 
+        screenView.shareButton
+            .publisher(for: .touchUpInside)
+            .receive(on: DispatchQueue.main)
+            .sink { [unowned self] in
+                dismiss(animated: true) { [weak self] in
+                    guard let self = self, self.previousItem != .share else { return }
+                    self.coordinator.toActivityController(
+                        with: [Localized.Menu.shareContent(self.viewModel.referralDeeplink)],
+                        from: self.previousController
+                    )
+                }
+            }.store(in: &cancellables)
+
         viewModel.requestCount
             .receive(on: DispatchQueue.main)
             .sink { [weak screenView] in screenView?.requestsButton.updateNotification($0) }

Sources/MenuFeature/Coordinator/MenuCoordinator.swift

@@ -4,9 +4,11 @@ import Presentation
 public protocol MenuCoordinating {
     func toFlow(_ item: MenuItem, from: UIViewController)
     func toDrawer(_: UIViewController, from: UIViewController)
+    func toActivityController(with: [Any], from: UIViewController)
 }
 
 public struct MenuCoordinator: MenuCoordinating {
+    var modalPresenter: Presenting = ModalPresenter()
     var bottomPresenter: Presenting = BottomPresenter()
     var replacePresenter: Presenting = ReplacePresenter()
 
@@ -16,6 +18,8 @@ public struct MenuCoordinator: MenuCoordinating {
     var settingsFactory: () -> UIViewController
     var contactsFactory: () -> UIViewController
     var requestsFactory: () -> UIViewController
+    var activityControllerFactory: ([Any]) -> UIViewController
+    = { UIActivityViewController(activityItems: $0, applicationActivities: nil) }
 
     public init(
         scanFactory: @escaping () -> UIViewController,
@@ -61,4 +65,9 @@ public extension MenuCoordinator {
 
         replacePresenter.present(controller, from: parent)
     }
+
+    func toActivityController(with items: [Any], from parent: UIViewController) {
+        let screen = activityControllerFactory(items)
+        modalPresenter.present(screen, from: parent)
+    }
 }

Sources/MenuFeature/ViewModels/MenuViewModel.swift

@@ -40,4 +40,8 @@ final class MenuViewModel {
     var version: String {
         Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? ""
     }
+
+    var referralDeeplink: String {
+        "xxnetwork://messenger?invitation=\(username)"
+    }
 }

Sources/MenuFeature/Views/MenuView.swift

@@ -2,31 +2,33 @@ import UIKit
 import Shared
 
 final class MenuView: UIView {
-    let headerView = MenuHeaderView()
+    let buildLabel = UILabel()
+    let versionLabel = UILabel()
     let stackView = UIStackView()
+    let xxdkVersionLabel = UILabel()
+    let infoStackView = UIStackView()
+    let headerView = MenuHeaderView()
+    let joinButton = MenuSectionButton()
     let scanButton = MenuSectionButton()
+    let shareButton = MenuSectionButton()
     let chatsButton = MenuSectionButton()
     let contactsButton = MenuSectionButton()
     let requestsButton = MenuSectionButton()
     let settingsButton = MenuSectionButton()
     let dashboardButton = MenuSectionButton()
-    let joinButton = MenuSectionButton()
-    let infoStackView = UIStackView()
-    let buildLabel = UILabel()
-    let versionLabel = UILabel()
-    let xxdkVersionLabel = UILabel()
 
     init() {
         super.init(frame: .zero)
         backgroundColor = Asset.neutralDark.color
 
-        chatsButton.set(title: Localized.Menu.chats, image: Asset.menuChats.image)
         scanButton.set(title: Localized.Menu.scan, image: Asset.menuScan.image)
+        shareButton.set(title: Localized.Menu.share, image: Asset.menuShare.image)
+        chatsButton.set(title: Localized.Menu.chats, image: Asset.menuChats.image)
+        joinButton.set(title: Localized.Menu.join, image: Asset.permissionLogo.image)
         requestsButton.set(title: Localized.Menu.requests, image: Asset.menuRequests.image)
         contactsButton.set(title: Localized.Menu.contacts, image: Asset.menuContacts.image)
         settingsButton.set(title: Localized.Menu.settings, image: Asset.menuSettings.image)
         dashboardButton.set(title: Localized.Menu.dashboard, image: Asset.menuDashboard.image)
-        joinButton.set(title: "Join xx network", image: Asset.permissionLogo.image)
 
         stackView.addArrangedSubview(chatsButton)
         stackView.addArrangedSubview(contactsButton)
@@ -35,6 +37,7 @@ final class MenuView: UIView {
         stackView.addArrangedSubview(settingsButton)
         stackView.addArrangedSubview(dashboardButton)
         stackView.addArrangedSubview(joinButton)
+        stackView.addArrangedSubview(shareButton)
 
         infoStackView.spacing = 10
         infoStackView.axis = .vertical
@@ -59,17 +62,17 @@ final class MenuView: UIView {
 
     func select(item: MenuItem) {
         switch item {
+        case .scan:
+            scanButton.set(color: Asset.brandPrimary.color)
         case .chats:
             chatsButton.set(color: Asset.brandPrimary.color)
         case .contacts:
             contactsButton.set(color: Asset.brandPrimary.color)
         case .requests:
             requestsButton.set(color: Asset.brandPrimary.color)
-        case .scan:
-            scanButton.set(color: Asset.brandPrimary.color)
         case .settings:
             settingsButton.set(color: Asset.brandPrimary.color)
-        case .profile, .dashboard, .join:
+        case .share, .join, .profile, .dashboard:
             break
         }
     }

Sources/PushFeature/PushRouter.swift

@@ -4,6 +4,7 @@ public struct PushRouter {
     public typealias NavigateTo = (Route, @escaping () -> Void) -> Void
 
     public enum Route {
+        case search
         case requests
         case groupChat(id: Data)
         case contactChat(id: Data)

Sources/SearchFeature/Controllers/SearchLeftController.swift

@@ -37,6 +37,11 @@ final class SearchLeftController: UIViewController {
         setupBindings()
     }
 
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        viewModel.viewDidAppear()
+    }
+
     func endEditing() {
         screenView.inputField.endEditing(true)
     }
@@ -131,6 +136,13 @@ final class SearchLeftController: UIViewController {
             .sink { [unowned self] in screenView.countryButton.setFlag($0.flag, prefix: $0.prefix) }
             .store(in: &cancellables)
 
+        viewModel.statePublisher
+            .map(\.input)
+            .removeDuplicates()
+            .receive(on: DispatchQueue.main)
+            .sink { [unowned self] in screenView.inputField.update(content: $0) }
+            .store(in: &cancellables)
+
         viewModel.statePublisher
             .compactMap(\.snapshot)
             .receive(on: DispatchQueue.main)
@@ -403,7 +415,6 @@ final class SearchLeftController: UIViewController {
 
         coordinator.toDrawer(drawer, from: self)
     }
-
 }
 
 extension SearchLeftController: UITableViewDelegate {

Sources/SearchFeature/ViewModels/SearchLeftViewModel.swift

@@ -3,8 +3,10 @@ import UIKit
 import Shared
 import Combine
 import XXModels
+import Defaults
 import Countries
 import Integration
+import NetworkMonitor
 import DependencyInjection
 
 typealias SearchSnapshot = NSDiffableDataSourceSnapshot<SearchSection, SearchItem>
@@ -18,6 +20,9 @@ struct SearchLeftViewState {
 
 final class SearchLeftViewModel {
     @Dependency var session: SessionType
+    @Dependency var networkMonitor: NetworkMonitoring
+
+    @KeyObject(.invitation, defaultValue: nil) var invitation: String?
 
     var hudPublisher: AnyPublisher<HUDStatus, Never> {
         hudSubject.eraseToAnyPublisher()
@@ -35,6 +40,29 @@ final class SearchLeftViewModel {
     private let successSubject = PassthroughSubject<Contact, Never>()
     private let hudSubject = CurrentValueSubject<HUDStatus, Never>(.none)
     private let stateSubject = CurrentValueSubject<SearchLeftViewState, Never>(.init())
+    private var networkCancellable = Set<AnyCancellable>()
+
+    func viewDidAppear() {
+        if let pendingInvitation = invitation {
+            invitation = nil
+            stateSubject.value.input = pendingInvitation
+            hudSubject.send(.onAction(Localized.Ud.Search.cancel))
+
+            networkCancellable.removeAll()
+
+            networkMonitor.statusPublisher
+                .first { $0 == .available }
+                .eraseToAnyPublisher()
+                .flatMap { _ in self.session.waitForNodes(timeout: 5) }
+                .sink {
+                    if case .failure(let error) = $0 {
+                        self.hudSubject.send(.error(.init(with: error)))
+                    }
+                } receiveValue: {
+                    self.didStartSearching()
+                }.store(in: &networkCancellable)
+        }
+    }
 
     func didEnterInput(_ string: String) {
         stateSubject.value.input = string

Sources/Shared/AutoGenerated/Assets.swift

@@ -70,6 +70,7 @@ public enum Asset {
   public static let menuRequests = ImageAsset(name: "menu_requests")
   public static let menuScan = ImageAsset(name: "menu_scan")
   public static let menuSettings = ImageAsset(name: "menu_settings")
+  public static let menuShare = ImageAsset(name: "menu_share")
   public static let onboardingBackground = ImageAsset(name: "onboarding_background")
   public static let onboardingBottomLogoStart = ImageAsset(name: "onboarding_bottom_logo_start")
   public static let onboardingEmail = ImageAsset(name: "onboarding_email")

Sources/Shared/AutoGenerated/Strings.swift

@@ -633,6 +633,8 @@ public enum Localized {
     public static let contacts = Localized.tr("Localizable", "menu.contacts")
     /// Dashboard
     public static let dashboard = Localized.tr("Localizable", "menu.dashboard")
+    /// Join xx network
+    public static let join = Localized.tr("Localizable", "menu.join")
     /// Profile
     public static let profile = Localized.tr("Localizable", "menu.profile")
     /// Requests
@@ -641,6 +643,16 @@ public enum Localized {
     public static let scan = Localized.tr("Localizable", "menu.scan")
     /// Settings
     public static let settings = Localized.tr("Localizable", "menu.settings")
+    /// Share my profile
+    public static let share = Localized.tr("Localizable", "menu.share")
+    /// Hi, I'm using xx messenger, you can download it here:
+    /// https://invite.xx.network
+    /// 
+    /// And you can add me using this link:
+    /// %@
+    public static func shareContent(_ p1: Any) -> String {
+      return Localized.tr("Localizable", "menu.shareContent", String(describing: p1))
+    }
     /// Hello
     public static let title = Localized.tr("Localizable", "menu.title")
     /// Version %@