Create interface for resuming call visualizer

Up until now Call Visualizer screen sharing or video call screen could only be opened through bubble tap. Entry Widget requires to open Call Visualizer by a tap on call visualizer media type, if CV session is ongoing. This PR allows to do just that, by providing an interface to resume the view. MOB-3887
salemove · Dec 18, 2024 · 3b18dad · 3b18dad
1 parent e2ee5e6
commit 3b18dad
Show file tree

Hide file tree

Showing 7 changed files with 82 additions and 34 deletions.
diff --git a/GliaWidgets/Public/Glia/Glia+EntryWidget.swift b/GliaWidgets/Public/Glia/Glia+EntryWidget.swift
@@ -31,6 +31,10 @@ extension Glia {
                 currentInteractor: { [weak self] in
                     guard let self else { return nil }
                     return interactor
+                },
+                onCallVisualizerResume: { [weak self] in
+                    guard let self else { return }
+                    callVisualizer.resume()
                 }
             )
         )

diff --git a/GliaWidgets/Sources/CallVisualizer/CallVisualizer.swift b/GliaWidgets/Sources/CallVisualizer/CallVisualizer.swift
@@ -83,6 +83,10 @@ public final class CallVisualizer {
             by: .embedded(container, onEngagementAccepted: onEngagementAccepted)
         )
     }
+
+    public func resume() {
+        coordinator.resume()
+    }
 }
 
 // MARK: - Internal

diff --git a/GliaWidgets/Sources/CallVisualizer/Coordinator/CallVisualizer.Coordinator.swift b/GliaWidgets/Sources/CallVisualizer/Coordinator/CallVisualizer.Coordinator.swift
@@ -10,19 +10,22 @@ extension CallVisualizer {
             self.bubbleView = environment.viewFactory.makeBubbleView()
 
             bubbleView.tap = { [weak self] in
-                guard let self = self else { return }
-                if self.videoCallCoordinator == nil {
-                    self.showEndScreenSharingViewController()
-                } else {
-                    self.resumeVideoCallViewController()
-                }
-                environment.eventHandler(.maximized)
+                self?.resume()
             }
             bubbleView.pan = { [weak self] translation in
                 self?.updateBubblePosition(translation: translation)
             }
         }
 
+        func resume() {
+            if self.videoCallCoordinator == nil {
+                self.showEndScreenSharingViewController()
+            } else {
+                self.resumeVideoCallViewController()
+            }
+            environment.eventHandler(.maximized)
+        }
+
         func showVisitorCodeViewController(by presentation: Presentation) {
             let coordinator = VisitorCodeCoordinator(
                 theme: environment.viewFactory.theme,

diff --git a/GliaWidgets/Sources/EntryWidget/EntryWidget.Environment.swift b/GliaWidgets/Sources/EntryWidget/EntryWidget.Environment.swift
@@ -11,6 +11,7 @@ extension EntryWidget {
         var isAuthenticated: () -> Bool
         var hasPendingInteraction: () -> Bool
         var currentInteractor: () -> Interactor?
+        var onCallVisualizerResume: () -> Void
     }
 }
 
@@ -27,7 +28,8 @@ extension EntryWidget.Environment {
             log: .mock,
             isAuthenticated: { true },
             hasPendingInteraction: { false },
-            currentInteractor: { .mock() }
+            currentInteractor: { .mock() },
+            onCallVisualizerResume: {}
         )
     }
 }

diff --git a/GliaWidgets/Sources/EntryWidget/EntryWidget.swift b/GliaWidgets/Sources/EntryWidget/EntryWidget.swift
@@ -114,6 +114,31 @@ extension EntryWidget {
 
         return appliedHeight
     }
+
+    func mediaTypeSelected(_ mediaTypeItem: MediaTypeItem) {
+        if let configurationAction = configuration.mediaTypeSelected {
+            configurationAction(mediaTypeItem)
+            return
+        }
+        hideViewIfNecessary {
+            do {
+                switch mediaTypeItem.type {
+                case .chat:
+                    try self.environment.engagementLauncher.startChat()
+                case .audio:
+                    try self.environment.engagementLauncher.startAudioCall()
+                case .video:
+                    try self.environment.engagementLauncher.startVideoCall()
+                case .secureMessaging:
+                    try self.environment.engagementLauncher.startSecureMessaging()
+                case .callVisualizer:
+                    self.environment.onCallVisualizerResume()
+                }
+            } catch {
+                self.viewState = .error
+            }
+        }
+    }
 }
 
 // MARK: - Private methods
@@ -189,31 +214,6 @@ private extension EntryWidget {
         return Array(availableMediaTypes).sorted(by: { $0.rawValue < $1.rawValue })
     }
 
-    func mediaTypeSelected(_ mediaTypeItem: MediaTypeItem) {
-        if let configurationAction = configuration.mediaTypeSelected {
-            configurationAction(mediaTypeItem)
-            return
-        }
-        hideViewIfNecessary {
-            do {
-                switch mediaTypeItem.type {
-                case .chat:
-                    try self.environment.engagementLauncher.startChat()
-                case .audio:
-                    try self.environment.engagementLauncher.startAudioCall()
-                case .video:
-                    try self.environment.engagementLauncher.startVideoCall()
-                case .secureMessaging:
-                    try self.environment.engagementLauncher.startSecureMessaging()
-                case .callVisualizer:
-                    break
-                }
-            } catch {
-                self.viewState = .error
-            }
-        }
-    }
-
     func hideViewIfNecessary(completion: @escaping () -> Void) {
         guard hostedViewController != nil else {
             completion()

diff --git a/GliaWidgetsTests/Sources/EntryWidget/EntryWidgetTests.swift b/GliaWidgetsTests/Sources/EntryWidget/EntryWidgetTests.swift
@@ -351,4 +351,39 @@ class EntryWidgetTests: XCTestCase {
 
         XCTAssertEqual(entryWidget.viewState, .ongoingEngagement(.callVisualizer))
     }
+
+    func test_callVisualizerResumeCallbackBeingCalled() {
+        enum Call {
+            case onCallVisualizerResume
+        }
+        var calls: [Call] = []
+        let mockQueueId = "mockQueueId"
+        let mockQueue = Queue.mock(id: mockQueueId, media: [.messaging, .audio])
+
+        var queueMonitorEnvironment: QueuesMonitor.Environment = .mock
+        queueMonitorEnvironment.listQueues = { completion in
+            completion([mockQueue], nil)
+        }
+        queueMonitorEnvironment.subscribeForQueuesUpdates = { _, completion in
+            completion(.success(mockQueue))
+            return UUID.mock.uuidString
+        }
+        var environment = EntryWidget.Environment.mock()
+        environment.queuesMonitor = QueuesMonitor(environment: queueMonitorEnvironment)
+        let interactor: Interactor = .mock()
+        interactor.currentEngagement = .mock(source: .callVisualizer)
+        environment.currentInteractor = { interactor }
+        environment.onCallVisualizerResume = {
+            calls.append(.onCallVisualizerResume)
+        }
+        let entryWidget = EntryWidget(
+            queueIds: [mockQueueId],
+            configuration: .default,
+            environment: environment
+        )
+
+        entryWidget.mediaTypeSelected(.init(type: .callVisualizer))
+
+        XCTAssertEqual(calls, [.onCallVisualizerResume])
+    }
 }
diff --git a/Podfile b/Podfile
@@ -18,7 +18,7 @@ target 'TestingApp' do
 end
 
 target 'GliaWidgets' do
-  pod 'GliaCoreSDK', '1.5.8'
+  pod 'GliaCoreSDK', '2.0.4'
   swiftlint
 end