Replace the ServiceLocator with direct dependency injection (#5548)

Removes the ServiceLocator singleton and instead directly injects the dependencies it was holding for more control over instantiation of the various component subtrees and better visibility over how they're being used.
2026-11-02 12:07:55 +00:00 · 2026-05-14 01:45:49 -05:00
parent f70182d09a
commit ff5dcb040d
108 changed files with 971 additions and 729 deletions
@@ -388,13 +388,16 @@ extension LocationSharingScreenViewModel {
        let liveLocationServiceMock = RoomLiveLocationServiceMock(.init(shares: liveLocationShares))
        let roomProxy = JoinedRoomProxyMock(.init(members: .allMembers, ownUserID: RoomMemberProxyMock.mockMe.userID))
        roomProxy.makeLiveLocationServiceReturnValue = liveLocationServiceMock
-        
+
+        let appSettings = AppSettings()
+        let analytics = AnalyticsService.mock(settings: appSettings)
+
        return LocationSharingScreenViewModel(interactionMode: interactionMode,
-                                              mapURLBuilder: ServiceLocator.shared.settings.mapTilerConfiguration,
+                                              mapURLBuilder: appSettings.mapTilerConfiguration,
                                              roomProxy: roomProxy,
                                              timelineController: MockTimelineController(),
                                              liveLocationManager: LiveLocationManagerMock(),
-                                              analytics: ServiceLocator.shared.analytics,
+                                              analytics: analytics,
                                              userIndicatorController: UserIndicatorControllerMock(),
                                              mediaProvider: MediaProviderMock(configuration: .init()))
    }