Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ import SwiftUI
#if DEBUG
import AppDebugMode
#endif
import Factory

@main
@MainActor
class AppDelegate: UIResponder, UIApplicationDelegate {

var window: UIWindow?
private var dependencyContainer = DependencyContainer()

#if DEBUG
var model: CustomControlsModel = CustomControlsModel()
Expand All @@ -28,15 +29,35 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
window = UIWindow()

#if DEBUG
AppDebugModeProvider.shared.setup(
serversCollections: Constants.ServersCollections.allClases,
onServerChange: { debugPrint("Server has been changed") },
cacheManager: dependencyContainer.cacheManager,
customControls: { CustomControlsView(model: model) }
)
Task {
let providers = [
DebugSelectableServerProvider(
apiServerPickerConfiguration: .init(
serversCollections: Constants.devServerCollection,
onSelectedServerChange: nil
)
),
DebugSelectableServerProvider(
apiServerPickerConfiguration: .init(
serversCollections: Constants.testServerCollection,
onSelectedServerChange: nil
)
)
]

await PackageManager.shared.setup(
serverProviders: providers,
configurableProxySessionProvider: Container.shared.configurableSessionProvider.resolve(),
customControls: CustomControlsView(model: model),
showDebugSwift: true
)
}

#endif

AppCoordinator(window: window, di: dependencyContainer).start()

Task {
await AppCoordinator(window: window).start()
}
return true
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,24 @@

import UIKit

enum AppStep {
enum AppStep: Sendable {

case home(HomeStep)

}

@MainActor
final class AppCoordinator: Coordinator<AppStep> {

private let window: UIWindow?
private let di: DependencyContainer

init(window: UIWindow?, di: DependencyContainer) {
init(window: UIWindow?) {
self.window = window
self.di = di
}

@discardableResult
override func start() -> UIViewController? {
window?.rootViewController = HomeCoordinator(di: di).start()
override func start() async -> UIViewController? {
window?.rootViewController = await HomeCoordinator().start()
window?.makeKeyAndVisible()

return nil
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@

import UIKit

class Coordinator<Step> {
@MainActor
class Coordinator<Step: Sendable> {

var rootViewController: UIViewController?

Expand All @@ -19,14 +20,14 @@ class Coordinator<Step> {
return rootViewController as? UINavigationController
}

func start() -> UIViewController? {
func start() async -> UIViewController? {
return rootViewController
}

init(rootViewController: UIViewController? = nil) {
self.rootViewController = rootViewController
}

func navigate(to stepper: Step) {}
func navigate(to stepper: Step) async {}

}

This file was deleted.

Loading