Refactored HUD

Sources/RestoreFeature/ViewModels/RestoreListViewModel.swift

@@ -47,7 +47,7 @@ final class RestoreListViewModel {
             guard let self = self else { return }
             controller.navigationController?.popViewController(animated: true)
 
-            self.hudSubject.send(.on(nil))
+            self.hudSubject.send(.on)
 
             self.sftpService.fetchMetadata{ result in
                 switch result {
@@ -72,7 +72,7 @@ final class RestoreListViewModel {
         googleDriveService.authorize(presenting: controller) { authResult in
             switch authResult {
             case .success:
-                self.hudSubject.send(.on(nil))
+                self.hudSubject.send(.on)
                 self.googleDriveService.downloadMetadata { downloadResult in
                     switch downloadResult {
                     case .success(let metadata):
@@ -97,7 +97,7 @@ final class RestoreListViewModel {
 
     private func didRequestICloudAuthorization() {
         if icloudService.isAuthorized() {
-            self.hudSubject.send(.on(nil))
+            self.hudSubject.send(.on)
 
             icloudService.downloadMetadata { result in
                 switch result {
@@ -129,7 +129,7 @@ final class RestoreListViewModel {
                 case .success(let bool):
                     guard bool == true else { return }
 
-                    self.hudSubject.send(.on(nil))
+                    self.hudSubject.send(.on)
                     dropboxService.downloadMetadata { metadataResult in
                         switch metadataResult {
                         case .success(let metadata):

Sources/SFTPFeature/SFTPController.swift

@@ -5,7 +5,7 @@ import DependencyInjection
 import ScrollViewController
 
 public final class SFTPController: UIViewController {
-    @Dependency private var hud: HUDType
+    @Dependency private var hud: HUD
 
     lazy private var screenView = SFTPView()
     lazy private var scrollViewController = ScrollViewController()

Sources/SFTPFeature/SFTPViewModel.swift

@@ -45,7 +45,7 @@ final class SFTPViewModel {
     }
 
     func didTapLogin() {
-        hudSubject.send(.on(nil))
+        hudSubject.send(.on)
 
         let host = stateSubject.value.host
         let username = stateSubject.value.username

Sources/SearchFeature/Controllers/SearchLeftController.swift

@@ -9,7 +9,7 @@ import DrawerFeature
 import DependencyInjection
 
 final class SearchLeftController: UIViewController {
-    @Dependency private var hud: HUDType
+    @Dependency private var hud: HUD
     @Dependency private var coordinator: SearchCoordinating
 
     @KeyObject(.email, defaultValue: nil) var email: String?
@@ -19,12 +19,14 @@ final class SearchLeftController: UIViewController {
 
     lazy private var screenView = SearchLeftView()
 
-    private var cancellables = Set<AnyCancellable>()
     private var dataSource: SearchDiffableDataSource!
     private(set) var viewModel = SearchLeftViewModel()
     private var drawerCancellables = Set<AnyCancellable>()
     private let adrpURLString = "https://links.xx.network/adrp"
 
+    private var cancellables = Set<AnyCancellable>()
+    private var hudCancellables = Set<AnyCancellable>()
+
     override func loadView() {
         view = screenView
     }
@@ -75,10 +77,24 @@ final class SearchLeftController: UIViewController {
 
     private func setupBindings() {
         viewModel.hudPublisher
+            .removeDuplicates()
             .receive(on: DispatchQueue.main)
-            .sink { [hud] in hud.update(with: $0) }
+            .sink { [unowned self] in
+                hud.update(with: $0)
+
+                if case .onAction = $0, let hudBtn = hud.actionButton {
+                    hudBtn.publisher(for: .touchUpInside)
+                        .receive(on: DispatchQueue.main)
+                        .sink { [unowned self] in viewModel.didTapCancelSearch() }
+                        .store(in: &self.hudCancellables)
+                } else {
+                    hudCancellables.forEach { $0.cancel() }
+                    hudCancellables.removeAll()
+                }
+            }
             .store(in: &cancellables)
 
+
         viewModel.statePublisher
             .map(\.item)
             .removeDuplicates()

Sources/SearchFeature/ViewModels/SearchLeftViewModel.swift

 import HUD
 import UIKit
+import Shared
 import Combine
 import XXModels
 import Countries
@@ -56,7 +57,7 @@ final class SearchLeftViewModel {
     func didStartSearching() {
         guard stateSubject.value.input.isEmpty == false else { return }
 
-        hudSubject.send(.on(nil))
+        hudSubject.send(.onAction(Localized.Ud.Search.cancel))
 
         var content = stateSubject.value.input
         let prefix = stateSubject.value.item.written.first!.uppercased()
@@ -78,7 +79,7 @@ final class SearchLeftViewModel {
     }
 
     func didTapRequest(contact: Contact) {
-        hudSubject.send(.on(nil))
+        hudSubject.send(.on)
         var contact = contact
         contact.nickname = contact.username
 

Sources/SettingsFeature/Controllers/AccountDeleteController.swift

@@ -10,7 +10,7 @@ import DependencyInjection
 public final class AccountDeleteController: UIViewController {
     @KeyObject(.username, defaultValue: "") var username: String
 
-    @Dependency private var hud: HUDType
+    @Dependency private var hud: HUD
     @Dependency private var coordinator: SettingsCoordinating
 
     lazy private var screenView = AccountDeleteView()

Sources/SettingsFeature/Controllers/SettingsController.swift

@@ -8,7 +8,7 @@ import DependencyInjection
 import ScrollViewController
 
 public final class SettingsController: UIViewController {
-    @Dependency private var hud: HUDType
+    @Dependency private var hud: HUD
     @Dependency private var coordinator: SettingsCoordinating
     @Dependency private var statusBarController: StatusBarStyleControlling
 

Sources/SettingsFeature/ViewModels/AccountDeleteViewModel.swift

@@ -17,7 +17,7 @@ final class AccountDeleteViewModel {
         deleting = true
 
         DispatchQueue.main.async { [weak self] in
-            self?.hudRelay.send(.on(nil))
+            self?.hudRelay.send(.on)
         }
 
         do {

Sources/SettingsFeature/ViewModels/SettingsViewModel.swift

@@ -110,7 +110,7 @@ final class SettingsViewModel {
     }
 
     private func pushNotifications(enable: Bool) {
-        hudRelay.send(.on(nil))
+        hudRelay.send(.on)
 
         if enable == true {
             pushHandler.requestAuthorization { [weak self] result in

Sources/Shared/AutoGenerated/Strings.swift

@@ -1238,6 +1238,8 @@ public enum Localized {
       public static let title = Localized.tr("Localizable", "ud.requestDrawer.title")
     }
     public enum Search {
+      /// Cancel search
+      public static let cancel = Localized.tr("Localizable", "ud.search.cancel")
       /// There are no users with that %@.
       public static func empty(_ p1: Any) -> String {
         return Localized.tr("Localizable", "ud.search.empty", String(describing: p1))

Sources/Shared/Resources/en.lproj/Localizable.strings

@@ -987,6 +987,8 @@
 = "Search by %@";
 "ud.search.empty"
 = "There are no users with that %@.";
+"ud.search.cancel"
+= "Cancel search";
 
 "ud.search.placeholder.title"
 = "Search for #friends# anonymously, add them to your #connections# to start a completely private messaging channel.";

client-ios.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -59,8 +59,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://git.xx.network/elixxir/client-ios-db.git",
       "state" : {
-        "revision" : "adf3c4b906870ecbd0d1d7208f0666939fd08665",
-        "version" : "1.0.5"
+        "revision" : "c0ef6d7d25a6dac4668e684ec155cf0e1eb90617",
+        "version" : "1.0.7"
       }
     },
     {