From e25943861fffb19a7e6ab36ff191ff5541e3a742 Mon Sep 17 00:00:00 2001 From: Bruno Muniz Azevedo Filho <bruno@elixxir.io> Date: Thu, 1 Dec 2022 01:03:13 -0300 Subject: [PATCH] Removes unecessary type expliciting on dependencies --- .../Controllers/BackupConfigController.swift | 2 +- .../ViewModels/BackupConfigViewModel.swift | 6 +++--- .../BackupFeature/ViewModels/BackupSFTPViewModel.swift | 2 +- .../ViewModels/BackupSetupViewModel.swift | 2 +- Sources/BackupFeature/ViewModels/BackupViewModel.swift | 2 +- .../ChatFeature/Controllers/SingleChatController.swift | 6 +++--- .../Controller/ChatListController.swift | 4 ++-- .../Controller/ChatListSearchTableController.swift | 2 +- .../Controller/ChatListTableController.swift | 2 +- .../ContactFeature/Controllers/ContactController.swift | 4 ++-- .../ContactFeature/ViewModels/ContactViewModel.swift | 6 +++--- Sources/ContactListFeature/ContactListController.swift | 4 ++-- Sources/ContactListFeature/ContactListViewModel.swift | 6 +++--- Sources/CountryListFeature/CountryListController.swift | 2 +- Sources/GroupDraftFeature/GroupDraftController.swift | 2 +- Sources/LaunchFeature/LaunchController.swift | 2 +- Sources/MenuFeature/Controllers/MenuController.swift | 4 ++-- Sources/MenuFeature/ViewModels/MenuViewModel.swift | 4 ++-- .../Controllers/OnboardingCodeController.swift | 4 ++-- .../Controllers/OnboardingEmailController.swift | 4 ++-- .../Controllers/OnboardingPhoneController.swift | 4 ++-- .../Controllers/OnboardingStartController.swift | 2 +- .../Controllers/OnboardingUsernameController.swift | 4 ++-- .../Controllers/OnboardingWelcomeController.swift | 4 ++-- .../ViewModels/OnboardingCodeViewModel.swift | 6 +++--- .../ViewModels/OnboardingEmailViewModel.swift | 6 +++--- .../ViewModels/OnboardingPhoneViewModel.swift | 6 +++--- .../ViewModels/OnboardingUsernameViewModel.swift | 8 ++++---- .../Controllers/ProfileCodeController.swift | 4 ++-- .../ProfileFeature/Controllers/ProfileController.swift | 4 ++-- .../Controllers/ProfileEmailController.swift | 4 ++-- .../Controllers/ProfilePhoneController.swift | 4 ++-- .../ViewModels/ProfileCodeViewModel.swift | 6 +++--- .../ViewModels/ProfileEmailViewModel.swift | 6 +++--- .../ViewModels/ProfilePhoneViewModel.swift | 6 +++--- .../ProfileFeature/ViewModels/ProfileViewModel.swift | 10 +++++----- .../RequestPermissionController.swift | 4 ++-- .../Controllers/RequestsContainerController.swift | 4 ++-- .../Controllers/RequestsReceivedController.swift | 4 ++-- .../ViewModels/RequestsFailedViewModel.swift | 6 +++--- .../ViewModels/RequestsSentViewModel.swift | 10 +++++----- .../RestoreFeature/Controllers/RestoreController.swift | 2 +- .../Controllers/RestoreListController.swift | 2 +- .../Controllers/RestoreSuccessController.swift | 4 ++-- .../ViewModels/RestoreListViewModel.swift | 2 +- .../ViewModels/RestoreSFTPViewModel.swift | 2 +- .../RestoreFeature/ViewModels/RestoreViewModel.swift | 4 ++-- .../Controllers/ScanContainerController.swift | 4 ++-- Sources/ScanFeature/Controllers/ScanController.swift | 6 +++--- .../ScanFeature/ViewModels/ScanDisplayViewModel.swift | 2 +- Sources/ScanFeature/ViewModels/ScanViewModel.swift | 4 ++-- .../Controllers/SearchContainerController.swift | 4 ++-- .../Controllers/SearchLeftController.swift | 2 +- .../Controllers/SearchRightController.swift | 2 +- .../ViewModels/SearchContainerViewModel.swift | 2 +- .../ViewModels/SearchRightViewModel.swift | 6 +++--- .../Controllers/SettingsAdvancedController.swift | 2 +- .../Controllers/SettingsDeleteController.swift | 2 +- .../Controllers/SettingsMainController.swift | 4 ++-- .../ViewModels/SettingsAdvancedViewModel.swift | 6 +++--- .../ViewModels/SettingsDeleteViewModel.swift | 8 ++++---- Sources/TermsFeature/TermsConditionsController.swift | 2 +- 62 files changed, 127 insertions(+), 127 deletions(-) diff --git a/Sources/BackupFeature/Controllers/BackupConfigController.swift b/Sources/BackupFeature/Controllers/BackupConfigController.swift index f2e02203..7f30002c 100644 --- a/Sources/BackupFeature/Controllers/BackupConfigController.swift +++ b/Sources/BackupFeature/Controllers/BackupConfigController.swift @@ -8,7 +8,7 @@ import DrawerFeature import ComposableArchitecture final class BackupConfigController: UIViewController { - @Dependency(\.navigator) var navigator: Navigator + @Dependency(\.navigator) var navigator private lazy var screenView = BackupConfigView() diff --git a/Sources/BackupFeature/ViewModels/BackupConfigViewModel.swift b/Sources/BackupFeature/ViewModels/BackupConfigViewModel.swift index 410535e6..20ecc784 100644 --- a/Sources/BackupFeature/ViewModels/BackupConfigViewModel.swift +++ b/Sources/BackupFeature/ViewModels/BackupConfigViewModel.swift @@ -32,9 +32,9 @@ struct BackupConfigViewModel { extension BackupConfigViewModel { static func live() -> Self { class Context { - @Dependency(\.navigator) var navigator: Navigator - @Dependency(\.backupService) var service: BackupService - @Dependency(\.app.hudManager) var hudManager: HUDManager + @Dependency(\.navigator) var navigator + @Dependency(\.backupService) var service + @Dependency(\.app.hudManager) var hudManager } let context = Context() diff --git a/Sources/BackupFeature/ViewModels/BackupSFTPViewModel.swift b/Sources/BackupFeature/ViewModels/BackupSFTPViewModel.swift index bd18ee5f..f4c0b87c 100644 --- a/Sources/BackupFeature/ViewModels/BackupSFTPViewModel.swift +++ b/Sources/BackupFeature/ViewModels/BackupSFTPViewModel.swift @@ -18,7 +18,7 @@ struct SFTPViewState { } final class BackupSFTPViewModel { - @Dependency(\.app.hudManager) var hudManager: HUDManager + @Dependency(\.app.hudManager) var hudManager var statePublisher: AnyPublisher<SFTPViewState, Never> { stateSubject.eraseToAnyPublisher() diff --git a/Sources/BackupFeature/ViewModels/BackupSetupViewModel.swift b/Sources/BackupFeature/ViewModels/BackupSetupViewModel.swift index a470e6c6..6a83392d 100644 --- a/Sources/BackupFeature/ViewModels/BackupSetupViewModel.swift +++ b/Sources/BackupFeature/ViewModels/BackupSetupViewModel.swift @@ -11,7 +11,7 @@ struct BackupSetupViewModel { extension BackupSetupViewModel { static func live() -> Self { class Context { - @Dependency(\.backupService) var service: BackupService + @Dependency(\.backupService) var service } let context = Context() diff --git a/Sources/BackupFeature/ViewModels/BackupViewModel.swift b/Sources/BackupFeature/ViewModels/BackupViewModel.swift index 378590c3..8e16b8a7 100644 --- a/Sources/BackupFeature/ViewModels/BackupViewModel.swift +++ b/Sources/BackupFeature/ViewModels/BackupViewModel.swift @@ -16,7 +16,7 @@ struct BackupViewModel { extension BackupViewModel { static func live() -> Self { class Context { - @Dependency(\.backupService) var service: BackupService + @Dependency(\.backupService) var service } let context = Context() diff --git a/Sources/ChatFeature/Controllers/SingleChatController.swift b/Sources/ChatFeature/Controllers/SingleChatController.swift index 4ae089ad..5e69a83f 100644 --- a/Sources/ChatFeature/Controllers/SingleChatController.swift +++ b/Sources/ChatFeature/Controllers/SingleChatController.swift @@ -28,9 +28,9 @@ public final class SingleChatController: UIViewController { // @Dependency var makeReportDrawer: MakeReportDrawer // @Dependency var makeAppScreenshot: MakeAppScreenshot - @Dependency(\.navigator) var navigator: Navigator - @Dependency(\.app.statusBar) var statusBar: StatusBarStylist - @Dependency(\.reportingStatus) var reportingStatus: ReportingStatus + @Dependency(\.navigator) var navigator + @Dependency(\.app.statusBar) var statusBar + @Dependency(\.reportingStatus) var reportingStatus let voxophone = Voxophone() diff --git a/Sources/ChatListFeature/Controller/ChatListController.swift b/Sources/ChatListFeature/Controller/ChatListController.swift index 7383b423..f1442559 100644 --- a/Sources/ChatListFeature/Controller/ChatListController.swift +++ b/Sources/ChatListFeature/Controller/ChatListController.swift @@ -8,8 +8,8 @@ import Dependencies import AppNavigation public final class ChatListController: 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 = ChatListView() private lazy var topLeftView = ChatListTopLeftNavView() diff --git a/Sources/ChatListFeature/Controller/ChatListSearchTableController.swift b/Sources/ChatListFeature/Controller/ChatListSearchTableController.swift index 284a5717..7acf8522 100644 --- a/Sources/ChatListFeature/Controller/ChatListSearchTableController.swift +++ b/Sources/ChatListFeature/Controller/ChatListSearchTableController.swift @@ -17,7 +17,7 @@ class ChatSearchListTableViewDiffableDataSource: UITableViewDiffableDataSource<S } final class ChatSearchTableController: UITableViewController { - @Dependency(\.navigator) var navigator: Navigator + @Dependency(\.navigator) var navigator private let viewModel: ChatListViewModel private let cellHeight: CGFloat = 83.0 diff --git a/Sources/ChatListFeature/Controller/ChatListTableController.swift b/Sources/ChatListFeature/Controller/ChatListTableController.swift index e1c2e06b..0f0364e0 100644 --- a/Sources/ChatListFeature/Controller/ChatListTableController.swift +++ b/Sources/ChatListFeature/Controller/ChatListTableController.swift @@ -13,7 +13,7 @@ extension ChatInfo: Differentiable { } final class ChatListTableController: UITableViewController { - @Dependency(\.navigator) var navigator: Navigator + @Dependency(\.navigator) var navigator private var rows = [ChatInfo]() private let viewModel: ChatListViewModel diff --git a/Sources/ContactFeature/Controllers/ContactController.swift b/Sources/ContactFeature/Controllers/ContactController.swift index ee9bb011..6a7ad78f 100644 --- a/Sources/ContactFeature/Controllers/ContactController.swift +++ b/Sources/ContactFeature/Controllers/ContactController.swift @@ -10,8 +10,8 @@ import DrawerFeature import ScrollViewController public final class ContactController: 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 = ContactView() private lazy var scrollViewController = ScrollViewController() diff --git a/Sources/ContactFeature/ViewModels/ContactViewModel.swift b/Sources/ContactFeature/ViewModels/ContactViewModel.swift index 6e20c16e..99b3440b 100644 --- a/Sources/ContactFeature/ViewModels/ContactViewModel.swift +++ b/Sources/ContactFeature/ViewModels/ContactViewModel.swift @@ -19,9 +19,9 @@ struct ContactViewState: Equatable { } final class ContactViewModel { - @Dependency(\.app.dbManager) var dbManager: DBManager - @Dependency(\.app.messenger) var messenger: Messenger - @Dependency(\.app.hudManager) var hudManager: HUDManager + @Dependency(\.app.dbManager) var dbManager + @Dependency(\.app.messenger) var messenger + @Dependency(\.app.hudManager) var hudManager @KeyObject(.username, defaultValue: nil) var username: String? @KeyObject(.sharingEmail, defaultValue: false) var sharingEmail: Bool diff --git a/Sources/ContactListFeature/ContactListController.swift b/Sources/ContactListFeature/ContactListController.swift index 36d8e8b4..49afcb17 100644 --- a/Sources/ContactListFeature/ContactListController.swift +++ b/Sources/ContactListFeature/ContactListController.swift @@ -7,8 +7,8 @@ import AppResources import AppNavigation public final class ContactListController: 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 = ContactListView() private lazy var tableController = ContactListTableController(viewModel) diff --git a/Sources/ContactListFeature/ContactListViewModel.swift b/Sources/ContactListFeature/ContactListViewModel.swift index 3e509acc..1e77da11 100644 --- a/Sources/ContactListFeature/ContactListViewModel.swift +++ b/Sources/ContactListFeature/ContactListViewModel.swift @@ -11,9 +11,9 @@ import AppCore import Dependencies final class ContactListViewModel { - @Dependency(\.app.dbManager) var dbManager: DBManager - @Dependency(\.app.messenger) var messenger: Messenger - @Dependency(\.reportingStatus) var reportingStatus: ReportingStatus + @Dependency(\.app.dbManager) var dbManager + @Dependency(\.app.messenger) var messenger + @Dependency(\.reportingStatus) var reportingStatus var myId: Data { try! messenger.e2e.get()!.getContact().getId() diff --git a/Sources/CountryListFeature/CountryListController.swift b/Sources/CountryListFeature/CountryListController.swift index dd6ad4e6..ee36ffdd 100644 --- a/Sources/CountryListFeature/CountryListController.swift +++ b/Sources/CountryListFeature/CountryListController.swift @@ -6,7 +6,7 @@ import AppResources import Dependencies public final class CountryListController: UIViewController, UITableViewDelegate { - @Dependency(\.app.statusBar) var statusBar: StatusBarStylist + @Dependency(\.app.statusBar) var statusBar private lazy var screenView = CountryListView() diff --git a/Sources/GroupDraftFeature/GroupDraftController.swift b/Sources/GroupDraftFeature/GroupDraftController.swift index 27dd858f..321f44fa 100644 --- a/Sources/GroupDraftFeature/GroupDraftController.swift +++ b/Sources/GroupDraftFeature/GroupDraftController.swift @@ -7,7 +7,7 @@ import Dependencies import AppNavigation public final class GroupDraftController: UIViewController { - @Dependency(\.navigator) var navigator: Navigator + @Dependency(\.navigator) var navigator private lazy var titleLabel = UILabel() private lazy var createButton = UIButton() diff --git a/Sources/LaunchFeature/LaunchController.swift b/Sources/LaunchFeature/LaunchController.swift index d6d1780b..2684c669 100644 --- a/Sources/LaunchFeature/LaunchController.swift +++ b/Sources/LaunchFeature/LaunchController.swift @@ -7,7 +7,7 @@ import DrawerFeature import AppNavigation public final class LaunchController: UIViewController { - @Dependency(\.navigator) var navigator: Navigator + @Dependency(\.navigator) var navigator private lazy var screenView = LaunchView() private let viewModel = LaunchViewModel() diff --git a/Sources/MenuFeature/Controllers/MenuController.swift b/Sources/MenuFeature/Controllers/MenuController.swift index 17a9a735..06a5661a 100644 --- a/Sources/MenuFeature/Controllers/MenuController.swift +++ b/Sources/MenuFeature/Controllers/MenuController.swift @@ -8,8 +8,8 @@ import AppNavigation import DrawerFeature public final class MenuController: 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 = MenuView() diff --git a/Sources/MenuFeature/ViewModels/MenuViewModel.swift b/Sources/MenuFeature/ViewModels/MenuViewModel.swift index 3005d8e2..ea74991d 100644 --- a/Sources/MenuFeature/ViewModels/MenuViewModel.swift +++ b/Sources/MenuFeature/ViewModels/MenuViewModel.swift @@ -8,8 +8,8 @@ import ReportingFeature import ComposableArchitecture final class MenuViewModel { - @Dependency(\.app.dbManager) var dbManager: DBManager - @Dependency(\.reportingStatus) var reportingStatus: ReportingStatus + @Dependency(\.app.dbManager) var dbManager + @Dependency(\.reportingStatus) var reportingStatus @KeyObject(.avatar, defaultValue: nil) var avatar: Data? @KeyObject(.username, defaultValue: "") var username: String diff --git a/Sources/OnboardingFeature/Controllers/OnboardingCodeController.swift b/Sources/OnboardingFeature/Controllers/OnboardingCodeController.swift index 92cdda4e..8fd333cb 100644 --- a/Sources/OnboardingFeature/Controllers/OnboardingCodeController.swift +++ b/Sources/OnboardingFeature/Controllers/OnboardingCodeController.swift @@ -9,8 +9,8 @@ import DrawerFeature import ScrollViewController public final class OnboardingCodeController: 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 = OnboardingCodeView() private lazy var scrollViewController = ScrollViewController() diff --git a/Sources/OnboardingFeature/Controllers/OnboardingEmailController.swift b/Sources/OnboardingFeature/Controllers/OnboardingEmailController.swift index d15c6594..fc71f8cc 100644 --- a/Sources/OnboardingFeature/Controllers/OnboardingEmailController.swift +++ b/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() diff --git a/Sources/OnboardingFeature/Controllers/OnboardingPhoneController.swift b/Sources/OnboardingFeature/Controllers/OnboardingPhoneController.swift index 4eadd53e..768e4cbd 100644 --- a/Sources/OnboardingFeature/Controllers/OnboardingPhoneController.swift +++ b/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() diff --git a/Sources/OnboardingFeature/Controllers/OnboardingStartController.swift b/Sources/OnboardingFeature/Controllers/OnboardingStartController.swift index 0fd4158d..cfa8dad0 100644 --- a/Sources/OnboardingFeature/Controllers/OnboardingStartController.swift +++ b/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() diff --git a/Sources/OnboardingFeature/Controllers/OnboardingUsernameController.swift b/Sources/OnboardingFeature/Controllers/OnboardingUsernameController.swift index 619a983b..fcbfebaa 100644 --- a/Sources/OnboardingFeature/Controllers/OnboardingUsernameController.swift +++ b/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() diff --git a/Sources/OnboardingFeature/Controllers/OnboardingWelcomeController.swift b/Sources/OnboardingFeature/Controllers/OnboardingWelcomeController.swift index 701e1359..4c74f46f 100644 --- a/Sources/OnboardingFeature/Controllers/OnboardingWelcomeController.swift +++ b/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 diff --git a/Sources/OnboardingFeature/ViewModels/OnboardingCodeViewModel.swift b/Sources/OnboardingFeature/ViewModels/OnboardingCodeViewModel.swift index 994b83b2..de57405f 100644 --- a/Sources/OnboardingFeature/ViewModels/OnboardingCodeViewModel.swift +++ b/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? diff --git a/Sources/OnboardingFeature/ViewModels/OnboardingEmailViewModel.swift b/Sources/OnboardingFeature/ViewModels/OnboardingEmailViewModel.swift index a175a674..01e5e628 100644 --- a/Sources/OnboardingFeature/ViewModels/OnboardingEmailViewModel.swift +++ b/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() diff --git a/Sources/OnboardingFeature/ViewModels/OnboardingPhoneViewModel.swift b/Sources/OnboardingFeature/ViewModels/OnboardingPhoneViewModel.swift index 39d9f282..c60f1760 100644 --- a/Sources/OnboardingFeature/ViewModels/OnboardingPhoneViewModel.swift +++ b/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() diff --git a/Sources/OnboardingFeature/ViewModels/OnboardingUsernameViewModel.swift b/Sources/OnboardingFeature/ViewModels/OnboardingUsernameViewModel.swift index 917e9fea..21ff5adb 100644 --- a/Sources/OnboardingFeature/ViewModels/OnboardingUsernameViewModel.swift +++ b/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 diff --git a/Sources/ProfileFeature/Controllers/ProfileCodeController.swift b/Sources/ProfileFeature/Controllers/ProfileCodeController.swift index d5d640db..a291ea8f 100644 --- a/Sources/ProfileFeature/Controllers/ProfileCodeController.swift +++ b/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() diff --git a/Sources/ProfileFeature/Controllers/ProfileController.swift b/Sources/ProfileFeature/Controllers/ProfileController.swift index 23dca61b..f598486b 100644 --- a/Sources/ProfileFeature/Controllers/ProfileController.swift +++ b/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() diff --git a/Sources/ProfileFeature/Controllers/ProfileEmailController.swift b/Sources/ProfileFeature/Controllers/ProfileEmailController.swift index ef9ef2f8..0d7d9e3f 100644 --- a/Sources/ProfileFeature/Controllers/ProfileEmailController.swift +++ b/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() diff --git a/Sources/ProfileFeature/Controllers/ProfilePhoneController.swift b/Sources/ProfileFeature/Controllers/ProfilePhoneController.swift index 99ac70b8..c7d9e8c7 100644 --- a/Sources/ProfileFeature/Controllers/ProfilePhoneController.swift +++ b/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() diff --git a/Sources/ProfileFeature/ViewModels/ProfileCodeViewModel.swift b/Sources/ProfileFeature/ViewModels/ProfileCodeViewModel.swift index a018da77..5dc1176a 100644 --- a/Sources/ProfileFeature/ViewModels/ProfileCodeViewModel.swift +++ b/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? diff --git a/Sources/ProfileFeature/ViewModels/ProfileEmailViewModel.swift b/Sources/ProfileFeature/ViewModels/ProfileEmailViewModel.swift index 96210b7d..2fc959ae 100644 --- a/Sources/ProfileFeature/ViewModels/ProfileEmailViewModel.swift +++ b/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() diff --git a/Sources/ProfileFeature/ViewModels/ProfilePhoneViewModel.swift b/Sources/ProfileFeature/ViewModels/ProfilePhoneViewModel.swift index 90387a69..90105393 100644 --- a/Sources/ProfileFeature/ViewModels/ProfilePhoneViewModel.swift +++ b/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() diff --git a/Sources/ProfileFeature/ViewModels/ProfileViewModel.swift b/Sources/ProfileFeature/ViewModels/ProfileViewModel.swift index 07ab592e..4d7eb1b3 100644 --- a/Sources/ProfileFeature/ViewModels/ProfileViewModel.swift +++ b/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! } diff --git a/Sources/RequestPermissionFeature/RequestPermissionController.swift b/Sources/RequestPermissionFeature/RequestPermissionController.swift index 9c12752c..8a7bba15 100644 --- a/Sources/RequestPermissionFeature/RequestPermissionController.swift +++ b/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() diff --git a/Sources/RequestsFeature/Controllers/RequestsContainerController.swift b/Sources/RequestsFeature/Controllers/RequestsContainerController.swift index 49ab70bc..7d134ab4 100644 --- a/Sources/RequestsFeature/Controllers/RequestsContainerController.swift +++ b/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>() diff --git a/Sources/RequestsFeature/Controllers/RequestsReceivedController.swift b/Sources/RequestsFeature/Controllers/RequestsReceivedController.swift index 3ee84bb9..bc618608 100644 --- a/Sources/RequestsFeature/Controllers/RequestsReceivedController.swift +++ b/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>() diff --git a/Sources/RequestsFeature/ViewModels/RequestsFailedViewModel.swift b/Sources/RequestsFeature/ViewModels/RequestsFailedViewModel.swift index 6481b67c..809e53b5 100644 --- a/Sources/RequestsFeature/ViewModels/RequestsFailedViewModel.swift +++ b/Sources/RequestsFeature/ViewModels/RequestsFailedViewModel.swift @@ -10,9 +10,9 @@ import CombineSchedulers import XXMessengerClient final class RequestsFailedViewModel { - @Dependency(\.app.dbManager) var dbManager: DBManager - @Dependency(\.app.messenger) var messenger: Messenger - @Dependency(\.app.hudManager) var hudManager: HUDManager + @Dependency(\.app.dbManager) var dbManager + @Dependency(\.app.messenger) var messenger + @Dependency(\.app.hudManager) var hudManager @KeyObject(.username, defaultValue: nil) var username: String? @KeyObject(.sharingEmail, defaultValue: false) var sharingEmail: Bool diff --git a/Sources/RequestsFeature/ViewModels/RequestsSentViewModel.swift b/Sources/RequestsFeature/ViewModels/RequestsSentViewModel.swift index abe6ba7b..6293a25b 100644 --- a/Sources/RequestsFeature/ViewModels/RequestsSentViewModel.swift +++ b/Sources/RequestsFeature/ViewModels/RequestsSentViewModel.swift @@ -18,11 +18,11 @@ struct RequestSent: Hashable, Equatable { } final class RequestsSentViewModel { - @Dependency(\.app.dbManager) var dbManager: DBManager - @Dependency(\.app.messenger) var messenger: Messenger - @Dependency(\.app.hudManager) var hudManager: HUDManager - @Dependency(\.app.toastManager) var toastManager: ToastManager - @Dependency(\.reportingStatus) var reportingStatus: ReportingStatus + @Dependency(\.app.dbManager) var dbManager + @Dependency(\.app.messenger) var messenger + @Dependency(\.app.hudManager) var hudManager + @Dependency(\.app.toastManager) var toastManager + @Dependency(\.reportingStatus) var reportingStatus @KeyObject(.username, defaultValue: nil) var username: String? @KeyObject(.sharingEmail, defaultValue: false) var sharingEmail: Bool diff --git a/Sources/RestoreFeature/Controllers/RestoreController.swift b/Sources/RestoreFeature/Controllers/RestoreController.swift index ac6f6ae1..ef73b2cc 100644 --- a/Sources/RestoreFeature/Controllers/RestoreController.swift +++ b/Sources/RestoreFeature/Controllers/RestoreController.swift @@ -7,7 +7,7 @@ import DrawerFeature import ComposableArchitecture public final class RestoreController: UIViewController { - @Dependency(\.navigator) var navigator: Navigator + @Dependency(\.navigator) var navigator private lazy var screenView = RestoreView() diff --git a/Sources/RestoreFeature/Controllers/RestoreListController.swift b/Sources/RestoreFeature/Controllers/RestoreListController.swift index cbce48e5..b4274095 100644 --- a/Sources/RestoreFeature/Controllers/RestoreListController.swift +++ b/Sources/RestoreFeature/Controllers/RestoreListController.swift @@ -7,7 +7,7 @@ import DrawerFeature import ComposableArchitecture public final class RestoreListController: UIViewController { - @Dependency(\.navigator) var navigator: Navigator + @Dependency(\.navigator) var navigator private lazy var screenView = RestoreListView() diff --git a/Sources/RestoreFeature/Controllers/RestoreSuccessController.swift b/Sources/RestoreFeature/Controllers/RestoreSuccessController.swift index 6fca825a..cad61bee 100644 --- a/Sources/RestoreFeature/Controllers/RestoreSuccessController.swift +++ b/Sources/RestoreFeature/Controllers/RestoreSuccessController.swift @@ -6,8 +6,8 @@ import Dependencies import AppNavigation public final class RestoreSuccessController: 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 = RestoreSuccessView() private var cancellables = Set<AnyCancellable>() diff --git a/Sources/RestoreFeature/ViewModels/RestoreListViewModel.swift b/Sources/RestoreFeature/ViewModels/RestoreListViewModel.swift index 40428ff3..323b0794 100644 --- a/Sources/RestoreFeature/ViewModels/RestoreListViewModel.swift +++ b/Sources/RestoreFeature/ViewModels/RestoreListViewModel.swift @@ -12,7 +12,7 @@ public struct RestorationDetails { } final class RestoreListViewModel { - @Dependency(\.app.hudManager) var hudManager: HUDManager + @Dependency(\.app.hudManager) var hudManager var sftpPublisher: AnyPublisher<Void, Never> { sftpSubject.eraseToAnyPublisher() diff --git a/Sources/RestoreFeature/ViewModels/RestoreSFTPViewModel.swift b/Sources/RestoreFeature/ViewModels/RestoreSFTPViewModel.swift index d18036fc..3af77801 100644 --- a/Sources/RestoreFeature/ViewModels/RestoreSFTPViewModel.swift +++ b/Sources/RestoreFeature/ViewModels/RestoreSFTPViewModel.swift @@ -16,7 +16,7 @@ struct SFTPViewState { } final class RestoreSFTPViewModel { - @Dependency(\.app.hudManager) var hudManager: HUDManager + @Dependency(\.app.hudManager) var hudManager var statePublisher: AnyPublisher<SFTPViewState, Never> { stateSubject.eraseToAnyPublisher() diff --git a/Sources/RestoreFeature/ViewModels/RestoreViewModel.swift b/Sources/RestoreFeature/ViewModels/RestoreViewModel.swift index 1f7d8849..3ada5751 100644 --- a/Sources/RestoreFeature/ViewModels/RestoreViewModel.swift +++ b/Sources/RestoreFeature/ViewModels/RestoreViewModel.swift @@ -38,8 +38,8 @@ extension Step: Equatable { } final class RestoreViewModel { - @Dependency(\.app.dbManager) var dbManager: DBManager - @Dependency(\.app.messenger) var messenger: Messenger + @Dependency(\.app.dbManager) var dbManager + @Dependency(\.app.messenger) var messenger @KeyObject(.phone, defaultValue: nil) var phone: String? @KeyObject(.email, defaultValue: nil) var email: String? diff --git a/Sources/ScanFeature/Controllers/ScanContainerController.swift b/Sources/ScanFeature/Controllers/ScanContainerController.swift index 435710b6..32b99314 100644 --- a/Sources/ScanFeature/Controllers/ScanContainerController.swift +++ b/Sources/ScanFeature/Controllers/ScanContainerController.swift @@ -8,8 +8,8 @@ import AppNavigation import DrawerFeature public final class ScanContainerController: 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 = ScanContainerView() diff --git a/Sources/ScanFeature/Controllers/ScanController.swift b/Sources/ScanFeature/Controllers/ScanController.swift index e21b9d03..a755f79f 100644 --- a/Sources/ScanFeature/Controllers/ScanController.swift +++ b/Sources/ScanFeature/Controllers/ScanController.swift @@ -8,9 +8,9 @@ import PermissionsFeature import ComposableArchitecture final class ScanController: UIViewController { - @Dependency(\.navigator) var navigator: Navigator - @Dependency(\.permissions) var permissions: PermissionsManager - @Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue> + @Dependency(\.navigator) var navigator + @Dependency(\.app.bgQueue) var bgQueue + @Dependency(\.permissions) var permissions private lazy var screenView = ScanView() diff --git a/Sources/ScanFeature/ViewModels/ScanDisplayViewModel.swift b/Sources/ScanFeature/ViewModels/ScanDisplayViewModel.swift index 75410119..924a7daa 100644 --- a/Sources/ScanFeature/ViewModels/ScanDisplayViewModel.swift +++ b/Sources/ScanFeature/ViewModels/ScanDisplayViewModel.swift @@ -16,7 +16,7 @@ struct ScanDisplayViewState: Equatable { } final class ScanDisplayViewModel { - @Dependency(\.app.messenger) var messenger: Messenger + @Dependency(\.app.messenger) var messenger @KeyObject(.email, defaultValue: nil) var email: String? @KeyObject(.phone, defaultValue: nil) var phone: String? diff --git a/Sources/ScanFeature/ViewModels/ScanViewModel.swift b/Sources/ScanFeature/ViewModels/ScanViewModel.swift index d69cbd69..feaa49b1 100644 --- a/Sources/ScanFeature/ViewModels/ScanViewModel.swift +++ b/Sources/ScanFeature/ViewModels/ScanViewModel.swift @@ -23,8 +23,8 @@ enum ScanError: Equatable { } final class ScanViewModel { - @Dependency(\.app.dbManager) var dbManager: DBManager - @Dependency(\.reportingStatus) var reportingStatus: ReportingStatus + @Dependency(\.app.dbManager) var dbManager + @Dependency(\.reportingStatus) var reportingStatus var contactPublisher: AnyPublisher<XXModels.Contact, Never> { contactSubject.eraseToAnyPublisher() diff --git a/Sources/SearchFeature/Controllers/SearchContainerController.swift b/Sources/SearchFeature/Controllers/SearchContainerController.swift index ec9bcd59..812ed8b3 100644 --- a/Sources/SearchFeature/Controllers/SearchContainerController.swift +++ b/Sources/SearchFeature/Controllers/SearchContainerController.swift @@ -9,8 +9,8 @@ import AppNavigation import DrawerFeature public final class SearchContainerController: 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 = SearchContainerView() diff --git a/Sources/SearchFeature/Controllers/SearchLeftController.swift b/Sources/SearchFeature/Controllers/SearchLeftController.swift index 4485fa22..86a70d11 100644 --- a/Sources/SearchFeature/Controllers/SearchLeftController.swift +++ b/Sources/SearchFeature/Controllers/SearchLeftController.swift @@ -10,7 +10,7 @@ import DrawerFeature import CountryListFeature final class SearchLeftController: UIViewController { - @Dependency(\.navigator) var navigator: Navigator + @Dependency(\.navigator) var navigator @KeyObject(.email, defaultValue: nil) var email: String? @KeyObject(.phone, defaultValue: nil) var phone: String? @KeyObject(.sharingEmail, defaultValue: false) var isSharingEmail: Bool diff --git a/Sources/SearchFeature/Controllers/SearchRightController.swift b/Sources/SearchFeature/Controllers/SearchRightController.swift index 3445f226..29d640c5 100644 --- a/Sources/SearchFeature/Controllers/SearchRightController.swift +++ b/Sources/SearchFeature/Controllers/SearchRightController.swift @@ -4,7 +4,7 @@ import AppNavigation import ComposableArchitecture final class SearchRightController: UIViewController { - @Dependency(\.navigator) var navigator: Navigator + @Dependency(\.navigator) var navigator private lazy var screenView = SearchRightView() diff --git a/Sources/SearchFeature/ViewModels/SearchContainerViewModel.swift b/Sources/SearchFeature/ViewModels/SearchContainerViewModel.swift index 1571afda..2a5c5bdd 100644 --- a/Sources/SearchFeature/ViewModels/SearchContainerViewModel.swift +++ b/Sources/SearchFeature/ViewModels/SearchContainerViewModel.swift @@ -6,7 +6,7 @@ import PermissionsFeature import ComposableArchitecture final class SearchContainerViewModel { - @Dependency(\.permissions) var permissions: PermissionsManager + @Dependency(\.permissions) var permissions //@Dependency(\.app.dummyTraffic) var dummyTraffic: DummyTraffic @KeyObject(.dummyTrafficOn, defaultValue: false) var dummyTrafficOn diff --git a/Sources/SearchFeature/ViewModels/SearchRightViewModel.swift b/Sources/SearchFeature/ViewModels/SearchRightViewModel.swift index 12dab510..d0f9a2cc 100644 --- a/Sources/SearchFeature/ViewModels/SearchRightViewModel.swift +++ b/Sources/SearchFeature/ViewModels/SearchRightViewModel.swift @@ -26,9 +26,9 @@ enum ScanningError: Equatable { } final class SearchRightViewModel { - @Dependency(\.app.dbManager) var dbManager: DBManager - @Dependency(\.permissions) var permissions: PermissionsManager - @Dependency(\.reportingStatus) var reportingStatus: ReportingStatus + @Dependency(\.permissions) var permissions + @Dependency(\.app.dbManager) var dbManager + @Dependency(\.reportingStatus) var reportingStatus var foundPublisher: AnyPublisher<XXModels.Contact, Never> { foundSubject.eraseToAnyPublisher() diff --git a/Sources/SettingsFeature/Controllers/SettingsAdvancedController.swift b/Sources/SettingsFeature/Controllers/SettingsAdvancedController.swift index 96225a7d..67d5153c 100644 --- a/Sources/SettingsFeature/Controllers/SettingsAdvancedController.swift +++ b/Sources/SettingsFeature/Controllers/SettingsAdvancedController.swift @@ -5,7 +5,7 @@ import AppResources import AppNavigation public final class SettingsAdvancedController: UIViewController { - @Dependency(\.navigator) var navigator: Navigator + @Dependency(\.navigator) var navigator private lazy var screenView = SettingsAdvancedView() diff --git a/Sources/SettingsFeature/Controllers/SettingsDeleteController.swift b/Sources/SettingsFeature/Controllers/SettingsDeleteController.swift index 0c64d28d..e9b48cb4 100644 --- a/Sources/SettingsFeature/Controllers/SettingsDeleteController.swift +++ b/Sources/SettingsFeature/Controllers/SettingsDeleteController.swift @@ -9,7 +9,7 @@ import DrawerFeature import ScrollViewController public final class SettingsDeleteController: UIViewController { - @Dependency(\.navigator) var navigator: Navigator + @Dependency(\.navigator) var navigator @KeyObject(.username, defaultValue: "") var username: String diff --git a/Sources/SettingsFeature/Controllers/SettingsMainController.swift b/Sources/SettingsFeature/Controllers/SettingsMainController.swift index 574c0dca..932108f9 100644 --- a/Sources/SettingsFeature/Controllers/SettingsMainController.swift +++ b/Sources/SettingsFeature/Controllers/SettingsMainController.swift @@ -9,8 +9,8 @@ import DrawerFeature import ScrollViewController public final class SettingsMainController: UIViewController { - @Dependency(\.navigator) var navigator: Navigator - @Dependency(\.app.statusBar) var statusBar: StatusBarStylist + @Dependency(\.navigator) var navigator + @Dependency(\.app.statusBar) var statusBar private lazy var scrollViewController = ScrollViewController() private lazy var screenView = SettingsMainView { diff --git a/Sources/SettingsFeature/ViewModels/SettingsAdvancedViewModel.swift b/Sources/SettingsFeature/ViewModels/SettingsAdvancedViewModel.swift index 585880a0..e45fe802 100644 --- a/Sources/SettingsFeature/ViewModels/SettingsAdvancedViewModel.swift +++ b/Sources/SettingsFeature/ViewModels/SettingsAdvancedViewModel.swift @@ -21,9 +21,9 @@ final class SettingsAdvancedViewModel { private var cancellables = Set<AnyCancellable>() private let isShowingUsernamesKey = "isShowingUsernames" - @Dependency(\.app.log) var logger: Logger - @Dependency(\.crashReport) var crashReport: CrashReport - @Dependency(\.reportingStatus) var reportingStatus: ReportingStatus + @Dependency(\.app.log) var logger + @Dependency(\.crashReport) var crashReport + @Dependency(\.reportingStatus) var reportingStatus var sharePublisher: AnyPublisher<URL, Never> { shareRelay.eraseToAnyPublisher() diff --git a/Sources/SettingsFeature/ViewModels/SettingsDeleteViewModel.swift b/Sources/SettingsFeature/ViewModels/SettingsDeleteViewModel.swift index 1eeb1c33..05073def 100644 --- a/Sources/SettingsFeature/ViewModels/SettingsDeleteViewModel.swift +++ b/Sources/SettingsFeature/ViewModels/SettingsDeleteViewModel.swift @@ -7,10 +7,10 @@ import AppResources import XXMessengerClient final class SettingsDeleteViewModel { - @Dependency(\.keychain) var keychain: KeychainManager - @Dependency(\.app.dbManager) var dbManager: DBManager - @Dependency(\.app.messenger) var messenger: Messenger - @Dependency(\.app.hudManager) var hudManager: HUDManager + @Dependency(\.keychain) var keychain + @Dependency(\.app.dbManager) var dbManager + @Dependency(\.app.messenger) var messenger + @Dependency(\.app.hudManager) var hudManager @KeyObject(.username, defaultValue: nil) var username: String? private var isCurrentlyDeleting = false diff --git a/Sources/TermsFeature/TermsConditionsController.swift b/Sources/TermsFeature/TermsConditionsController.swift index ce67d0e4..708e8d33 100644 --- a/Sources/TermsFeature/TermsConditionsController.swift +++ b/Sources/TermsFeature/TermsConditionsController.swift @@ -8,7 +8,7 @@ import AppNavigation import ComposableArchitecture public final class TermsConditionsController: UIViewController { - @Dependency(\.navigator) var navigator: Navigator + @Dependency(\.navigator) var navigator @KeyObject(.username, defaultValue: nil) var username: String? @KeyObject(.acceptedTerms, defaultValue: false) var didAcceptTerms: Bool -- GitLab