From 05b905a3f1fa386e554ed7d732815073a1dd3fcd Mon Sep 17 00:00:00 2001 From: Christophe Deschamps Date: Fri, 2 Dec 2022 17:09:11 +0100 Subject: [PATCH] Hide audio route selection view when clicked outsize --- Classes/Swift/Voip/ViewModels/ControlsViewModel.swift | 2 ++ .../Views/CompositeViewControllers/ConferenceCallView.swift | 5 +++++ .../Voip/Views/CompositeViewControllers/SingleCallView.swift | 3 +++ 3 files changed, 10 insertions(+) diff --git a/Classes/Swift/Voip/ViewModels/ControlsViewModel.swift b/Classes/Swift/Voip/ViewModels/ControlsViewModel.swift index a03943c20..2f32d6615 100644 --- a/Classes/Swift/Voip/ViewModels/ControlsViewModel.swift +++ b/Classes/Swift/Voip/ViewModels/ControlsViewModel.swift @@ -92,6 +92,7 @@ class ControlsViewModel { ConferenceViewModel.shared.conferenceDisplayMode.readCurrentAndObserve { _ in self.updateVideoAvailable() } + self.isBluetoothHeadsetAvailable.value = !core.audioDevices.filter { [.Bluetooth,.BluetoothA2DP].contains($0.type)}.isEmpty } private func setAudioRoutes(_ call:Call,_ state:Call.State) { @@ -229,6 +230,7 @@ class ControlsViewModel { } func toggleFullScreen() { + ControlsViewModel.shared.audioRoutesSelected.value = false fullScreenMode.value = fullScreenMode.value != true } diff --git a/Classes/Swift/Voip/Views/CompositeViewControllers/ConferenceCallView.swift b/Classes/Swift/Voip/Views/CompositeViewControllers/ConferenceCallView.swift index 56fc9b9f6..a5c2ddb1f 100644 --- a/Classes/Swift/Voip/Views/CompositeViewControllers/ConferenceCallView.swift +++ b/Classes/Swift/Voip/Views/CompositeViewControllers/ConferenceCallView.swift @@ -127,6 +127,11 @@ import linphonesw VoipDialog.toast(message: VoipTexts.conference_first_to_join) } } + + view.onClick { + ControlsViewModel.shared.audioRoutesSelected.value = false + } + } func displaySelectedConferenceLayout() { diff --git a/Classes/Swift/Voip/Views/CompositeViewControllers/SingleCallView.swift b/Classes/Swift/Voip/Views/CompositeViewControllers/SingleCallView.swift index f525012b7..6d902dd2d 100644 --- a/Classes/Swift/Voip/Views/CompositeViewControllers/SingleCallView.swift +++ b/Classes/Swift/Voip/Views/CompositeViewControllers/SingleCallView.swift @@ -92,6 +92,9 @@ import linphonesw } } } + view.onClick { + ControlsViewModel.shared.audioRoutesSelected.value = false + } }