Proximity meter fixes

There was the issue when Proximity meter is kept on after having audio/video call. The problem was that `isProximityMonitoringEnabled` was not toggled back. The Proximity meter blocks user interactions and turns screen brightness off/on itself. So some redundant part of ProximityManager class was removed. MOB-2771
salemove · Oct 26, 2023 · 77298bb · 77298bb
1 parent 1945b78
commit 77298bb
Show file tree

Hide file tree

Showing 46 changed files with 214 additions and 163 deletions.
diff --git a/GliaWidgets.xcodeproj/project.pbxproj b/GliaWidgets.xcodeproj/project.pbxproj
@@ -349,6 +349,8 @@
 		845E2F98283FC9A900C04D56 /* Theme.Survey.OptionButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 845E2F97283FC9A900C04D56 /* Theme.Survey.OptionButton.swift */; };
 		845E2F9B283FCA9000C04D56 /* Theme.Survey.Checkbox.swift in Sources */ = {isa = PBXBuildFile; fileRef = 845E2F9A283FCA9000C04D56 /* Theme.Survey.Checkbox.swift */; };
 		845E2F9D283FCB1400C04D56 /* Theme.Survey.Checkbox.Accessibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 845E2F9C283FCB1400C04D56 /* Theme.Survey.Checkbox.Accessibility.swift */; };
+		84602A742AE94DE50031E606 /* ProximityManager.Mock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84602A732AE94DE50031E606 /* ProximityManager.Mock.swift */; };
+		84602A772AEA5BEA0031E606 /* ProximityManager.Failing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84602A762AEA5BEA0031E606 /* ProximityManager.Failing.swift */; };
 		8464297A2A44937600943BD6 /* AlertViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 846429792A44937600943BD6 /* AlertViewControllerTests.swift */; };
 		8464297D2A459E7D00943BD6 /* UIViewController+Replaceble.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8464297C2A459E7D00943BD6 /* UIViewController+Replaceble.swift */; };
 		846429802A45A1F200943BD6 /* OfferPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8464297F2A45A1F200943BD6 /* OfferPresenter.swift */; };
@@ -1089,6 +1091,8 @@
 		845E2F97283FC9A900C04D56 /* Theme.Survey.OptionButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Theme.Survey.OptionButton.swift; sourceTree = "<group>"; };
 		845E2F9A283FCA9000C04D56 /* Theme.Survey.Checkbox.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Theme.Survey.Checkbox.swift; sourceTree = "<group>"; };
 		845E2F9C283FCB1400C04D56 /* Theme.Survey.Checkbox.Accessibility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Theme.Survey.Checkbox.Accessibility.swift; sourceTree = "<group>"; };
+		84602A732AE94DE50031E606 /* ProximityManager.Mock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProximityManager.Mock.swift; sourceTree = "<group>"; };
+		84602A762AEA5BEA0031E606 /* ProximityManager.Failing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProximityManager.Failing.swift; sourceTree = "<group>"; };
 		846429792A44937600943BD6 /* AlertViewControllerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertViewControllerTests.swift; sourceTree = "<group>"; };
 		8464297C2A459E7D00943BD6 /* UIViewController+Replaceble.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Replaceble.swift"; sourceTree = "<group>"; };
 		8464297F2A45A1F200943BD6 /* OfferPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OfferPresenter.swift; sourceTree = "<group>"; };
@@ -2670,6 +2674,7 @@
 		7512A57827BF9FB800319DF1 /* Sources */ = {
 			isa = PBXGroup;
 			children = (
+				84602A752AEA5BDE0031E606 /* ProximityManager */,
 				84681A932A61840700DD7406 /* ChatViewModel */,
 				846429812A45DA5900943BD6 /* AlertViewController */,
 				846A5C4329F6BEB60049B29F /* Glia */,
@@ -3117,6 +3122,14 @@
 			path = URLScheme;
 			sourceTree = "<group>";
 		};
+		84602A752AEA5BDE0031E606 /* ProximityManager */ = {
+			isa = PBXGroup;
+			children = (
+				84602A762AEA5BEA0031E606 /* ProximityManager.Failing.swift */,
+			);
+			path = ProximityManager;
+			sourceTree = "<group>";
+		};
 		8464297B2A459E3500943BD6 /* Replaceble */ = {
 			isa = PBXGroup;
 			children = (
@@ -3524,6 +3537,7 @@
 			isa = PBXGroup;
 			children = (
 				C05E3EDD29C99E070013BC81 /* ProximityManager.swift */,
+				84602A732AE94DE50031E606 /* ProximityManager.Mock.swift */,
 			);
 			path = ProximityManager;
 			sourceTree = "<group>";
@@ -4631,6 +4645,7 @@
 				755D187129A6A6400009F5E8 /* WelcomeStyle+MessageTextViewNormalStyle.swift in Sources */,
 				845A28FC28AFF092008558EA /* URLScheme.swift in Sources */,
 				75F58EE127E7D5300065BA2D /* Survey.ViewController.Props.swift in Sources */,
+				84602A742AE94DE50031E606 /* ProximityManager.Mock.swift in Sources */,
 				754CC61527E27C42005676E9 /* Survey.Checkbox.swift in Sources */,
 				84681AA72A681EF900DD7406 /* QuickReplyButtonStyle.swift in Sources */,
 				1A4AD3CA256E864800468BFB /* ThemeColorStyle.swift in Sources */,
@@ -4857,6 +4872,7 @@
 				8491AF502A9CBB0400CC3E72 /* TranscriptModelTests+GVA.swift in Sources */,
 				C03A8049292BC8DB00DDECA6 /* CallViewControllerTests.swift in Sources */,
 				84D5B9662A15204400807F92 /* QuickLookBased.Failing.swift in Sources */,
+				84602A772AEA5BEA0031E606 /* ProximityManager.Failing.swift in Sources */,
 				84681A982A61853300DD7406 /* GvaOption.Mock.swift in Sources */,
 				AF6AB34B2989517100003645 /* FileUploader.Failing.swift in Sources */,
 				EB03B00E27FFF6DD0058F6B1 /* CallViewTests.swift in Sources */,

diff --git a/GliaWidgets/Public/Glia/Glia+StartEngagement.swift b/GliaWidgets/Public/Glia/Glia+StartEngagement.swift
@@ -137,7 +137,6 @@ extension Glia {
                 submitSurveyAnswer: environment.coreSdk.submitSurveyAnswer,
                 uiApplication: environment.uiApplication,
                 uiScreen: environment.uiScreen,
-                uiDevice: environment.uiDevice,
                 notificationCenter: environment.notificationCenter,
                 fetchChatHistory: environment.coreSdk.fetchChatHistory,
                 listQueues: environment.coreSdk.listQueues,
@@ -161,7 +160,8 @@ extension Glia {
                 stopSocketObservation: environment.coreSdk.stopSocketObservation,
                 pushNotifications: environment.coreSdk.pushNotifications,
                 createSendMessagePayload: environment.coreSdk.createSendMessagePayload,
-                orientationManager: environment.orientationManager
+                orientationManager: environment.orientationManager,
+                proximityManager: environment.proximityManager
             )
         )
         rootCoordinator?.delegate = { [weak self] event in

diff --git a/GliaWidgets/Public/Glia/Glia.swift b/GliaWidgets/Public/Glia/Glia.swift
@@ -84,7 +84,8 @@ public class Glia {
             assetsBuilder: { [weak self] in self?.assetsBuilder ?? .standard },
             getCurrentEngagement: environment.coreSdk.getCurrentEngagement,
             eventHandler: onEvent,
-            orientationManager: environment.orientationManager
+            orientationManager: environment.orientationManager,
+            proximityManager: environment.proximityManager
         )
     )
     var rootCoordinator: EngagementCoordinator?

diff --git a/GliaWidgets/SecureConversations/SecureConversations.Coordinator.swift b/GliaWidgets/SecureConversations/SecureConversations.Coordinator.swift
@@ -281,7 +281,8 @@ extension SecureConversations.Coordinator {
                 interactor: environment.interactor,
                 startSocketObservation: environment.startSocketObservation,
                 stopSocketObservation: environment.stopSocketObservation,
-                createSendMessagePayload: environment.createSendMessagePayload
+                createSendMessagePayload: environment.createSendMessagePayload,
+                proximityManager: environment.proximityManager
             ),
             startWithSecureTranscriptFlow: true
         )
@@ -321,7 +322,6 @@ extension SecureConversations.Coordinator {
         var uuid: () -> UUID
         var uiApplication: UIKitBased.UIApplication
         var uiScreen: UIKitBased.UIScreen
-        var uiDevice: UIKitBased.UIDevice
         var notificationCenter: FoundationBased.NotificationCenter
         var createFileUploadListModel: SecureConversations.FileUploadListViewModel.Create
         var viewFactory: ViewFactory
@@ -348,6 +348,7 @@ extension SecureConversations.Coordinator {
         var stopSocketObservation: CoreSdkClient.StopSocketObservation
         var createSendMessagePayload: CoreSdkClient.CreateSendMessagePayload
         var orientationManager: OrientationManager
+        var proximityManager: ProximityManager
     }
 
     enum DelegateEvent {

diff --git a/GliaWidgets/Sources/CallVisualizer/CallVisualizer+Environment.swift b/GliaWidgets/Sources/CallVisualizer/CallVisualizer+Environment.swift
@@ -24,5 +24,6 @@ extension CallVisualizer {
         var getCurrentEngagement: CoreSdkClient.GetCurrentEngagement
         var eventHandler: ((GliaEvent) -> Void)?
         var orientationManager: OrientationManager
+        var proximityManager: ProximityManager
     }
 }
diff --git a/GliaWidgets/Sources/CallVisualizer/CallVisualizer.swift b/GliaWidgets/Sources/CallVisualizer/CallVisualizer.swift
@@ -59,7 +59,8 @@ public final class CallVisualizer {
                         self?.environment.eventHandler?(.maximized)
                     }
                 },
-                orientationManager: environment.orientationManager
+                orientationManager: environment.orientationManager,
+                proximityManager: environment.proximityManager
             )
         )
     }()

diff --git a/GliaWidgets/Sources/CallVisualizer/Coordinator/CallVisualizer.Coordinator.Environment.swift b/GliaWidgets/Sources/CallVisualizer/Coordinator/CallVisualizer.Coordinator.Environment.swift
@@ -21,5 +21,6 @@ extension CallVisualizer.Coordinator {
         var engagedOperator: () -> CoreSdkClient.Operator?
         var eventHandler: (DelegateEvent) -> Void
         var orientationManager: OrientationManager
+        var proximityManager: ProximityManager
     }
 }
diff --git a/GliaWidgets/Sources/CallVisualizer/Coordinator/CallVisualizer.Coordinator.swift b/GliaWidgets/Sources/CallVisualizer/Coordinator/CallVisualizer.Coordinator.swift
@@ -214,7 +214,8 @@ extension CallVisualizer {
                     notificationCenter: environment.notificationCenter,
                     date: environment.date,
                     engagedOperator: environment.engagedOperator,
-                    screenShareHandler: environment.screenShareHandler
+                    screenShareHandler: environment.screenShareHandler,
+                    proximityManager: environment.proximityManager
                 ),
                 theme: environment.viewFactory.theme,
                 call: .init(

diff --git a/...dgets/Sources/CallVisualizer/VideoCall/Coordinator/VideoCallCoordinator.Environment.swift b/...dgets/Sources/CallVisualizer/VideoCall/Coordinator/VideoCallCoordinator.Environment.swift
@@ -14,5 +14,6 @@ extension CallVisualizer.VideoCallCoordinator {
         var date: () -> Date
         var engagedOperator: () -> CoreSdkClient.Operator?
         var screenShareHandler: ScreenShareHandler
+        var proximityManager: ProximityManager
     }
 }
diff --git a/GliaWidgets/Sources/CallVisualizer/VideoCall/Coordinator/VideoCallCoordinator.swift b/GliaWidgets/Sources/CallVisualizer/VideoCall/Coordinator/VideoCallCoordinator.swift
@@ -44,7 +44,8 @@ extension CallVisualizer {
                     notificationCenter: environment.notificationCenter,
                     date: environment.date,
                     engagedOperator: environment.engagedOperator,
-                    screenShareHandler: environment.screenShareHandler
+                    screenShareHandler: environment.screenShareHandler,
+                    proximityManager: environment.proximityManager
                 ),
                 call: call
             )
@@ -57,9 +58,6 @@ extension CallVisualizer {
                         gcd: environment.gcd,
                         uiScreen: environment.uiScreen
                     ),
-                    uiApplication: environment.uiApplication,
-                    uiScreen: environment.uiScreen,
-                    uiDevice: environment.uiDevice,
                     notificationCenter: environment.notificationCenter
                 )
             )

diff --git a/GliaWidgets/Sources/CallVisualizer/VideoCall/ViewController/VideoCallViewController.swift b/GliaWidgets/Sources/CallVisualizer/VideoCall/ViewController/VideoCallViewController.swift
@@ -4,7 +4,6 @@ extension CallVisualizer {
     final class VideoCallViewController: UIViewController {
         private let videoCallView: VideoCallView
         private let environment: Environment
-        private var proximityManager: ProximityManager?
 
         var props: Props {
             didSet {
@@ -24,10 +23,6 @@ extension CallVisualizer {
             super.init(nibName: nil, bundle: nil)
         }
 
-        deinit {
-            proximityManager?.stop()
-        }
-
         // MARK: - Required
 
         required init?(coder: NSCoder) {
@@ -42,16 +37,7 @@ extension CallVisualizer {
 
         override func viewDidLoad() {
             super.viewDidLoad()
-            proximityManager = .init(
-                view: self.view,
-                environment: .init(
-                    uiApplication: environment.uiApplication,
-                    uiDevice: environment.uiDevice,
-                    uiScreen: environment.uiScreen,
-                    notificationCenter: environment.notificationCenter
-                )
-            )
-            proximityManager?.start()
+            props.viewDidLoad()
         }
     }
 }
@@ -61,6 +47,7 @@ extension CallVisualizer {
 extension CallVisualizer.VideoCallViewController {
     struct Props: Equatable {
         let videoCallViewProps: CallVisualizer.VideoCallView.Props
+        let viewDidLoad: Cmd
     }
 }
 
@@ -69,9 +56,6 @@ extension CallVisualizer.VideoCallViewController {
 extension CallVisualizer.VideoCallViewController {
     struct Environment {
         var videoCallView: CallVisualizer.VideoCallView.Environment
-        var uiApplication: UIKitBased.UIApplication
-        var uiScreen: UIKitBased.UIScreen
-        var uiDevice: UIKitBased.UIDevice
         var notificationCenter: FoundationBased.NotificationCenter
     }
 }

diff --git a/GliaWidgets/Sources/CallVisualizer/VideoCall/ViewModel/VideoCallViewModel.Environment.swift b/GliaWidgets/Sources/CallVisualizer/VideoCall/ViewModel/VideoCallViewModel.Environment.swift
@@ -12,5 +12,6 @@ extension CallVisualizer.VideoCallViewModel {
         var date: () -> Date
         var engagedOperator: () -> CoreSdkClient.Operator?
         var screenShareHandler: ScreenShareHandler
+        var proximityManager: ProximityManager
     }
 }
diff --git a/GliaWidgets/Sources/CallVisualizer/VideoCall/ViewModel/VideoCallViewModel.swift b/GliaWidgets/Sources/CallVisualizer/VideoCall/ViewModel/VideoCallViewModel.swift
@@ -130,6 +130,10 @@ extension CallVisualizer {
                 object: nil
             )
         }
+
+        deinit {
+            environment.proximityManager.stop()
+        }
     }
 }
 
@@ -180,7 +184,10 @@ extension CallVisualizer.VideoCallViewModel {
                     ),
                     style: style.header
                 )
-            )
+            ),
+            viewDidLoad: .init { [weak self] in
+                self?.environment.proximityManager.start()
+            }
         )
     }
 

diff --git a/GliaWidgets/Sources/Coordinators/Call/CallCoordinator.swift b/GliaWidgets/Sources/Coordinators/Call/CallCoordinator.swift
@@ -81,7 +81,8 @@ private extension CallCoordinator {
                 fetchChatHistory: environment.fetchChatHistory,
                 fileUploadListStyle: viewFactory.theme.chatStyle.messageEntry.uploadList,
                 createFileUploadListModel: environment.createFileUploadListModel,
-                createSendMessagePayload: environment.createSendMessagePayload
+                createSendMessagePayload: environment.createSendMessagePayload,
+                proximityManager: environment.proximityManager
             ),
             call: call,
             unreadMessages: unreadMessages,
@@ -97,9 +98,6 @@ private extension CallCoordinator {
             viewModel: viewModel,
             viewFactory: viewFactory,
             environment: .init(
-                uiApplication: environment.uiApplication,
-                uiScreen: environment.uiScreen,
-                uiDevice: environment.uiDevice,
                 notificationCenter: environment.notificationCenter
             )
         )
@@ -147,10 +145,10 @@ extension CallCoordinator {
         var uuid: () -> UUID
         var uiApplication: UIKitBased.UIApplication
         var uiScreen: UIKitBased.UIScreen
-        var uiDevice: UIKitBased.UIDevice
         var notificationCenter: FoundationBased.NotificationCenter
         var fetchChatHistory: CoreSdkClient.FetchChatHistory
         var createFileUploadListModel: SecureConversations.FileUploadListViewModel.Create
         var createSendMessagePayload: CoreSdkClient.CreateSendMessagePayload
+        var proximityManager: ProximityManager
     }
 }
diff --git a/GliaWidgets/Sources/Coordinators/Chat/ChatCoordinator.Environment.swift b/GliaWidgets/Sources/Coordinators/Chat/ChatCoordinator.Environment.swift
@@ -32,5 +32,6 @@ extension ChatCoordinator {
         var startSocketObservation: CoreSdkClient.StartSocketObservation
         var stopSocketObservation: CoreSdkClient.StopSocketObservation
         var createSendMessagePayload: CoreSdkClient.CreateSendMessagePayload
+        var proximityManager: ProximityManager
     }
 }
diff --git a/GliaWidgets/Sources/Coordinators/Chat/ChatCoordinator.swift b/GliaWidgets/Sources/Coordinators/Chat/ChatCoordinator.swift
@@ -220,7 +220,8 @@ extension ChatCoordinator {
             fetchChatHistory: environment.fetchChatHistory,
             fileUploadListStyle: viewFactory.theme.chatStyle.messageEntry.uploadList,
             createFileUploadListModel: environment.createFileUploadListModel,
-            createSendMessagePayload: environment.createSendMessagePayload
+            createSendMessagePayload: environment.createSendMessagePayload,
+            proximityManager: environment.proximityManager
         )
     }
 }

diff --git a/...s/Sources/Coordinators/EngagementCoordinator/EngagementCoordinator.Environment.Mock.swift b/...s/Sources/Coordinators/EngagementCoordinator/EngagementCoordinator.Environment.Mock.swift
@@ -18,7 +18,6 @@ extension EngagementCoordinator.Environment {
         submitSurveyAnswer: { _, _, _, _ in },
         uiApplication: .mock,
         uiScreen: .mock,
-        uiDevice: .mock,
         notificationCenter: .mock,
         fetchChatHistory: { _ in },
         listQueues: { _ in },
@@ -35,7 +34,8 @@ extension EngagementCoordinator.Environment {
         stopSocketObservation: {},
         pushNotifications: .mock,
         createSendMessagePayload: { _, _ in .mock() },
-        orientationManager: .mock()
+        orientationManager: .mock(),
+        proximityManager: .mock
     )
 }
 #endif
diff --git a/...idgets/Sources/Coordinators/EngagementCoordinator/EngagementCoordinator.Environment.swift b/...idgets/Sources/Coordinators/EngagementCoordinator/EngagementCoordinator.Environment.swift
@@ -19,7 +19,6 @@ extension EngagementCoordinator {
         var submitSurveyAnswer: CoreSdkClient.SubmitSurveyAnswer
         var uiApplication: UIKitBased.UIApplication
         var uiScreen: UIKitBased.UIScreen
-        var uiDevice: UIKitBased.UIDevice
         var notificationCenter: FoundationBased.NotificationCenter
         var fetchChatHistory: CoreSdkClient.FetchChatHistory
         var listQueues: CoreSdkClient.ListQueues
@@ -37,5 +36,6 @@ extension EngagementCoordinator {
         var pushNotifications: CoreSdkClient.PushNotifications
         var createSendMessagePayload: CoreSdkClient.CreateSendMessagePayload
         var orientationManager: OrientationManager
+        var proximityManager: ProximityManager
     }
 }
diff --git a/GliaWidgets/Sources/Coordinators/EngagementCoordinator/EngagementCoordinator.swift b/GliaWidgets/Sources/Coordinators/EngagementCoordinator/EngagementCoordinator.swift
@@ -255,7 +255,8 @@ extension EngagementCoordinator {
                 interactor: interactor,
                 startSocketObservation: environment.startSocketObservation,
                 stopSocketObservation: environment.stopSocketObservation,
-                createSendMessagePayload: environment.createSendMessagePayload
+                createSendMessagePayload: environment.createSendMessagePayload,
+                proximityManager: environment.proximityManager
             ),
             startWithSecureTranscriptFlow: false
         )
@@ -343,11 +344,11 @@ extension EngagementCoordinator {
                 uuid: environment.uuid,
                 uiApplication: environment.uiApplication,
                 uiScreen: environment.uiScreen,
-                uiDevice: environment.uiDevice,
                 notificationCenter: environment.notificationCenter,
                 fetchChatHistory: environment.fetchChatHistory,
                 createFileUploadListModel: environment.createFileUploadListModel,
-                createSendMessagePayload: environment.createSendMessagePayload
+                createSendMessagePayload: environment.createSendMessagePayload,
+                proximityManager: environment.proximityManager
             )
         )
         coordinator.delegate = { [weak self] event in
@@ -453,7 +454,6 @@ extension EngagementCoordinator {
                 uuid: environment.uuid,
                 uiApplication: environment.uiApplication,
                 uiScreen: environment.uiScreen,
-                uiDevice: environment.uiDevice,
                 notificationCenter: environment.notificationCenter,
                 createFileUploadListModel: environment.createFileUploadListModel,
                 viewFactory: viewFactory,
@@ -479,7 +479,8 @@ extension EngagementCoordinator {
                 startSocketObservation: environment.startSocketObservation,
                 stopSocketObservation: environment.stopSocketObservation,
                 createSendMessagePayload: environment.createSendMessagePayload,
-                orientationManager: environment.orientationManager
+                orientationManager: environment.orientationManager,
+                proximityManager: environment.proximityManager
             )
         )
 

diff --git a/GliaWidgets/Sources/GliaEnvironment/Glia.Environment.Interface.swift b/GliaWidgets/Sources/GliaEnvironment/Glia.Environment.Interface.swift
@@ -46,6 +46,7 @@ extension Glia {
         var messagesWithUnreadCountLoaderScheduler: CoreSdkClient.ReactiveSwift.DateScheduler
         var orientationManager: OrientationManager
         var coreSDKConfigurator: CoreSDKConfigurator
+        var proximityManager: ProximityManager
     }
 }