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 35 additions and 35 deletions
...@@ -8,7 +8,7 @@ import DrawerFeature ...@@ -8,7 +8,7 @@ import DrawerFeature
import ComposableArchitecture import ComposableArchitecture
final class BackupConfigController: UIViewController { final class BackupConfigController: UIViewController {
@Dependency(\.navigator) var navigator: Navigator @Dependency(\.navigator) var navigator
private lazy var screenView = BackupConfigView() private lazy var screenView = BackupConfigView()
......
...@@ -32,9 +32,9 @@ struct BackupConfigViewModel { ...@@ -32,9 +32,9 @@ struct BackupConfigViewModel {
extension BackupConfigViewModel { extension BackupConfigViewModel {
static func live() -> Self { static func live() -> Self {
class Context { class Context {
@Dependency(\.navigator) var navigator: Navigator @Dependency(\.navigator) var navigator
@Dependency(\.backupService) var service: BackupService @Dependency(\.backupService) var service
@Dependency(\.app.hudManager) var hudManager: HUDManager @Dependency(\.app.hudManager) var hudManager
} }
let context = Context() let context = Context()
......
...@@ -18,7 +18,7 @@ struct SFTPViewState { ...@@ -18,7 +18,7 @@ struct SFTPViewState {
} }
final class BackupSFTPViewModel { final class BackupSFTPViewModel {
@Dependency(\.app.hudManager) var hudManager: HUDManager @Dependency(\.app.hudManager) var hudManager
var statePublisher: AnyPublisher<SFTPViewState, Never> { var statePublisher: AnyPublisher<SFTPViewState, Never> {
stateSubject.eraseToAnyPublisher() stateSubject.eraseToAnyPublisher()
......
...@@ -11,7 +11,7 @@ struct BackupSetupViewModel { ...@@ -11,7 +11,7 @@ struct BackupSetupViewModel {
extension BackupSetupViewModel { extension BackupSetupViewModel {
static func live() -> Self { static func live() -> Self {
class Context { class Context {
@Dependency(\.backupService) var service: BackupService @Dependency(\.backupService) var service
} }
let context = Context() let context = Context()
......
...@@ -16,7 +16,7 @@ struct BackupViewModel { ...@@ -16,7 +16,7 @@ struct BackupViewModel {
extension BackupViewModel { extension BackupViewModel {
static func live() -> Self { static func live() -> Self {
class Context { class Context {
@Dependency(\.backupService) var service: BackupService @Dependency(\.backupService) var service
} }
let context = Context() let context = Context()
......
...@@ -28,9 +28,9 @@ public final class SingleChatController: UIViewController { ...@@ -28,9 +28,9 @@ public final class SingleChatController: UIViewController {
// @Dependency var makeReportDrawer: MakeReportDrawer // @Dependency var makeReportDrawer: MakeReportDrawer
// @Dependency var makeAppScreenshot: MakeAppScreenshot // @Dependency var makeAppScreenshot: MakeAppScreenshot
@Dependency(\.navigator) var navigator: Navigator @Dependency(\.navigator) var navigator
@Dependency(\.app.statusBar) var statusBar: StatusBarStylist @Dependency(\.app.statusBar) var statusBar
@Dependency(\.reportingStatus) var reportingStatus: ReportingStatus @Dependency(\.reportingStatus) var reportingStatus
let voxophone = Voxophone() let voxophone = Voxophone()
......
...@@ -8,8 +8,8 @@ import Dependencies ...@@ -8,8 +8,8 @@ import Dependencies
import AppNavigation import AppNavigation
public final class ChatListController: UIViewController { public final class ChatListController: 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 = ChatListView() private lazy var screenView = ChatListView()
private lazy var topLeftView = ChatListTopLeftNavView() private lazy var topLeftView = ChatListTopLeftNavView()
......
...@@ -17,7 +17,7 @@ class ChatSearchListTableViewDiffableDataSource: UITableViewDiffableDataSource<S ...@@ -17,7 +17,7 @@ class ChatSearchListTableViewDiffableDataSource: UITableViewDiffableDataSource<S
} }
final class ChatSearchTableController: UITableViewController { final class ChatSearchTableController: UITableViewController {
@Dependency(\.navigator) var navigator: Navigator @Dependency(\.navigator) var navigator
private let viewModel: ChatListViewModel private let viewModel: ChatListViewModel
private let cellHeight: CGFloat = 83.0 private let cellHeight: CGFloat = 83.0
......
...@@ -13,7 +13,7 @@ extension ChatInfo: Differentiable { ...@@ -13,7 +13,7 @@ extension ChatInfo: Differentiable {
} }
final class ChatListTableController: UITableViewController { final class ChatListTableController: UITableViewController {
@Dependency(\.navigator) var navigator: Navigator @Dependency(\.navigator) var navigator
private var rows = [ChatInfo]() private var rows = [ChatInfo]()
private let viewModel: ChatListViewModel private let viewModel: ChatListViewModel
......
...@@ -10,8 +10,8 @@ import DrawerFeature ...@@ -10,8 +10,8 @@ import DrawerFeature
import ScrollViewController import ScrollViewController
public final class ContactController: UIViewController { public final class ContactController: 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 = ContactView() private lazy var screenView = ContactView()
private lazy var scrollViewController = ScrollViewController() private lazy var scrollViewController = ScrollViewController()
......
...@@ -19,9 +19,9 @@ struct ContactViewState: Equatable { ...@@ -19,9 +19,9 @@ struct ContactViewState: Equatable {
} }
final class ContactViewModel { final class ContactViewModel {
@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
......
...@@ -7,8 +7,8 @@ import AppResources ...@@ -7,8 +7,8 @@ import AppResources
import AppNavigation import AppNavigation
public final class ContactListController: UIViewController { public final class ContactListController: 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 = ContactListView() private lazy var screenView = ContactListView()
private lazy var tableController = ContactListTableController(viewModel) private lazy var tableController = ContactListTableController(viewModel)
......
...@@ -11,9 +11,9 @@ import AppCore ...@@ -11,9 +11,9 @@ import AppCore
import Dependencies import Dependencies
final class ContactListViewModel { final class ContactListViewModel {
@Dependency(\.app.dbManager) var dbManager: DBManager @Dependency(\.app.dbManager) var dbManager
@Dependency(\.app.messenger) var messenger: Messenger @Dependency(\.app.messenger) var messenger
@Dependency(\.reportingStatus) var reportingStatus: ReportingStatus @Dependency(\.reportingStatus) var reportingStatus
var myId: Data { var myId: Data {
try! messenger.e2e.get()!.getContact().getId() try! messenger.e2e.get()!.getContact().getId()
......
...@@ -6,7 +6,7 @@ import AppResources ...@@ -6,7 +6,7 @@ import AppResources
import Dependencies import Dependencies
public final class CountryListController: UIViewController, UITableViewDelegate { public final class CountryListController: UIViewController, UITableViewDelegate {
@Dependency(\.app.statusBar) var statusBar: StatusBarStylist @Dependency(\.app.statusBar) var statusBar
private lazy var screenView = CountryListView() private lazy var screenView = CountryListView()
......
...@@ -7,7 +7,7 @@ import Dependencies ...@@ -7,7 +7,7 @@ import Dependencies
import AppNavigation import AppNavigation
public final class GroupDraftController: UIViewController { public final class GroupDraftController: UIViewController {
@Dependency(\.navigator) var navigator: Navigator @Dependency(\.navigator) var navigator
private lazy var titleLabel = UILabel() private lazy var titleLabel = UILabel()
private lazy var createButton = UIButton() private lazy var createButton = UIButton()
......
...@@ -7,7 +7,7 @@ import DrawerFeature ...@@ -7,7 +7,7 @@ import DrawerFeature
import AppNavigation import AppNavigation
public final class LaunchController: UIViewController { public final class LaunchController: UIViewController {
@Dependency(\.navigator) var navigator: Navigator @Dependency(\.navigator) var navigator
private lazy var screenView = LaunchView() private lazy var screenView = LaunchView()
private let viewModel = LaunchViewModel() private let viewModel = LaunchViewModel()
......
...@@ -8,8 +8,8 @@ import AppNavigation ...@@ -8,8 +8,8 @@ import AppNavigation
import DrawerFeature import DrawerFeature
public final class MenuController: UIViewController { public final class MenuController: 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 = MenuView() private lazy var screenView = MenuView()
......
...@@ -8,8 +8,8 @@ import ReportingFeature ...@@ -8,8 +8,8 @@ import ReportingFeature
import ComposableArchitecture import ComposableArchitecture
final class MenuViewModel { final class MenuViewModel {
@Dependency(\.app.dbManager) var dbManager: DBManager @Dependency(\.app.dbManager) var dbManager
@Dependency(\.reportingStatus) var reportingStatus: ReportingStatus @Dependency(\.reportingStatus) var reportingStatus
@KeyObject(.avatar, defaultValue: nil) var avatar: Data? @KeyObject(.avatar, defaultValue: nil) var avatar: Data?
@KeyObject(.username, defaultValue: "") var username: String @KeyObject(.username, defaultValue: "") var username: String
......
...@@ -9,8 +9,8 @@ import DrawerFeature ...@@ -9,8 +9,8 @@ import DrawerFeature
import ScrollViewController import ScrollViewController
public final class OnboardingCodeController: UIViewController { public final class OnboardingCodeController: 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 = OnboardingCodeView() private lazy var screenView = OnboardingCodeView()
private lazy var scrollViewController = ScrollViewController() private lazy var scrollViewController = ScrollViewController()
......
...@@ -9,8 +9,8 @@ import DrawerFeature ...@@ -9,8 +9,8 @@ import DrawerFeature
import ScrollViewController import ScrollViewController
public final class OnboardingEmailController: UIViewController { public final class OnboardingEmailController: 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 = OnboardingEmailView() private lazy var screenView = OnboardingEmailView()
private lazy var scrollViewController = ScrollViewController() private lazy var scrollViewController = ScrollViewController()
......
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