Sources/OnboardingFeature/Controllers/OnboardingEmailController.swift

@@ -9,8 +9,8 @@ import DrawerFeature
 import ScrollViewController
 
 public final class OnboardingEmailController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = OnboardingEmailView()
   private lazy var scrollViewController = ScrollViewController()

Sources/OnboardingFeature/Controllers/OnboardingPhoneController.swift

@@ -9,8 +9,8 @@ import DrawerFeature
 import ScrollViewController
 
 public final class OnboardingPhoneController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = OnboardingPhoneView()
   private lazy var scrollViewController = ScrollViewController()

Sources/OnboardingFeature/Controllers/OnboardingStartController.swift

@@ -4,7 +4,7 @@ import AppNavigation
 import ComposableArchitecture
 
 public final class OnboardingStartController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
+  @Dependency(\.navigator) var navigator
 
   private lazy var screenView = OnboardingStartView()
 

Sources/OnboardingFeature/Controllers/OnboardingUsernameController.swift

@@ -9,8 +9,8 @@ import DrawerFeature
 import ScrollViewController
 
 public final class OnboardingUsernameController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = OnboardingUsernameView()
   private lazy var scrollViewController = ScrollViewController()

Sources/OnboardingFeature/Controllers/OnboardingWelcomeController.swift

@@ -9,8 +9,8 @@ import AppNavigation
 import DrawerFeature
 
 public final class OnboardingWelcomeController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   @KeyObject(.username, defaultValue: "") var username: String
 

Sources/OnboardingFeature/ViewModels/OnboardingCodeViewModel.swift

@@ -21,9 +21,9 @@ final class OnboardingCodeViewModel {
     stateSubject.eraseToAnyPublisher()
   }
 
-  @Dependency(\.app.messenger) var messenger: Messenger
-  @Dependency(\.app.hudManager) var hudManager: HUDManager
-  @Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
+  @Dependency(\.app.bgQueue) var bgQueue
+  @Dependency(\.app.messenger) var messenger
+  @Dependency(\.app.hudManager) var hudManager
 
   @KeyObject(.email, defaultValue: nil) var email: String?
   @KeyObject(.phone, defaultValue: nil) var phone: String?

Sources/OnboardingFeature/ViewModels/OnboardingEmailViewModel.swift

@@ -15,9 +15,9 @@ final class OnboardingEmailViewModel {
     var status: InputField.ValidationStatus = .unknown(nil)
   }
 
-  @Dependency(\.app.messenger) var messenger: Messenger
-  @Dependency(\.app.hudManager) var hudManager: HUDManager
-  @Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
+  @Dependency(\.app.bgQueue) var bgQueue
+  @Dependency(\.app.messenger) var messenger
+  @Dependency(\.app.hudManager) var hudManager
 
   var statePublisher: AnyPublisher<ViewState, Never> {
     stateSubject.eraseToAnyPublisher()

Sources/OnboardingFeature/ViewModels/OnboardingPhoneViewModel.swift

@@ -18,9 +18,9 @@ final class OnboardingPhoneViewModel {
     var country: Country = .fromMyPhone()
   }
 
-  @Dependency(\.app.messenger) var messenger: Messenger
-  @Dependency(\.app.hudManager) var hudManager: HUDManager
-  @Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
+  @Dependency(\.app.bgQueue) var bgQueue
+  @Dependency(\.app.messenger) var messenger
+  @Dependency(\.app.hudManager) var hudManager
 
   var statePublisher: AnyPublisher<ViewState, Never> {
     stateSubject.eraseToAnyPublisher()

Sources/OnboardingFeature/ViewModels/OnboardingUsernameViewModel.swift

@@ -16,10 +16,10 @@ final class OnboardingUsernameViewModel {
     var didConfirm: Bool = false
   }
 
-  @Dependency(\.app.dbManager) var dbManager: DBManager
-  @Dependency(\.app.messenger) var messenger: Messenger
-  @Dependency(\.app.hudManager) var hudManager: HUDManager
-  @Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
+  @Dependency(\.app.bgQueue) var bgQueue
+  @Dependency(\.app.dbManager) var dbManager
+  @Dependency(\.app.messenger) var messenger
+  @Dependency(\.app.hudManager) var hudManager
 
   @KeyObject(.username, defaultValue: "") var username: String
 

Sources/ProfileFeature/Controllers/ProfileCodeController.swift

@@ -8,8 +8,8 @@ import AppNavigation
 import ScrollViewController
 
 public final class ProfileCodeController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = ProfileCodeView()
   private lazy var scrollViewController = ScrollViewController()

Sources/ProfileFeature/Controllers/ProfileController.swift

@@ -8,8 +8,8 @@ import DrawerFeature
 import ComposableArchitecture
 
 public final class ProfileController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = ProfileView()
 

Sources/ProfileFeature/Controllers/ProfileEmailController.swift

@@ -8,8 +8,8 @@ import ScrollViewController
 import ComposableArchitecture
 
 public final class ProfileEmailController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = ProfileEmailView()
   private lazy var scrollViewController = ScrollViewController()

Sources/ProfileFeature/Controllers/ProfilePhoneController.swift

@@ -8,8 +8,8 @@ import AppNavigation
 import ScrollViewController
 
 public final class ProfilePhoneController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = ProfilePhoneView()
   private lazy var scrollViewController = ScrollViewController()

Sources/ProfileFeature/ViewModels/ProfileCodeViewModel.swift

@@ -20,9 +20,9 @@ final class ProfileCodeViewModel {
     stateSubject.eraseToAnyPublisher()
   }
 
-  @Dependency(\.app.messenger) var messenger: Messenger
-  @Dependency(\.app.hudManager) var hudManager: HUDManager
-  @Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
+  @Dependency(\.app.bgQueue) var bgQueue
+  @Dependency(\.app.messenger) var messenger
+  @Dependency(\.app.hudManager) var hudManager
 
   @KeyObject(.email, defaultValue: nil) var email: String?
   @KeyObject(.phone, defaultValue: nil) var phone: String?

Sources/ProfileFeature/ViewModels/ProfileEmailViewModel.swift

@@ -15,9 +15,9 @@ final class ProfileEmailViewModel {
     var status: InputField.ValidationStatus = .unknown(nil)
   }
 
-  @Dependency(\.app.messenger) var messenger: Messenger
-  @Dependency(\.app.hudManager) var hudManager: HUDManager
-  @Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
+  @Dependency(\.app.bgQueue) var bgQueue
+  @Dependency(\.app.messenger) var messenger
+  @Dependency(\.app.hudManager) var hudManager
 
   var statePublisher: AnyPublisher<ViewState, Never> {
     stateSubject.eraseToAnyPublisher()

Sources/ProfileFeature/ViewModels/ProfilePhoneViewModel.swift

@@ -18,9 +18,9 @@ final class ProfilePhoneViewModel {
     var country: Country = .fromMyPhone()
   }
 
-  @Dependency(\.app.messenger) var messenger: Messenger
-  @Dependency(\.app.hudManager) var hudManager: HUDManager
-  @Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
+  @Dependency(\.app.bgQueue) var bgQueue
+  @Dependency(\.app.messenger) var messenger
+  @Dependency(\.app.hudManager) var hudManager
 
   var statePublisher: AnyPublisher<ViewState, Never> {
     stateSubject.eraseToAnyPublisher()

Sources/ProfileFeature/ViewModels/ProfileViewModel.swift

@@ -31,11 +31,11 @@ final class ProfileViewModel {
   @KeyObject(.sharingEmail, defaultValue: false) var isEmailSharing: Bool
   @KeyObject(.sharingPhone, defaultValue: false) var isPhoneSharing: Bool
 
-  @Dependency(\.app.messenger) var messenger: Messenger
-  @Dependency(\.app.hudManager) var hudManager: HUDManager
-  @Dependency(\.backupService) var backupService: BackupService
-  @Dependency(\.permissions) var permissions: PermissionsManager
-  @Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
+  @Dependency(\.app.bgQueue) var bgQueue
+  @Dependency(\.permissions) var permissions
+  @Dependency(\.app.messenger) var messenger
+  @Dependency(\.app.hudManager) var hudManager
+  @Dependency(\.backupService) var backupService
 
   var name: String { username! }
 

Sources/RequestPermissionFeature/RequestPermissionController.swift

@@ -8,8 +8,8 @@ import AppNavigation
 import PermissionsFeature
 
 public final class RequestPermissionController: UIViewController {
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
-  @Dependency(\.permissions) var permissions: PermissionsManager
+  @Dependency(\.permissions) var permissions
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = RequestPermissionView()
 

Sources/RequestsFeature/Controllers/RequestsContainerController.swift

@@ -8,8 +8,8 @@ import AppNavigation
 import ContactFeature
 
 public final class RequestsContainerController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.statusBar) var statusBar: StatusBarStylist
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.statusBar) var statusBar
 
   private lazy var screenView = RequestsContainerView()
   private var cancellables = Set<AnyCancellable>()

Sources/RequestsFeature/Controllers/RequestsReceivedController.swift

@@ -10,8 +10,8 @@ import DrawerFeature
 import CountryListFeature
 
 final class RequestsReceivedController: UIViewController {
-  @Dependency(\.navigator) var navigator: Navigator
-  @Dependency(\.app.toastManager) var toaster: ToastManager
+  @Dependency(\.navigator) var navigator
+  @Dependency(\.app.toastManager) var toaster
 
   private lazy var screenView = RequestsReceivedView()
   private var cancellables = Set<AnyCancellable>()