Skip to content
Snippets Groups Projects
Commit bad47f0e authored by Bruno Muniz's avatar Bruno Muniz :apple:
Browse files

Merge branch 'fix/remove-unnecessary-type-explicit' into 'dev'

Removes unecessary type expliciting on dependencies

See merge request elixxir/client-ios!82
parents ac0dbc8a e2594386
No related branches found
No related tags found
1 merge request!82Removes unecessary type expliciting on dependencies
Showing
with 51 additions and 51 deletions
...@@ -9,8 +9,8 @@ import DrawerFeature ...@@ -9,8 +9,8 @@ import DrawerFeature
import ScrollViewController import ScrollViewController
public final class OnboardingPhoneController: UIViewController { public final class OnboardingPhoneController: UIViewController {
@Dependency(\.navigator) var navigator: Navigator @Dependency(\.navigator) var navigator
@Dependency(\.app.statusBar) var statusBar: StatusBarStylist @Dependency(\.app.statusBar) var statusBar
private lazy var screenView = OnboardingPhoneView() private lazy var screenView = OnboardingPhoneView()
private lazy var scrollViewController = ScrollViewController() private lazy var scrollViewController = ScrollViewController()
......
...@@ -4,7 +4,7 @@ import AppNavigation ...@@ -4,7 +4,7 @@ import AppNavigation
import ComposableArchitecture import ComposableArchitecture
public final class OnboardingStartController: UIViewController { public final class OnboardingStartController: UIViewController {
@Dependency(\.navigator) var navigator: Navigator @Dependency(\.navigator) var navigator
private lazy var screenView = OnboardingStartView() private lazy var screenView = OnboardingStartView()
......
...@@ -9,8 +9,8 @@ import DrawerFeature ...@@ -9,8 +9,8 @@ import DrawerFeature
import ScrollViewController import ScrollViewController
public final class OnboardingUsernameController: UIViewController { public final class OnboardingUsernameController: UIViewController {
@Dependency(\.navigator) var navigator: Navigator @Dependency(\.navigator) var navigator
@Dependency(\.app.statusBar) var statusBar: StatusBarStylist @Dependency(\.app.statusBar) var statusBar
private lazy var screenView = OnboardingUsernameView() private lazy var screenView = OnboardingUsernameView()
private lazy var scrollViewController = ScrollViewController() private lazy var scrollViewController = ScrollViewController()
......
...@@ -9,8 +9,8 @@ import AppNavigation ...@@ -9,8 +9,8 @@ import AppNavigation
import DrawerFeature import DrawerFeature
public final class OnboardingWelcomeController: UIViewController { public final class OnboardingWelcomeController: UIViewController {
@Dependency(\.navigator) var navigator: Navigator @Dependency(\.navigator) var navigator
@Dependency(\.app.statusBar) var statusBar: StatusBarStylist @Dependency(\.app.statusBar) var statusBar
@KeyObject(.username, defaultValue: "") var username: String @KeyObject(.username, defaultValue: "") var username: String
......
...@@ -21,9 +21,9 @@ final class OnboardingCodeViewModel { ...@@ -21,9 +21,9 @@ final class OnboardingCodeViewModel {
stateSubject.eraseToAnyPublisher() stateSubject.eraseToAnyPublisher()
} }
@Dependency(\.app.messenger) var messenger: Messenger @Dependency(\.app.bgQueue) var bgQueue
@Dependency(\.app.hudManager) var hudManager: HUDManager @Dependency(\.app.messenger) var messenger
@Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue> @Dependency(\.app.hudManager) var hudManager
@KeyObject(.email, defaultValue: nil) var email: String? @KeyObject(.email, defaultValue: nil) var email: String?
@KeyObject(.phone, defaultValue: nil) var phone: String? @KeyObject(.phone, defaultValue: nil) var phone: String?
......
...@@ -15,9 +15,9 @@ final class OnboardingEmailViewModel { ...@@ -15,9 +15,9 @@ final class OnboardingEmailViewModel {
var status: InputField.ValidationStatus = .unknown(nil) var status: InputField.ValidationStatus = .unknown(nil)
} }
@Dependency(\.app.messenger) var messenger: Messenger @Dependency(\.app.bgQueue) var bgQueue
@Dependency(\.app.hudManager) var hudManager: HUDManager @Dependency(\.app.messenger) var messenger
@Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue> @Dependency(\.app.hudManager) var hudManager
var statePublisher: AnyPublisher<ViewState, Never> { var statePublisher: AnyPublisher<ViewState, Never> {
stateSubject.eraseToAnyPublisher() stateSubject.eraseToAnyPublisher()
......
...@@ -18,9 +18,9 @@ final class OnboardingPhoneViewModel { ...@@ -18,9 +18,9 @@ final class OnboardingPhoneViewModel {
var country: Country = .fromMyPhone() var country: Country = .fromMyPhone()
} }
@Dependency(\.app.messenger) var messenger: Messenger @Dependency(\.app.bgQueue) var bgQueue
@Dependency(\.app.hudManager) var hudManager: HUDManager @Dependency(\.app.messenger) var messenger
@Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue> @Dependency(\.app.hudManager) var hudManager
var statePublisher: AnyPublisher<ViewState, Never> { var statePublisher: AnyPublisher<ViewState, Never> {
stateSubject.eraseToAnyPublisher() stateSubject.eraseToAnyPublisher()
......
...@@ -16,10 +16,10 @@ final class OnboardingUsernameViewModel { ...@@ -16,10 +16,10 @@ final class OnboardingUsernameViewModel {
var didConfirm: Bool = false var didConfirm: Bool = false
} }
@Dependency(\.app.dbManager) var dbManager: DBManager @Dependency(\.app.bgQueue) var bgQueue
@Dependency(\.app.messenger) var messenger: Messenger @Dependency(\.app.dbManager) var dbManager
@Dependency(\.app.hudManager) var hudManager: HUDManager @Dependency(\.app.messenger) var messenger
@Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue> @Dependency(\.app.hudManager) var hudManager
@KeyObject(.username, defaultValue: "") var username: String @KeyObject(.username, defaultValue: "") var username: String
......
...@@ -8,8 +8,8 @@ import AppNavigation ...@@ -8,8 +8,8 @@ import AppNavigation
import ScrollViewController import ScrollViewController
public final class ProfileCodeController: UIViewController { public final class ProfileCodeController: UIViewController {
@Dependency(\.navigator) var navigator: Navigator @Dependency(\.navigator) var navigator
@Dependency(\.app.statusBar) var statusBar: StatusBarStylist @Dependency(\.app.statusBar) var statusBar
private lazy var screenView = ProfileCodeView() private lazy var screenView = ProfileCodeView()
private lazy var scrollViewController = ScrollViewController() private lazy var scrollViewController = ScrollViewController()
......
...@@ -8,8 +8,8 @@ import DrawerFeature ...@@ -8,8 +8,8 @@ import DrawerFeature
import ComposableArchitecture import ComposableArchitecture
public final class ProfileController: UIViewController { public final class ProfileController: UIViewController {
@Dependency(\.navigator) var navigator: Navigator @Dependency(\.navigator) var navigator
@Dependency(\.app.statusBar) var statusBar: StatusBarStylist @Dependency(\.app.statusBar) var statusBar
private lazy var screenView = ProfileView() private lazy var screenView = ProfileView()
......
...@@ -8,8 +8,8 @@ import ScrollViewController ...@@ -8,8 +8,8 @@ import ScrollViewController
import ComposableArchitecture import ComposableArchitecture
public final class ProfileEmailController: UIViewController { public final class ProfileEmailController: UIViewController {
@Dependency(\.navigator) var navigator: Navigator @Dependency(\.navigator) var navigator
@Dependency(\.app.statusBar) var statusBar: StatusBarStylist @Dependency(\.app.statusBar) var statusBar
private lazy var screenView = ProfileEmailView() private lazy var screenView = ProfileEmailView()
private lazy var scrollViewController = ScrollViewController() private lazy var scrollViewController = ScrollViewController()
......
...@@ -8,8 +8,8 @@ import AppNavigation ...@@ -8,8 +8,8 @@ import AppNavigation
import ScrollViewController import ScrollViewController
public final class ProfilePhoneController: UIViewController { public final class ProfilePhoneController: UIViewController {
@Dependency(\.navigator) var navigator: Navigator @Dependency(\.navigator) var navigator
@Dependency(\.app.statusBar) var statusBar: StatusBarStylist @Dependency(\.app.statusBar) var statusBar
private lazy var screenView = ProfilePhoneView() private lazy var screenView = ProfilePhoneView()
private lazy var scrollViewController = ScrollViewController() private lazy var scrollViewController = ScrollViewController()
......
...@@ -20,9 +20,9 @@ final class ProfileCodeViewModel { ...@@ -20,9 +20,9 @@ final class ProfileCodeViewModel {
stateSubject.eraseToAnyPublisher() stateSubject.eraseToAnyPublisher()
} }
@Dependency(\.app.messenger) var messenger: Messenger @Dependency(\.app.bgQueue) var bgQueue
@Dependency(\.app.hudManager) var hudManager: HUDManager @Dependency(\.app.messenger) var messenger
@Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue> @Dependency(\.app.hudManager) var hudManager
@KeyObject(.email, defaultValue: nil) var email: String? @KeyObject(.email, defaultValue: nil) var email: String?
@KeyObject(.phone, defaultValue: nil) var phone: String? @KeyObject(.phone, defaultValue: nil) var phone: String?
......
...@@ -15,9 +15,9 @@ final class ProfileEmailViewModel { ...@@ -15,9 +15,9 @@ final class ProfileEmailViewModel {
var status: InputField.ValidationStatus = .unknown(nil) var status: InputField.ValidationStatus = .unknown(nil)
} }
@Dependency(\.app.messenger) var messenger: Messenger @Dependency(\.app.bgQueue) var bgQueue
@Dependency(\.app.hudManager) var hudManager: HUDManager @Dependency(\.app.messenger) var messenger
@Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue> @Dependency(\.app.hudManager) var hudManager
var statePublisher: AnyPublisher<ViewState, Never> { var statePublisher: AnyPublisher<ViewState, Never> {
stateSubject.eraseToAnyPublisher() stateSubject.eraseToAnyPublisher()
......
...@@ -18,9 +18,9 @@ final class ProfilePhoneViewModel { ...@@ -18,9 +18,9 @@ final class ProfilePhoneViewModel {
var country: Country = .fromMyPhone() var country: Country = .fromMyPhone()
} }
@Dependency(\.app.messenger) var messenger: Messenger @Dependency(\.app.bgQueue) var bgQueue
@Dependency(\.app.hudManager) var hudManager: HUDManager @Dependency(\.app.messenger) var messenger
@Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue> @Dependency(\.app.hudManager) var hudManager
var statePublisher: AnyPublisher<ViewState, Never> { var statePublisher: AnyPublisher<ViewState, Never> {
stateSubject.eraseToAnyPublisher() stateSubject.eraseToAnyPublisher()
......
...@@ -31,11 +31,11 @@ final class ProfileViewModel { ...@@ -31,11 +31,11 @@ final class ProfileViewModel {
@KeyObject(.sharingEmail, defaultValue: false) var isEmailSharing: Bool @KeyObject(.sharingEmail, defaultValue: false) var isEmailSharing: Bool
@KeyObject(.sharingPhone, defaultValue: false) var isPhoneSharing: Bool @KeyObject(.sharingPhone, defaultValue: false) var isPhoneSharing: Bool
@Dependency(\.app.messenger) var messenger: Messenger @Dependency(\.app.bgQueue) var bgQueue
@Dependency(\.app.hudManager) var hudManager: HUDManager @Dependency(\.permissions) var permissions
@Dependency(\.backupService) var backupService: BackupService @Dependency(\.app.messenger) var messenger
@Dependency(\.permissions) var permissions: PermissionsManager @Dependency(\.app.hudManager) var hudManager
@Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue> @Dependency(\.backupService) var backupService
var name: String { username! } var name: String { username! }
......
...@@ -8,8 +8,8 @@ import AppNavigation ...@@ -8,8 +8,8 @@ import AppNavigation
import PermissionsFeature import PermissionsFeature
public final class RequestPermissionController: UIViewController { public final class RequestPermissionController: UIViewController {
@Dependency(\.app.statusBar) var statusBar: StatusBarStylist @Dependency(\.permissions) var permissions
@Dependency(\.permissions) var permissions: PermissionsManager @Dependency(\.app.statusBar) var statusBar
private lazy var screenView = RequestPermissionView() private lazy var screenView = RequestPermissionView()
......
...@@ -8,8 +8,8 @@ import AppNavigation ...@@ -8,8 +8,8 @@ import AppNavigation
import ContactFeature import ContactFeature
public final class RequestsContainerController: UIViewController { public final class RequestsContainerController: UIViewController {
@Dependency(\.navigator) var navigator: Navigator @Dependency(\.navigator) var navigator
@Dependency(\.app.statusBar) var statusBar: StatusBarStylist @Dependency(\.app.statusBar) var statusBar
private lazy var screenView = RequestsContainerView() private lazy var screenView = RequestsContainerView()
private var cancellables = Set<AnyCancellable>() private var cancellables = Set<AnyCancellable>()
......
...@@ -10,8 +10,8 @@ import DrawerFeature ...@@ -10,8 +10,8 @@ import DrawerFeature
import CountryListFeature import CountryListFeature
final class RequestsReceivedController: UIViewController { final class RequestsReceivedController: UIViewController {
@Dependency(\.navigator) var navigator: Navigator @Dependency(\.navigator) var navigator
@Dependency(\.app.toastManager) var toaster: ToastManager @Dependency(\.app.toastManager) var toaster
private lazy var screenView = RequestsReceivedView() private lazy var screenView = RequestsReceivedView()
private var cancellables = Set<AnyCancellable>() private var cancellables = Set<AnyCancellable>()
......
...@@ -10,9 +10,9 @@ import CombineSchedulers ...@@ -10,9 +10,9 @@ import CombineSchedulers
import XXMessengerClient import XXMessengerClient
final class RequestsFailedViewModel { final class RequestsFailedViewModel {
@Dependency(\.app.dbManager) var dbManager: DBManager @Dependency(\.app.dbManager) var dbManager
@Dependency(\.app.messenger) var messenger: Messenger @Dependency(\.app.messenger) var messenger
@Dependency(\.app.hudManager) var hudManager: HUDManager @Dependency(\.app.hudManager) var hudManager
@KeyObject(.username, defaultValue: nil) var username: String? @KeyObject(.username, defaultValue: nil) var username: String?
@KeyObject(.sharingEmail, defaultValue: false) var sharingEmail: Bool @KeyObject(.sharingEmail, defaultValue: false) var sharingEmail: Bool
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment