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

pr suggestions

Browse Source
This commit is contained in:
Mauro Romito
2026-01-23 13:32:58 +01:00
committed by Mauro
parent ab1ed9e671
commit 8f8ea473f5
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/FlowCoordinators/SpaceFlowCoordinator.swift
+1 -1
View File
@@ -177,7 +177,7 @@ class SpaceFlowCoordinator: FlowCoordinatorProtocol {
rolesAndPermissionsFlowCoordinator?.clearRoute(animated: animated) rolesAndPermissionsFlowCoordinator?.clearRoute(animated: animated)
clearRoute(animated: animated) // Re-run with the state machine back in the .space state. clearRoute(animated: animated) // Re-run with the state machine back in the .space state.
case .createChildRoomFlow: case .createChildRoomFlow:
createChildRoomFlowCoordinator?.clearRoute(animated: animated) navigationStackCoordinator.setSheetCoordinator(nil)
clearRoute(animated: animated) // Re-run with the state machine back in the .space state. clearRoute(animated: animated) // Re-run with the state machine back in the .space state.
} }
} }
ElementX/Sources/FlowCoordinators/SpacesTabFlowCoordinator.swift
+1 -1
View File
@@ -89,7 +89,7 @@ class SpacesTabFlowCoordinator: FlowCoordinatorProtocol {
case .initial, .spacesScreen: case .initial, .spacesScreen:
break break
case .createSpaceFlow: case .createSpaceFlow:
startChatFlowCoordinator?.clearRoute(animated: animated) navigationSplitCoordinator.setSheetCoordinator(nil)
clearRoute(animated: animated) clearRoute(animated: animated)
} }
} }
ElementX/Sources/FlowCoordinators/StartChatFlowCoordinator.swift
+23 -23
View File
@@ -59,9 +59,8 @@ class StartChatFlowCoordinator: FlowCoordinatorProtocol {
enum Event: EventType { enum Event: EventType {
/// The flow is being started. /// The flow is being started.
case start case start
/// The user would like to create a room. /// The user would like to create a room.
case createRoom case createRoom(isSpace: Bool)
/// The user dismissed the create room screen. /// The user dismissed the create room screen.
case dismissedCreateRoom case dismissedCreateRoom
@@ -97,7 +96,14 @@ class StartChatFlowCoordinator: FlowCoordinatorProtocol {
} }
func start(animated: Bool) { func start(animated: Bool) {
stateMachine.tryEvent(.start) switch entryPoint {
case .startChat:
stateMachine.tryEvent(.start)
case .createSpace:
stateMachine.tryEvent(.createRoom(isSpace: true))
case .createRoomInSpace(let space):
stateMachine.tryEvent(.createRoom(isSpace: false), userInfo: space)
}
} }
func handleAppRoute(_ appRoute: AppRoute, animated: Bool) { func handleAppRoute(_ appRoute: AppRoute, animated: Bool) {
@@ -127,28 +133,22 @@ class StartChatFlowCoordinator: FlowCoordinatorProtocol {
// MARK: - Private // MARK: - Private
private func configureStateMachine() { private func configureStateMachine() {
stateMachine.addRouteMapping { [weak self] event, fromState, _ in stateMachine.addRoutes(event: .start, transitions: [.initial => .startChat]) { [weak self] _ in
guard let self, event == .start, fromState == .initial else { return nil } self?.presentStartChatScreen()
switch entryPoint { }
case .startChat: stateMachine.addRoutes(event: .createRoom(isSpace: true), transitions: [.initial => .createRoom]) { [weak self] _ in
return .startChat self?.presentCreateRoomScreen(isSpace: true, spaceSelectionMode: nil, isRoot: true)
case .createSpace, .createRoomInSpace: }
return .createRoom stateMachine.addRoutes(event: .createRoom(isSpace: false), transitions: [.initial => .createRoom]) { [weak self] context in
} guard context.fromState == .initial else { return } // Required check because the event is used in another route.
} handler: { [weak self] _ in guard let space = context.userInfo as? SpaceServiceRoomProtocol else {
guard let self else { return } fatalError("This transition only supports creating a room in a pre-selected space.")
switch entryPoint {
case .startChat:
presentStartChatScreen()
case .createSpace:
presentCreateRoomScreen(isSpace: true, spaceSelectionMode: nil, isRoot: true)
case .createRoomInSpace(let space):
presentCreateRoomScreen(isSpace: false, spaceSelectionMode: .preSelected(space), isRoot: true)
} }
self?.presentCreateRoomScreen(isSpace: false, spaceSelectionMode: .preSelected(space), isRoot: true)
} }
stateMachine.addRoutes(event: .createRoom, transitions: [.startChat => .createRoom]) { [weak self] _ in stateMachine.addRoutes(event: .createRoom(isSpace: false), transitions: [.startChat => .createRoom]) { [weak self] context in
guard let self else { return } guard let self, context.fromState == .startChat else { return } // Required check because the event is used in another route.
presentCreateRoomScreen(isSpace: false, presentCreateRoomScreen(isSpace: false,
spaceSelectionMode: flowParameters.appSettings.createSpaceEnabled ? .editableSpacesList : nil, spaceSelectionMode: flowParameters.appSettings.createSpaceEnabled ? .editableSpacesList : nil,
isRoot: false) isRoot: false)
@@ -195,7 +195,7 @@ class StartChatFlowCoordinator: FlowCoordinatorProtocol {
case .close: case .close:
actionsSubject.send(.finished(.cancelled)) actionsSubject.send(.finished(.cancelled))
case .createRoom: case .createRoom:
stateMachine.tryEvent(.createRoom) stateMachine.tryEvent(.createRoom(isSpace: false))
case .openRoom(let roomID): case .openRoom(let roomID):
actionsSubject.send(.finished(.room(id: roomID))) actionsSubject.send(.finished(.room(id: roomID)))
case .openRoomDirectorySearch: case .openRoomDirectorySearch: