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

Show the call buttons on macOS when the experimental native calling feature is enabled. (#6183)

Browse Source 
* Show the call buttons on macOS when the experimental native calling feature is enabled.

* Start native calls in their own window on macOS.

* Update the Enterprise submodule.
This commit is contained in:
Doug
2026-09-23 12:24:54 +01:00
committed by GitHub
parent 27ffd4f3d5
commit 7c758df208
14 changed files with 56 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift
+1
View File
@@ -940,6 +940,7 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
private func presentRoomDetails(isRoot: Bool, animated: Bool) async {
let params = RoomDetailsScreenCoordinatorParameters(roomProxy: roomProxy,
userSession: userSession,
appSettings: flowParameters.appSettings,
appHooks: flowParameters.appHooks,
analyticsService: flowParameters.analytics,
userIndicatorController: flowParameters.userIndicatorController,
ElementX/Sources/FlowCoordinators/SpaceSettingsFlowCoordinator.swift
+1
View File
@@ -211,6 +211,7 @@ final class SpaceSettingsFlowCoordinator: FlowCoordinatorProtocol {
private func presentSpaceSettings(animated: Bool) {
let coordinator = RoomDetailsScreenCoordinator(parameters: .init(roomProxy: roomProxy,
userSession: flowParameters.userSession,
appSettings: flowParameters.appSettings,
appHooks: flowParameters.appHooks,
analyticsService: flowParameters.analytics,
userIndicatorController: flowParameters.userIndicatorController,
ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift
+16 -7
View File
@@ -578,8 +578,13 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol {
}
let coordinator = NativeCallScreenCoordinator(parameters: .init(controller: controller))
navigationTabCoordinator.setOverlayCoordinator(coordinator, animated: true)
flowParameters.analytics.track(screen: .RoomCall)
if ProcessInfo.processInfo.isiOSAppOnMac {
flowParameters.appMediator.windowManager.registerCoordinator(coordinator, flowCoordinator: nil, forWindowType: .call)
} else {
navigationTabCoordinator.setOverlayCoordinator(coordinator, animated: true)
flowParameters.analytics.track(screen: .RoomCall)
}
}
private func restoreNativeCallScreen() {
@@ -588,12 +593,16 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol {
}
private func dismissCallScreenIfNeeded() {
guard navigationTabCoordinator.overlayCoordinator is CallScreenCoordinator
|| navigationTabCoordinator.overlayCoordinator is NativeCallScreenCoordinator else {
return
if ProcessInfo.processInfo.isiOSAppOnMac {
flowParameters.appMediator.windowManager.closeSecondaryWindow(forType: .call)
} else {
guard navigationTabCoordinator.overlayCoordinator is CallScreenCoordinator
|| navigationTabCoordinator.overlayCoordinator is NativeCallScreenCoordinator else {
return
}
navigationTabCoordinator.setOverlayCoordinator(nil)
}
navigationTabCoordinator.setOverlayCoordinator(nil)
}
// MARK: - Logout