mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-04 10:33:45 +00:00
Allow sending locations within threads
This patch implements support for sending locations within threads by following a similar behavior to the other screens: pass the thread root between the various state machine states until the action is finally invoked.
This commit is contained in:
Stefan Ceriu
committed by
Stefan Ceriu
Stefan Ceriu
parent
3c441f47c9
commit
f66d654820
@@ -310,8 +310,8 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
|
||||
case (_, .presentMessageForwarding(let forwardingItem), .messageForwarding):
|
||||
presentMessageForwarding(with: forwardingItem)
|
||||
|
||||
case (_, .presentMapNavigator(let mode), .mapNavigator):
|
||||
presentMapNavigator(interactionMode: mode)
|
||||
case (_, .presentMapNavigator(let mode, let threadRootEventID), .mapNavigator):
|
||||
presentMapNavigator(interactionMode: mode, threadRootEventID: threadRootEventID)
|
||||
|
||||
case (_, .presentPollForm(let mode), .pollForm):
|
||||
presentPollForm(mode: mode)
|
||||
@@ -528,19 +528,25 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
|
||||
case .presentRoomDetails:
|
||||
stateMachine.tryEvent(.presentRoomDetails)
|
||||
case .presentReportContent(let itemID, let senderID):
|
||||
stateMachine.tryEvent(.presentReportContent(itemID: itemID, senderID: senderID))
|
||||
stateMachine.tryEvent(.presentReportContent(itemID: itemID,
|
||||
senderID: senderID))
|
||||
case .presentMediaUploadPicker(let source):
|
||||
stateMachine.tryEvent(.presentMediaUploadPicker(source: source, threadRootEventID: nil))
|
||||
stateMachine.tryEvent(.presentMediaUploadPicker(source: source,
|
||||
threadRootEventID: nil))
|
||||
case .presentMediaUploadPreviewScreen(let url):
|
||||
stateMachine.tryEvent(.presentMediaUploadPreview(fileURL: url, threadRootEventID: nil))
|
||||
stateMachine.tryEvent(.presentMediaUploadPreview(fileURL: url,
|
||||
threadRootEventID: nil))
|
||||
case .presentEmojiPicker(let itemID, let selectedEmojis):
|
||||
stateMachine.tryEvent(.presentEmojiPicker(itemID: itemID, selectedEmojis: selectedEmojis))
|
||||
stateMachine.tryEvent(.presentEmojiPicker(itemID: itemID,
|
||||
selectedEmojis: selectedEmojis))
|
||||
case .presentLocationPicker:
|
||||
stateMachine.tryEvent(.presentMapNavigator(interactionMode: .picker))
|
||||
stateMachine.tryEvent(.presentMapNavigator(interactionMode: .picker,
|
||||
threadRootEventID: nil))
|
||||
case .presentPollForm(let mode):
|
||||
stateMachine.tryEvent(.presentPollForm(mode: mode))
|
||||
case .presentLocationViewer(_, let geoURI, let description):
|
||||
stateMachine.tryEvent(.presentMapNavigator(interactionMode: .viewOnly(geoURI: geoURI, description: description)))
|
||||
stateMachine.tryEvent(.presentMapNavigator(interactionMode: .viewOnly(geoURI: geoURI, description: description),
|
||||
threadRootEventID: nil))
|
||||
case .presentRoomMemberDetails(userID: let userID):
|
||||
stateMachine.tryEvent(.presentRoomMemberDetails(userID: userID))
|
||||
case .presentMessageForwarding(let forwardingItem):
|
||||
@@ -550,13 +556,16 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
|
||||
case .presentPinnedEventsTimeline:
|
||||
stateMachine.tryEvent(.presentPinnedEventsTimeline)
|
||||
case .presentResolveSendFailure(failure: let failure, sendHandle: let sendHandle):
|
||||
stateMachine.tryEvent(.presentResolveSendFailure(failure: failure, sendHandle: sendHandle))
|
||||
stateMachine.tryEvent(.presentResolveSendFailure(failure: failure,
|
||||
sendHandle: sendHandle))
|
||||
case .presentKnockRequestsList:
|
||||
stateMachine.tryEvent(.presentKnockRequestsListScreen)
|
||||
case .presentThread(let itemID):
|
||||
stateMachine.tryEvent(.presentThread(itemID: itemID))
|
||||
case .presentRoom(roomID: let roomID):
|
||||
stateMachine.tryEvent(.startChildFlow(roomID: roomID, via: [], entryPoint: .room))
|
||||
stateMachine.tryEvent(.startChildFlow(roomID: roomID,
|
||||
via: [],
|
||||
entryPoint: .room))
|
||||
}
|
||||
}
|
||||
.store(in: &cancellables)
|
||||
@@ -613,20 +622,25 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
|
||||
case .presentMediaUploadPreviewScreen(let url, let threadRootEventID):
|
||||
stateMachine.tryEvent(.presentMediaUploadPreview(fileURL: url,
|
||||
threadRootEventID: threadRootEventID))
|
||||
case .presentLocationPicker:
|
||||
stateMachine.tryEvent(.presentMapNavigator(interactionMode: .picker))
|
||||
case .presentLocationPicker(let threadRootEventID):
|
||||
stateMachine.tryEvent(.presentMapNavigator(interactionMode: .picker,
|
||||
threadRootEventID: threadRootEventID))
|
||||
case .presentPollForm(let mode):
|
||||
stateMachine.tryEvent(.presentPollForm(mode: mode))
|
||||
case .presentLocationViewer(_, let geoURI, let description):
|
||||
stateMachine.tryEvent(.presentMapNavigator(interactionMode: .viewOnly(geoURI: geoURI, description: description)))
|
||||
case .presentLocationViewer(_, let geoURI, let description, let threadRootEventID):
|
||||
stateMachine.tryEvent(.presentMapNavigator(interactionMode: .viewOnly(geoURI: geoURI,
|
||||
description: description),
|
||||
threadRootEventID: threadRootEventID))
|
||||
case .presentEmojiPicker(let itemID, let selectedEmojis):
|
||||
stateMachine.tryEvent(.presentEmojiPicker(itemID: itemID, selectedEmojis: selectedEmojis))
|
||||
stateMachine.tryEvent(.presentEmojiPicker(itemID: itemID,
|
||||
selectedEmojis: selectedEmojis))
|
||||
case .presentRoomMemberDetails(let userID):
|
||||
stateMachine.tryEvent(.presentRoomMemberDetails(userID: userID))
|
||||
case .presentMessageForwarding(let forwardingItem):
|
||||
stateMachine.tryEvent(.presentMessageForwarding(forwardingItem: forwardingItem))
|
||||
case .presentResolveSendFailure(let failure, let sendHandle):
|
||||
stateMachine.tryEvent(.presentResolveSendFailure(failure: failure, sendHandle: sendHandle))
|
||||
stateMachine.tryEvent(.presentResolveSendFailure(failure: failure,
|
||||
sendHandle: sendHandle))
|
||||
}
|
||||
}
|
||||
.store(in: &cancellables)
|
||||
@@ -961,7 +975,8 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
|
||||
}
|
||||
}
|
||||
|
||||
private func presentMapNavigator(interactionMode: StaticLocationInteractionMode) {
|
||||
private func presentMapNavigator(interactionMode: StaticLocationInteractionMode,
|
||||
threadRootEventID: String?) {
|
||||
let stackCoordinator = NavigationStackCoordinator()
|
||||
|
||||
let params = StaticLocationScreenCoordinatorParameters(interactionMode: interactionMode,
|
||||
@@ -974,13 +989,12 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
|
||||
switch action {
|
||||
case .selectedLocation(let geoURI, let isUserLocation):
|
||||
Task {
|
||||
#warning("Allow sending locations within threads when the SDK allows it")
|
||||
_ = await self.roomProxy.timeline.sendLocation(body: geoURI.bodyMessage,
|
||||
geoURI: geoURI,
|
||||
description: nil,
|
||||
zoomLevel: 15,
|
||||
assetType: isUserLocation ? .sender : .pin,
|
||||
threadRootEventID: nil)
|
||||
threadRootEventID: threadRootEventID)
|
||||
self.navigationStackCoordinator.setSheetCoordinator(nil)
|
||||
}
|
||||
|
||||
@@ -1038,7 +1052,6 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
|
||||
|
||||
private func createPoll(question: String, options: [String], pollKind: Poll.Kind) {
|
||||
Task {
|
||||
#warning("Allow sending polls within threads when the SDK allows it")
|
||||
let result = await roomProxy.timeline.createPoll(question: question, answers: options, pollKind: pollKind, threadRootEventID: nil)
|
||||
|
||||
self.analytics.trackComposer(inThread: false,
|
||||
|
||||
@@ -60,7 +60,7 @@ extension RoomFlowCoordinator {
|
||||
case mediaUploadPicker(source: MediaPickerScreenSource, threadRootEventID: String?, previousState: State)
|
||||
case mediaUploadPreview(fileURL: URL, threadRootEventID: String?, previousState: State)
|
||||
case emojiPicker(itemID: TimelineItemIdentifier, selectedEmojis: Set<String>, previousState: State)
|
||||
case mapNavigator(previousState: State)
|
||||
case mapNavigator(threadRootEventID: String?, previousState: State)
|
||||
case messageForwarding(forwardingItem: MessageForwardingItem, previousState: State)
|
||||
case reportContent(itemID: TimelineItemIdentifier, senderID: String, previousState: State)
|
||||
case pollForm(previousState: State)
|
||||
@@ -131,7 +131,7 @@ extension RoomFlowCoordinator {
|
||||
case presentEmojiPicker(itemID: TimelineItemIdentifier, selectedEmojis: Set<String>)
|
||||
case dismissEmojiPicker
|
||||
|
||||
case presentMapNavigator(interactionMode: StaticLocationInteractionMode)
|
||||
case presentMapNavigator(interactionMode: StaticLocationInteractionMode, threadRootEventID: String?)
|
||||
case dismissMapNavigator
|
||||
|
||||
case presentMessageForwarding(forwardingItem: MessageForwardingItem)
|
||||
@@ -196,8 +196,8 @@ extension RoomFlowCoordinator {
|
||||
case (.room, .presentMessageForwarding(let forwardingItem)):
|
||||
return .messageForwarding(forwardingItem: forwardingItem, previousState: fromState)
|
||||
|
||||
case (.room, .presentMapNavigator):
|
||||
return .mapNavigator(previousState: fromState)
|
||||
case (.room, .presentMapNavigator(_, let threadRootEventID)):
|
||||
return .mapNavigator(threadRootEventID: threadRootEventID, previousState: fromState)
|
||||
|
||||
case (.room, .presentPollForm):
|
||||
return .pollForm(previousState: fromState)
|
||||
@@ -233,8 +233,8 @@ extension RoomFlowCoordinator {
|
||||
case (.thread, .presentMessageForwarding(let forwardingItem)):
|
||||
return .messageForwarding(forwardingItem: forwardingItem, previousState: fromState)
|
||||
|
||||
case (.thread, .presentMapNavigator):
|
||||
return .mapNavigator(previousState: fromState)
|
||||
case (.thread, .presentMapNavigator(_, let threadRootEventID)):
|
||||
return .mapNavigator(threadRootEventID: threadRootEventID, previousState: fromState)
|
||||
|
||||
case (.thread, .presentPollForm):
|
||||
return .pollForm(previousState: fromState)
|
||||
@@ -256,7 +256,7 @@ extension RoomFlowCoordinator {
|
||||
case (.messageForwarding(_, let previousState), .dismissMessageForwarding):
|
||||
return previousState
|
||||
|
||||
case (.mapNavigator(let previousState), .dismissMapNavigator):
|
||||
case (.mapNavigator(_, let previousState), .dismissMapNavigator):
|
||||
return previousState
|
||||
|
||||
case (.pollForm(let previousState), .dismissPollForm):
|
||||
|
||||
Reference in New Issue
Block a user