media-viewer

iOSClient/Data/NCManageDatabase+Metadata.swift

@@ -1356,6 +1356,26 @@ extension NCManageDatabase {
         } ?? 0
     }
 
+    /// Returns only the ocIds that still have a matching metadata row in Realm.
+    ///
+    /// - Parameter ocIds: Candidate media ocIds used by the media viewer.
+    /// - Returns: Valid ocIds preserving the original input order.
+    func getValidMetadataOcIdsAsync(_ ocIds: [String]) async -> [String] {
+        guard !ocIds.isEmpty else {
+            return []
+        }
+
+        return await core.performRealmReadAsync { realm in
+            let existingOcIds = Set(
+                realm.objects(tableMetadata.self)
+                    .filter("ocId IN %@", ocIds)
+                    .map(\.ocId)
+            )
+
+            return ocIds.filter { existingOcIds.contains($0) }
+        } ?? []
+    }
+
     func metadataExistsAsync(predicate: NSPredicate) async -> Bool {
         await core.performRealmReadAsync { realm in
             realm.objects(tableMetadata.self)

iOSClient/Files/NCFiles.swift

@@ -8,7 +8,6 @@ import RealmSwift
 import SwiftUI
 
 class NCFiles: NCCollectionViewCommon {
-    internal var fileNameBlink: String?
     internal var lastOffsetY: CGFloat = 0
     internal var lastScrollTime: TimeInterval = 0
     internal var accumulatedScrollDown: CGFloat = 0
@@ -107,11 +106,6 @@ class NCFiles: NCCollectionViewCommon {
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
 
-        if !self.dataSource.isEmpty() {
-            blinkCell(fileName: self.fileNameBlink)
-            fileNameBlink = nil
-        }
-
         Task {
             // Plus Menu reload
             await self.mainNavigationController?.menuPlus?.create(session: session)
@@ -132,12 +126,6 @@ class NCFiles: NCCollectionViewCommon {
         }
     }
 
-    override func viewDidDisappear(_ animated: Bool) {
-        super.viewDidDisappear(animated)
-
-        fileNameBlink = nil
-    }
-
     // MARK: - DataSource
 
     override func reloadDataSource() async {
@@ -355,31 +343,11 @@ class NCFiles: NCCollectionViewCommon {
         return (metadatas, error, reloadRequired)
     }
 
-    func blinkCell(fileName: String?) {
-        if let fileName = fileName, let metadata = database.getMetadata(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileName == %@", session.account, self.serverUrl, fileName)) {
-            let indexPath = self.dataSource.getIndexPathMetadata(ocId: metadata.ocId)
-            if let indexPath = indexPath {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                    UIView.animate(withDuration: 0.3) {
-                        self.collectionView.scrollToItem(at: indexPath, at: .centeredVertically, animated: false)
-                    } completion: { _ in
-                        if let cell = self.collectionView.cellForItem(at: indexPath) {
-                            cell.backgroundColor = .darkGray
-                            UIView.animate(withDuration: 2) {
-                                cell.backgroundColor = .clear
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     func open(metadata: tableMetadata?) async {
         guard let metadata else {
             return
         }
-        await didSelectMetadata(metadata, withOcIds: false)
+        await didSelectMetadata(metadata, withOcIds: false, viewerTransitionSource: nil)
     }
 
     // MARK: - NCAccountSettingsModelDelegate

iOSClient/Main/Collection Common/Cell/NCCellMain.swift

@@ -15,6 +15,7 @@ protocol NCCellMainProtocol {
     var infoLbl: UILabel? { get set }
 
     func selected(_ status: Bool, isEditMode: Bool, color: UIColor)
+    func viewerTransitionSource() -> NCMediaViewerTransitionSource?
 }
 
 extension NCCellMainProtocol {
@@ -38,6 +39,17 @@ extension NCCellMainProtocol {
         get { return nil }
         set {}
     }
+
+    func viewerTransitionSource() -> NCMediaViewerTransitionSource? {
+        guard let imageView = previewImg,
+              let image = imageView.image,
+              let window = imageView.window else {
+            return nil
+        }
+        let sourceFrame = imageView.convert(imageView.bounds, to: window)
+
+        return NCMediaViewerTransitionSource(image: image, sourceFrame: sourceFrame, cornerRadius: imageView.layer.cornerRadius)
+    }
 }
 
 #if !EXTENSION

iOSClient/Main/Collection Common/Cell/NCRecommendationsCell.swift

@@ -25,6 +25,17 @@ class NCRecommendationsCell: UICollectionViewCell, UIGestureRecognizerDelegate {
         }
     }
 
+    func viewerTransitionSource() -> NCMediaViewerTransitionSource? {
+        guard let imageView = image,
+              let image = imageView.image,
+              let window = imageView.window else {
+            return nil
+        }
+        let sourceFrame = imageView.convert(imageView.bounds, to: window)
+
+        return NCMediaViewerTransitionSource(image: image, sourceFrame: sourceFrame, cornerRadius: imageView.layer.cornerRadius)
+    }
+
     override func awakeFromNib() {
         super.awakeFromNib()
 

iOSClient/Main/Collection Common/NCCollectionViewCommon+CellDelegate.swift

@@ -22,7 +22,7 @@ extension NCCollectionViewCommon: NCListCellDelegate, NCGridCellDelegate {
     func tapShareListItem(with metadata: tableMetadata?, button: UIButton, sender: Any) {
         Task {
             guard let metadata else { return }
-            NCCreate().createShare(controller: self.controller, metadata: metadata, page: .sharing)
+            NCCreate().createShare(controller: self.controller, viewController: self.controller, metadata: metadata, page: .sharing)
         }
     }
 }

iOSClient/Main/Collection Common/NCCollectionViewCommon+CollectionViewDelegate.swift

@@ -10,7 +10,7 @@ import LucidBanner
 
 extension NCCollectionViewCommon: UICollectionViewDelegate {
     @MainActor
-    func didSelectMetadata(_ metadata: tableMetadata, withOcIds: Bool) async {
+    func didSelectMetadata(_ metadata: tableMetadata, withOcIds: Bool, viewerTransitionSource: NCMediaViewerTransitionSource?) async {
         let capabilities = await NKCapabilities.shared.getCapabilities(for: session.account)
 
         if metadata.e2eEncrypted {
@@ -94,7 +94,7 @@ extension NCCollectionViewCommon: UICollectionViewDelegate {
             // --- E2EE -------
             if metadata.isDirectoryE2EE {
                 if fileExists {
-                    if let vc = await NCViewer().getViewerController(metadata: metadata, delegate: self) {
+                    if let vc = await NCViewer().getViewerController(metadata: metadata, delegate: self, viewerTransitionSource: viewerTransitionSource) {
                         self.navigationController?.pushViewController(vc, animated: true)
                     }
                 } else {
@@ -110,11 +110,11 @@ extension NCCollectionViewCommon: UICollectionViewDelegate {
                     $0.classFile == NKTypeClassFile.video.rawValue ||
                     $0.classFile == NKTypeClassFile.audio.rawValue }.map(\.ocId)
 
-                if let vc = await NCViewer().getViewerController(metadata: metadata, ocIds: withOcIds ? ocIds : nil, image: image, delegate: self) {
+                if let vc = await NCViewer().getViewerController(metadata: metadata, ocIds: withOcIds ? ocIds : nil, image: image, delegate: self, viewerTransitionSource: viewerTransitionSource) {
                     self.navigationController?.pushViewController(vc, animated: true)
                 }
             } else if !metadata.isDirectoryE2EE, metadata.isAvailableEditorView || utilityFileSystem.fileProviderStorageExists(metadata) || metadata.name == self.global.talkName {
-                if let vc = await NCViewer().getViewerController(metadata: metadata, image: image, delegate: self) {
+                if let vc = await NCViewer().getViewerController(metadata: metadata, image: image, delegate: self, viewerTransitionSource: viewerTransitionSource) {
                     self.navigationController?.pushViewController(vc, animated: true)
                 }
             } else if NextcloudKit.shared.isNetworkReachable() {
@@ -128,7 +128,7 @@ extension NCCollectionViewCommon: UICollectionViewDelegate {
                 if metadata.name == "files" {
                     await downloadFile()
                 } else if !metadata.url.isEmpty,
-                          let vc = await NCViewer().getViewerController(metadata: metadata, delegate: self) {
+                          let vc = await NCViewer().getViewerController(metadata: metadata, delegate: self, viewerTransitionSource: viewerTransitionSource) {
                     self.navigationController?.pushViewController(vc, animated: true)
                 }
             } else {
@@ -141,6 +141,7 @@ extension NCCollectionViewCommon: UICollectionViewDelegate {
         guard let metadata = self.dataSource.getMetadata(indexPath: indexPath) else {
             return
         }
+        var viewerTransitionSource: NCMediaViewerTransitionSource?
 
         if self.isEditMode {
             if let index = self.fileSelect.firstIndex(of: metadata.ocId) {
@@ -154,8 +155,12 @@ extension NCCollectionViewCommon: UICollectionViewDelegate {
             return
         }
 
+        if let cell = collectionView.cellForItem(at: indexPath) as? NCCellMainProtocol {
+            viewerTransitionSource = cell.viewerTransitionSource()
+        }
+
         Task {
-            await didSelectMetadata(metadata, withOcIds: true)
+            await didSelectMetadata(metadata, withOcIds: true, viewerTransitionSource: viewerTransitionSource)
         }
     }
 

iOSClient/Main/Collection Common/NCCollectionViewCommon+TransitionSourceBlink.swift

@@ -0,0 +1,123 @@
+// SPDX-FileCopyrightText: Nextcloud GmbH
+// SPDX-FileCopyrightText: 2026 Marino Faggiana
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+import Foundation
+import UIKit
+
+extension NCCollectionViewCommon {
+    /// Returns the transition source for a media item in the collection view.
+    ///
+    /// If the target cell is visible, the transition uses the real preview image view frame.
+    /// If the target cell is not materialized yet, the transition falls back to the
+    /// collection view layout attributes so the closing animation can still target
+    /// the correct item position.
+    ///
+    /// - Parameter ocId: Nextcloud file identifier of the media item.
+    /// - Returns: Transition source if the item can be resolved.
+    func viewerTransitionSource(for ocId: String) -> NCMediaViewerTransitionSource? {
+        guard let indexPath = dataSource.getIndexPathMetadata(ocId: ocId),
+              let window = collectionView.window else {
+            return nil
+        }
+
+        collectionView.layoutIfNeeded()
+
+        if collectionView.cellForItem(at: indexPath) == nil {
+            collectionView.scrollToItem(
+                at: indexPath,
+                at: .centeredVertically,
+                animated: false
+            )
+
+            collectionView.layoutIfNeeded()
+        }
+
+        if let cell = collectionView.cellForItem(at: indexPath) as? NCCellMainProtocol,
+           let imageView = cell.previewImg,
+           let image = imageView.image {
+            let sourceFrame = imageView.convert(
+                imageView.bounds,
+                to: window
+            )
+
+            return NCMediaViewerTransitionSource(
+                image: image,
+                sourceFrame: sourceFrame,
+                cornerRadius: imageView.layer.cornerRadius
+            )
+        }
+
+        guard let attributes = collectionView.layoutAttributesForItem(at: indexPath) else {
+            return nil
+        }
+
+        let sourceFrame = collectionView.convert(
+            attributes.frame,
+            to: window
+        )
+
+        return NCMediaViewerTransitionSource(
+            image: UIImage(),
+            sourceFrame: sourceFrame,
+            cornerRadius: 6
+        )
+    }
+
+    /// Briefly highlights the collection view cell associated with the given ocId.
+    ///
+    /// If the target item is not currently visible, the collection view scrolls to it first.
+    /// The highlight is intentionally lightweight and temporary.
+    @MainActor
+    func blinkItem(ocId: String) {
+        guard let indexPath = dataSource.getIndexPathMetadata(ocId: ocId) else {
+            return
+        }
+
+        collectionView.layoutIfNeeded()
+
+        if collectionView.cellForItem(at: indexPath) == nil {
+            collectionView.scrollToItem(
+                at: indexPath,
+                at: .centeredVertically,
+                animated: false
+            )
+
+            view.layoutIfNeeded()
+            collectionView.layoutIfNeeded()
+        }
+
+        guard let cell = collectionView.cellForItem(at: indexPath) else {
+            return
+        }
+
+        blink(view: cell.contentView)
+    }
+
+    /// Applies a short blink animation to the provided view.
+    ///
+    /// - Parameter view: View that should be visually highlighted.
+    private func blink(view: UIView) {
+        let overlay = UIView(frame: view.bounds)
+        overlay.backgroundColor = UIColor.systemBlue.withAlphaComponent(0.22)
+        overlay.layer.cornerRadius = view.layer.cornerRadius
+        overlay.isUserInteractionEnabled = false
+        overlay.autoresizingMask = [
+            .flexibleWidth,
+            .flexibleHeight
+        ]
+
+        view.addSubview(overlay)
+
+        UIView.animate(
+            withDuration: 0.4,
+            delay: 0,
+            options: [.curveEaseInOut]
+        ) {
+            overlay.alpha = 0.0
+        } completion: { _ in
+            overlay.removeFromSuperview()
+        }
+    }
+
+}

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -787,9 +787,9 @@ extension NCCollectionViewCommon: NCSectionFirstHeaderDelegate {
         }
     }
 
-    func tapRecommendations(with metadata: tableMetadata) {
+    func tapRecommendations(with metadata: tableMetadata, viewerTransitionSource: NCMediaViewerTransitionSource?) {
         Task {
-            await didSelectMetadata(metadata, withOcIds: false)
+            await didSelectMetadata(metadata, withOcIds: false, viewerTransitionSource: viewerTransitionSource)
         }
     }
 }

iOSClient/Main/Collection Common/Section Header Footer/NCSectionFirstHeader.swift

@@ -8,7 +8,7 @@ import NextcloudKit
 
 protocol NCSectionFirstHeaderDelegate: AnyObject {
     func tapRichWorkspace(_ sender: Any)
-    func tapRecommendations(with metadata: tableMetadata)
+    func tapRecommendations(with metadata: tableMetadata, viewerTransitionSource: NCMediaViewerTransitionSource?)
 }
 
 class NCSectionFirstHeader: UICollectionReusableView, UIGestureRecognizerDelegate {
@@ -232,11 +232,13 @@ extension NCSectionFirstHeader: UICollectionViewDataSource {
 extension NCSectionFirstHeader: UICollectionViewDelegate {
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         let recommendedFiles = self.recommendations[indexPath.row]
-        guard let metadata = NCManageDatabase.shared.getMetadataFromFileId(recommendedFiles.id) else {
+        guard let metadata = NCManageDatabase.shared.getMetadataFromFileId(recommendedFiles.id),
+            let cell = collectionView.cellForItem(at: indexPath) as? NCRecommendationsCell else {
             return
         }
+        let viewerTransitionSource = cell.viewerTransitionSource()
 
-        self.delegate?.tapRecommendations(with: metadata)
+        self.delegate?.tapRecommendations(with: metadata, viewerTransitionSource: viewerTransitionSource)
     }
 
     func collectionView(_ collectionView: UICollectionView, contextMenuConfigurationForItemAt indexPath: IndexPath, point: CGPoint) -> UIContextMenuConfiguration? {