ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 16:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #317 - Adopt a split layout for iPad and Mac apps

Browse Source 
Rename navigation components: SplitScreenCoordinator -> NavigationSplitCoordinator, StackScreenCoordinator -> NavigationStackCoordinator and SingleScreenCoordinator -> NavigationRootCoordinator
[0c161039] Tweak navigation logging
[826c19cf] Move the navigation dismissal callbacks to the NavigationModule, add SingleScreenCoordinator tests
[b8830d9c] Add tests
[252ad119] Merge the StackScreenCoordinator and SplitScreenCoordinators into a single file and stop publicly exposing their internal workings. Add more documentation.
[37671699] Cleanup navigation logging
[51406184] Use the parent SplitScreenCoordinator to present embedded StackScreenCoordinator sheets
[b94b04c9] Retract the room "syncing" indicator when dismissing a room
[1467b0ac] Correctly move to the no room selected state when popping in compact layouts
[10bf2ad8] Allow nilling root coordinators, replace present/dismiss sheet with setSheetCoordinator(?)
[33716784] Add single screen coordinator fade transition animation
[3cbe65e7] Prevent the timeline table view from being reused between different rooms
[9c94c50b] Move files around
[c10b6bc5] Adapt the user session state machine to the split layout
[7115a319] Fix unit and UI tests
[1ece59e8] Fix login flows
[6884dc3b] Use modules everywhere the underlying object is a NavigationModule
[ab08d44c] Rename navigation components to: SingleScreenCoordinator, SplitScreenCoordinator and StackScreenCoordinator
[ada2be57] Add SplitNavigationController

* Remove the navigationRootCoordinator from the UserSessionFlowCoordinator
This commit is contained in:
Stefan Ceriu
2022-12-12 12:31:27 +02:00
committed by GitHub
parent 5ef53e9220
commit cd40da6c3f
22 changed files with 1407 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/Authentication/AuthenticationCoordinator.swift
+8 -8
View File
@@ -24,14 +24,14 @@ protocol AuthenticationCoordinatorDelegate: AnyObject {
class AuthenticationCoordinator: CoordinatorProtocol {
private let authenticationService: AuthenticationServiceProxyProtocol
private let navigationController: NavigationController
private let navigationStackCoordinator: NavigationStackCoordinator
weak var delegate: AuthenticationCoordinatorDelegate?
init(authenticationService: AuthenticationServiceProxyProtocol,
navigationController: NavigationController) {
navigationStackCoordinator: NavigationStackCoordinator) {
self.authenticationService = authenticationService
self.navigationController = navigationController
self.navigationStackCoordinator = navigationStackCoordinator
}
func start() {
@@ -55,7 +55,7 @@ class AuthenticationCoordinator: CoordinatorProtocol {
}
}
navigationController.setRootCoordinator(coordinator)
navigationStackCoordinator.setRootCoordinator(coordinator)
}
private func startAuthentication() async {
@@ -88,12 +88,12 @@ class AuthenticationCoordinator: CoordinatorProtocol {
}
}
navigationController.push(coordinator)
navigationStackCoordinator.push(coordinator)
}
private func showLoginScreen() {
let parameters = LoginCoordinatorParameters(authenticationService: authenticationService,
navigationController: navigationController)
navigationStackCoordinator: navigationStackCoordinator)
let coordinator = LoginCoordinator(parameters: parameters)
coordinator.callback = { [weak self] action in
@@ -105,7 +105,7 @@ class AuthenticationCoordinator: CoordinatorProtocol {
}
}
navigationController.push(coordinator)
navigationStackCoordinator.push(coordinator)
}
private func showAnalyticsPrompt(with userSession: UserSessionProtocol) {
@@ -117,7 +117,7 @@ class AuthenticationCoordinator: CoordinatorProtocol {
self.delegate?.authenticationCoordinator(self, didLoginWithSession: userSession)
}
navigationController.setRootCoordinator(coordinator)
navigationStackCoordinator.setRootCoordinator(coordinator)
}
static let loadingIndicatorIdentifier = "AuthenticationCoordinatorLoading"
ElementX/Sources/Screens/Authentication/LoginScreen/LoginCoordinator.swift
+7 -7
View File
@@ -21,7 +21,7 @@ struct LoginCoordinatorParameters {
/// The service used to authenticate the user.
let authenticationService: AuthenticationServiceProxyProtocol
/// The navigation router used to present the server selection screen.
let navigationController: NavigationController
let navigationStackCoordinator: NavigationStackCoordinator
}
enum LoginCoordinatorAction {
@@ -43,7 +43,7 @@ final class LoginCoordinator: CoordinatorProtocol {
}
private var authenticationService: AuthenticationServiceProxyProtocol { parameters.authenticationService }
private var navigationController: NavigationController { parameters.navigationController }
private var navigationStackCoordinator: NavigationStackCoordinator { parameters.navigationStackCoordinator }
var callback: (@MainActor (LoginCoordinatorAction) -> Void)?
@@ -195,9 +195,9 @@ final class LoginCoordinator: CoordinatorProtocol {
/// Presents the server selection screen as a modal.
private func presentServerSelectionScreen() {
let serverSelectionNavigationController = NavigationController()
let serverSelectionNavigationStackCoordinator = NavigationStackCoordinator()
let userNotificationController = UserNotificationController(rootCoordinator: serverSelectionNavigationController)
let userNotificationController = UserNotificationController(rootCoordinator: serverSelectionNavigationStackCoordinator)
let parameters = ServerSelectionCoordinatorParameters(authenticationService: authenticationService,
userNotificationController: userNotificationController,
@@ -209,9 +209,9 @@ final class LoginCoordinator: CoordinatorProtocol {
self.serverSelectionCoordinator(coordinator, didCompleteWith: action)
}
serverSelectionNavigationController.setRootCoordinator(coordinator)
serverSelectionNavigationStackCoordinator.setRootCoordinator(coordinator)
navigationController.presentSheet(userNotificationController)
navigationStackCoordinator.setSheetCoordinator(userNotificationController)
}
/// Handles the result from the server selection modal, dismissing it after updating the view.
@@ -221,7 +221,7 @@ final class LoginCoordinator: CoordinatorProtocol {
updateViewModel()
}
navigationController.dismissSheet()
navigationStackCoordinator.setSheetCoordinator(nil)
}
/// Shows the forgot password screen.