Revert back to UIKit for the presentation of the timeline media preview. (#3719)

* Revert back to UIKit for the presentation of the timeline media preview. * Fix a presentation issue where the media is clipped until the animation finishes. * Workaround for the preview controller replacing the info button when swiping. * Use a self-sizing detent on the media info sheet.
2026-11-03 16:10:20 +00:00 · 2025-01-31 17:28:14 +00:00
parent ef340fb70f
commit 6cd583d904
25 changed files with 695 additions and 583 deletions
@@ -51,7 +51,7 @@ class TimelineMediaPreviewViewModelTests: XCTestCase {
        
        // When the preview controller sets an item that fails to load.
        mediaProvider.loadFileFromSourceFilenameClosure = { _, _ in .failure(.failedRetrievingFile) }
-        let failure = deferFailure(viewModel.state.fileLoadedPublisher, timeout: 1) { _ in true }
+        let failure = deferFailure(viewModel.state.previewControllerDriver, timeout: 1) { $0.isItemLoaded }
        context.send(viewAction: .updateCurrentItem(.media(context.viewState.dataSource.previewItems[0])))
        try await failure.fulfill()
        
@@ -66,7 +66,7 @@ class TimelineMediaPreviewViewModelTests: XCTestCase {
        try await testLoadingItem()
        
        // When swiping to another item.
-        let deferred = deferFulfillment(viewModel.state.fileLoadedPublisher) { _ in true }
+        let deferred = deferFulfillment(viewModel.state.previewControllerDriver) { $0.isItemLoaded }
        context.send(viewAction: .updateCurrentItem(.media(context.viewState.dataSource.previewItems[1])))
        try await deferred.fulfill()
        
@@ -75,7 +75,7 @@ class TimelineMediaPreviewViewModelTests: XCTestCase {
        XCTAssertEqual(context.viewState.currentItem, .media(context.viewState.dataSource.previewItems[1]))
        
        // When swiping back to the first item.
-        let failure = deferFailure(viewModel.state.fileLoadedPublisher, timeout: 1) { _ in true }
+        let failure = deferFailure(viewModel.state.previewControllerDriver, timeout: 1) { $0.isItemLoaded }
        context.send(viewAction: .updateCurrentItem(.media(context.viewState.dataSource.previewItems[0])))
        try await failure.fulfill()
        
@@ -89,9 +89,9 @@ class TimelineMediaPreviewViewModelTests: XCTestCase {
        try await testLoadingItem()
        
        // When swiping to a "loading more" item.
-        let deferred = deferFailure(viewModel.state.fileLoadedPublisher, timeout: 1) { _ in true }
+        let failure = deferFailure(viewModel.state.previewControllerDriver, timeout: 1) { $0.isItemLoaded }
        context.send(viewAction: .updateCurrentItem(.loading(.paginating)))
-        try await deferred.fulfill()
+        try await failure.fulfill()
        
        // Then there should no longer be a media preview and no attempt should be made to load one.
        XCTAssertEqual(mediaProvider.loadFileFromSourceFilenameCallsCount, 1)
@@ -111,7 +111,7 @@ class TimelineMediaPreviewViewModelTests: XCTestCase {
        
        // And the preview controller attempts to update the current item (now at a new index in the array but it hasn't changed in the data source).
        mediaProvider.loadFileFromSourceFilenameClosure = { _, _ in .failure(.failedRetrievingFile) }
-        let failure = deferFailure(viewModel.state.fileLoadedPublisher, timeout: 1) { _ in true }
+        let failure = deferFailure(viewModel.state.previewControllerDriver, timeout: 1) { $0.isItemLoaded }
        context.send(viewAction: .updateCurrentItem(.media(context.viewState.dataSource.previewItems[3])))
        try await failure.fulfill()
        
@@ -148,25 +148,27 @@ class TimelineMediaPreviewViewModelTests: XCTestCase {
        }
        
        // When choosing to show the item details.
+        let deferredDriver = deferFulfillment(context.viewState.previewControllerDriver) { $0.isShowItemDetails }
        context.send(viewAction: .showItemDetails(mediaItem))
        
        // Then the details sheet should be presented.
-        guard let mediaDetailsItem = context.mediaDetailsItem else {
-            XCTFail("The default of the current item should be presented")
+        let action = try await deferredDriver.fulfill()
+        guard case let .showItemDetails(mediaDetailsItem) = action else {
+            XCTFail("The action should include the media item.")
            return
        }
        XCTAssertEqual(.media(mediaDetailsItem), context.viewState.currentItem)
        
        // When choosing to redact the item.
-        context.send(viewAction: .menuAction(.redact, item: mediaDetailsItem))
+        context.send(viewAction: .menuAction(.redact, item: mediaItem))
        
        // Then the confirmation sheet should be presented.
-        XCTAssertEqual(context.redactConfirmationItem, mediaDetailsItem)
+        XCTAssertEqual(context.redactConfirmationItem, mediaItem)
        XCTAssertFalse(timelineController.redactCalled)
        
        // When confirming the redaction.
        let deferred = deferFulfillment(viewModel.actions) { $0 == .dismiss }
-        context.send(viewAction: .redactConfirmation(item: mediaDetailsItem))
+        context.send(viewAction: .redactConfirmation(item: mediaItem))
        
        // Then the item should be redacted and the view should be dismissed.
        try await deferred.fulfill()
@@ -203,13 +205,12 @@ class TimelineMediaPreviewViewModelTests: XCTestCase {
        XCTAssertEqual(mediaItem.contentType, "JPEG image")
        
        // When choosing to save the image.
-        let deferred = deferFulfillment(context.$viewState) { $0.bindings.alertInfo != nil }
+        let deferred = deferFulfillment(context.viewState.previewControllerDriver) { $0.isAuthorizationRequired }
        context.send(viewAction: .menuAction(.save, item: mediaItem))
-        try await deferred.fulfill()
        
        // Then the user should be prompted to allow access.
+        try await deferred.fulfill()
        XCTAssertTrue(photoLibraryManager.addResourceAtCalled)
-        XCTAssertEqual(context.alertInfo?.id, .authorizationRequired)
    }
    
    func testSaveVideo() async throws {
@@ -243,31 +244,24 @@ class TimelineMediaPreviewViewModelTests: XCTestCase {
        XCTAssertEqual(mediaItem.contentType, "PDF document")
        
        // When choosing to save the file.
+        let deferred = deferFulfillment(context.viewState.previewControllerDriver) { $0.isExportFile }
        context.send(viewAction: .menuAction(.save, item: mediaItem))
-        try await Task.sleep(for: .seconds(0.5))
+        let exportAction = try await deferred.fulfill()
+        
+        guard case let .exportFile(file) = exportAction else {
+            XCTFail("Unexpected action")
+            return
+        }
        
        // Then the binding should be set for the user to export the file to their specified location.
        XCTAssertFalse(photoLibraryManager.addResourceAtCalled)
-        XCTAssertNotNil(context.fileToExport)
-        XCTAssertEqual(context.fileToExport?.url, mediaItem.fileHandle?.url)
-    }
-    
-    func testDismiss() async throws {
-        // Given a view model with a loaded item.
-        try await testLoadingItem()
-        
-        // When requesting to dismiss the view.
-        let deferred = deferFulfillment(viewModel.actions) { $0 == .dismiss }
-        context.send(viewAction: .dismiss)
-        
-        // Then the action should be sent upwards to make this happen.
-        try await deferred.fulfill()
+        XCTAssertEqual(file.url, mediaItem.fileHandle?.url)
    }
    
    // MARK: - Helpers
    
    private func loadInitialItem() async throws {
-        let deferred = deferFulfillment(viewModel.state.fileLoadedPublisher) { _ in true }
+        let deferred = deferFulfillment(viewModel.state.previewControllerDriver) { $0.isItemLoaded }
        let initialItem = context.viewState.dataSource.previewController(QLPreviewController(),
                                                                         previewItemAt: context.viewState.dataSource.initialItemIndex)
        guard let initialPreviewItem = initialItem as? TimelineMediaPreviewItem.Media else {
@@ -278,8 +272,6 @@ class TimelineMediaPreviewViewModelTests: XCTestCase {
        try await deferred.fulfill()
    }
    
-    @Namespace private var testNamespace
-    
    private func setupViewModel(initialItemIndex: Int = 0, photoLibraryAuthorizationDenied: Bool = false) {
        let initialItems = makeItems()
        timelineController = MockRoomTimelineController(timelineKind: .media(.mediaFilesScreen))
@@ -288,10 +280,9 @@ class TimelineMediaPreviewViewModelTests: XCTestCase {
        mediaProvider = MediaProviderMock(configuration: .init())
        photoLibraryManager = PhotoLibraryManagerMock(.init(authorizationDenied: photoLibraryAuthorizationDenied))
        
-        viewModel = TimelineMediaPreviewViewModel(context: .init(item: initialItems[initialItemIndex],
-                                                                 viewModel: TimelineViewModel.mock(timelineKind: .media(.mediaFilesScreen),
-                                                                                                   timelineController: timelineController),
-                                                                 namespace: testNamespace),
+        viewModel = TimelineMediaPreviewViewModel(initialItem: initialItems[initialItemIndex],
+                                                  timelineViewModel: TimelineViewModel.mock(timelineKind: .media(.mediaFilesScreen),
+                                                                                            timelineController: timelineController),
                                                  mediaProvider: mediaProvider,
                                                  photoLibraryManager: photoLibraryManager,
                                                  userIndicatorController: UserIndicatorControllerMock(),