diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2023-03-23 14:07:46 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2023-03-23 14:07:46 +0100 |
| commit | 7b6394bb9ce8b7361a19c4b8f3fbf9e7a144d921 (patch) | |
| tree | bb4209298d7e198a82ebc29d17c634ed4336efdf | |
| parent | a6f24e21d0e22999183fe002d2af7bd415a6367b (diff) | |
| download | mullvadvpn-7b6394bb9ce8b7361a19c4b8f3fbf9e7a144d921.tar.xz mullvadvpn-7b6394bb9ce8b7361a19c4b8f3fbf9e7a144d921.zip | |
Pass animated flag to beginHorizontalFlow
| -rw-r--r-- | ios/MullvadVPN/Coordinators/App/ApplicationCoordinator.swift | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/ios/MullvadVPN/Coordinators/App/ApplicationCoordinator.swift b/ios/MullvadVPN/Coordinators/App/ApplicationCoordinator.swift index a187448298..c0b18a2aaf 100644 --- a/ios/MullvadVPN/Coordinators/App/ApplicationCoordinator.swift +++ b/ios/MullvadVPN/Coordinators/App/ApplicationCoordinator.swift @@ -324,21 +324,17 @@ final class ApplicationCoordinator: Coordinator, Presenting, RootContainerViewCo On iPhone this function simply passes the primary navigation container to the `block` and nothing else. */ - private func beginHorizontalFlow(_ completion: (() -> Void)? = nil) { - if isPad { - if secondaryNavigationContainer.presentingViewController == nil { - secondaryRootConfiguration.apply(to: secondaryNavigationContainer) + private func beginHorizontalFlow(animated: Bool, completion: @escaping () -> Void) { + if isPad, secondaryNavigationContainer.presentingViewController == nil { + secondaryRootConfiguration.apply(to: secondaryNavigationContainer) - primaryNavigationContainer.present( - secondaryNavigationContainer, - animated: true, - completion: completion - ) - } else { - completion?() - } + primaryNavigationContainer.present( + secondaryNavigationContainer, + animated: animated, + completion: completion + ) } else { - completion?() + completion() } } @@ -394,7 +390,7 @@ final class ApplicationCoordinator: Coordinator, Presenting, RootContainerViewCo addChild(coordinator) coordinator.start() - beginHorizontalFlow { + beginHorizontalFlow(animated: animated) { completion(coordinator) } } @@ -412,7 +408,7 @@ final class ApplicationCoordinator: Coordinator, Presenting, RootContainerViewCo addChild(tunnelCoordinator) tunnelCoordinator.start() - beginHorizontalFlow { + beginHorizontalFlow(animated: animated) { completion(tunnelCoordinator) } } @@ -430,7 +426,7 @@ final class ApplicationCoordinator: Coordinator, Presenting, RootContainerViewCo addChild(coordinator) coordinator.start(animated: animated) - beginHorizontalFlow { + beginHorizontalFlow(animated: animated) { completion(coordinator) } } @@ -455,7 +451,7 @@ final class ApplicationCoordinator: Coordinator, Presenting, RootContainerViewCo addChild(coordinator) coordinator.start(animated: animated) - beginHorizontalFlow { + beginHorizontalFlow(animated: animated) { completion(coordinator) } } @@ -490,7 +486,7 @@ final class ApplicationCoordinator: Coordinator, Presenting, RootContainerViewCo addChild(coordinator) coordinator.start(animated: animated) - beginHorizontalFlow { + beginHorizontalFlow(animated: animated) { completion(coordinator) } } |
