From 0a2dd448584a9d68df5d25a11dc6ca154e0959b2 Mon Sep 17 00:00:00 2001
From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com>
Date: Wed, 29 Nov 2023 16:33:00 +0530
Subject: [PATCH 1/7] NMC 2169 - Media theming customisation

---
 iOSClient/AppDelegate.swift                   |   2 +
 iOSClient/Main/NCMainTabBar.swift             |   2 +-
 iOSClient/Main/NCPickerViewController.swift   |   5 +-
 iOSClient/Menu/NCMedia+Menu.swift             | 203 ++++++++++++++++++
 iOSClient/Menu/NCViewer+Menu.swift            |  15 --
 .../Viewer/NCViewerMedia/NCViewerMedia.swift  |   2 +-
 .../Viewer/NCViewerPDF/NCViewerPDF.swift      |   2 +-
 .../NCViewerQuickLook/NCViewerQuickLook.swift |   2 +-
 8 files changed, 212 insertions(+), 21 deletions(-)
 create mode 100644 iOSClient/Menu/NCMedia+Menu.swift

diff --git a/iOSClient/AppDelegate.swift b/iOSClient/AppDelegate.swift
index ab5853646f..6ad9388155 100644
--- a/iOSClient/AppDelegate.swift
+++ b/iOSClient/AppDelegate.swift
@@ -64,6 +64,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         if isUiTestingEnabled {
             deleteAllAccounts()
         }
+        UINavigationBar.appearance().tintColor = NCBrandColor.shared.customer
+        UIToolbar.appearance().tintColor = NCBrandColor.shared.customer
         let utilityFileSystem = NCUtilityFileSystem()
         let utility = NCUtility()
 
diff --git a/iOSClient/Main/NCMainTabBar.swift b/iOSClient/Main/NCMainTabBar.swift
index b8c2c5dc8f..2b97471098 100644
--- a/iOSClient/Main/NCMainTabBar.swift
+++ b/iOSClient/Main/NCMainTabBar.swift
@@ -149,7 +149,7 @@ class NCMainTabBar: UITabBar {
         // Media
         if let item = items?[3] {
             item.title = NSLocalizedString("_media_", comment: "")
-            item.image = UIImage(named: "media")?.image(color: NCBrandColor.shared.brandElement, size: 25)
+            item.image = UIImage(named: "mediaSelected")?.image(color: NCBrandColor.shared.brandElement, size: 25)
             item.selectedImage = item.image
         }
 
diff --git a/iOSClient/Main/NCPickerViewController.swift b/iOSClient/Main/NCPickerViewController.swift
index a2494d74da..92f4562b63 100644
--- a/iOSClient/Main/NCPickerViewController.swift
+++ b/iOSClient/Main/NCPickerViewController.swift
@@ -106,8 +106,9 @@ class customPhotoPickerViewController: TLPhotosPickerViewController {
     override func makeUI() {
         super.makeUI()
 
-        self.customNavItem.leftBarButtonItem?.tintColor = .systemBlue
-        self.customNavItem.rightBarButtonItem?.tintColor = .systemBlue
+        self.customNavItem.leftBarButtonItem?.tintColor = NCBrandColor.shared.customer
+        self.customNavItem.rightBarButtonItem?.tintColor = NCBrandColor.shared.customer
+        self.albumPopView.tintColor = NCBrandColor.shared.customer
     }
 }
 
diff --git a/iOSClient/Menu/NCMedia+Menu.swift b/iOSClient/Menu/NCMedia+Menu.swift
new file mode 100644
index 0000000000..e530c373aa
--- /dev/null
+++ b/iOSClient/Menu/NCMedia+Menu.swift
@@ -0,0 +1,203 @@
+//
+//  NCMedia+Menu.swift
+//  Nextcloud
+//
+//  Created by Marino Faggiana on 03/03/2021.
+//  Copyright © 2021 Marino Faggiana. All rights reserved.
+//
+//  Author Marino Faggiana <marino.faggiana@nextcloud.com>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+import UIKit
+import FloatingPanel
+import NextcloudKit
+
+extension NCMedia {
+    func tapSelect() {
+        self.isEditMode = false
+        self.selectOcId.removeAll()
+        self.selectIndexPath.removeAll()
+        self.collectionView?.reloadData()
+    }
+
+    func toggleMenu() {
+
+        var actions: [NCMenuAction] = []
+
+        defer { presentMenu(with: actions) }
+
+        if !isEditMode {
+            if let metadatas = self.metadatas, !metadatas.isEmpty {
+                actions.append(
+                    NCMenuAction(
+                        title: NSLocalizedString("_select_", comment: ""),
+                        icon: utility.loadImage(named: "selectFull", color: NCBrandColor.shared.iconColor),
+                        action: { _ in
+                            self.isEditMode = true
+                        }
+                    )
+                )
+            }
+
+            actions.append(.seperator(order: 0))
+
+            actions.append(
+                NCMenuAction(
+                    title: NSLocalizedString("_media_viewimage_show_", comment: ""),
+                    icon: utility.loadImage(named: filterClassTypeImage ? "nocamera" : "file_photo_menu",color: NCBrandColor.shared.iconColor),
+                    selected: showOnlyImages,
+                    on: true,
+                    action: { _ in
+                        self.showOnlyImages = true
+                        self.showOnlyVideos = false
+                        self.reloadDataSourceWithCompletion { _ in }
+                    }
+                )
+            )
+
+            actions.append(
+                NCMenuAction(
+                    title: NSLocalizedString("_media_viewvideo_show_", comment: ""),
+                    icon: utility.loadImage(named: filterClassTypeVideo ? "videono" : "videoyes",color: NCBrandColor.shared.iconColor),
+                    selected: showOnlyVideos,
+                    on: true,
+                    action: { _ in
+                        self.showOnlyImages = false
+                        self.showOnlyVideos = true
+                        self.reloadDataSourceWithCompletion { _ in }
+                    }
+                )
+            )
+
+            actions.append(
+                NCMenuAction(
+                    title: NSLocalizedString("_media_show_all_", comment: ""),
+                    icon: utility.loadImage(named: "photo.on.rectangle.angled"),
+                    selected: !showOnlyImages && !showOnlyVideos,
+                    on: true,
+                    action: { _ in
+                        self.showOnlyImages = false
+                        self.showOnlyVideos = false
+                        self.reloadDataSourceWithCompletion { _ in }
+                    }
+                )
+            )
+
+            actions.append(.seperator(order: 0))
+
+            actions.append(
+                NCMenuAction(
+                    title: NSLocalizedString("_select_media_folder_", comment: ""),
+                    icon: utility.loadImage(named: "folder"),
+                    action: { _ in
+                        if let navigationController = UIStoryboard(name: "NCSelect", bundle: nil).instantiateInitialViewController() as? UINavigationController,
+                           let viewController = navigationController.topViewController as? NCSelect {
+
+                            viewController.delegate = self
+                            viewController.typeOfCommandView = .select
+                            viewController.type = "mediaFolder"
+                            viewController.selectIndexPath = self.selectIndexPath
+
+                            self.present(navigationController, animated: true, completion: nil)
+                        }
+                    }
+                )
+            )
+
+            actions.append(
+                NCMenuAction(
+                    title: NSLocalizedString("_media_by_modified_date_", comment: ""),
+                    icon: utility.loadImage(named: "sortFileNameAZ", color: NCBrandColor.shared.iconColor),
+                    selected: NCKeychain().mediaSortDate == "date",
+                    on: true,
+                    action: { _ in
+                        NCKeychain().mediaSortDate = "date"
+                        self.reloadDataSourceWithCompletion { _ in }
+                    }
+                )
+            )
+
+            actions.append(
+                NCMenuAction(
+                    title: NSLocalizedString("_media_by_created_date_", comment: ""),
+                    icon: utility.loadImage(named: "sortFileNameAZ", color: NCBrandColor.shared.iconColor),
+                    selected: NCKeychain().mediaSortDate == "creationDate",
+                    on: true,
+                    action: { _ in
+                        NCKeychain().mediaSortDate = "creationDate"
+                        self.reloadDataSourceWithCompletion { _ in }
+                    }
+                )
+            )
+
+            actions.append(
+                NCMenuAction(
+                    title: NSLocalizedString("_media_by_upload_date_", comment: ""),
+                    icon: utility.loadImage(named: "sortFileNameAZ", color: NCBrandColor.shared.iconColor),
+                    selected: NCKeychain().mediaSortDate == "uploadDate",
+                    on: true,
+                    action: { _ in
+                        NCKeychain().mediaSortDate = "uploadDate"
+                        self.reloadDataSourceWithCompletion { _ in }
+                    }
+                )
+            )
+
+        } else {
+
+            //
+            // CANCEL
+            //
+            actions.append(
+                NCMenuAction(
+                    title: NSLocalizedString("_cancel_", comment: ""),
+                    icon: utility.loadImage(named: "xmark", color: NCBrandColor.shared.iconColor),
+                    action: { _ in self.tapSelect() }
+                )
+            )
+
+            guard !selectOcId.isEmpty else { return }
+            let selectedMetadatas = selectOcId.compactMap(NCManageDatabase.shared.getMetadataFromOcId)
+
+            //
+            // OPEN IN
+            //
+            actions.append(.openInAction(selectedMetadatas: selectedMetadatas, viewController: self, completion: tapSelect))
+
+            //
+            // SAVE TO PHOTO GALLERY
+            //
+            actions.append(.saveMediaAction(selectedMediaMetadatas: selectedMetadatas, completion: tapSelect))
+
+            //
+            // COPY - MOVE
+            //
+            actions.append(.moveOrCopyAction(selectedMetadatas: selectedMetadatas, indexPath: selectIndexPath, completion: tapSelect))
+
+            //
+            // COPY
+            //
+            actions.append(.copyAction(selectOcId: selectOcId, completion: tapSelect))
+
+            //
+            // DELETE
+            // can't delete from cache because is needed for NCMedia view, and if locked can't delete from server either.
+            if !selectedMetadatas.contains(where: { $0.lock && $0.lockOwner != appDelegate.userId }) {
+                actions.append(.deleteAction(selectedMetadatas: selectedMetadatas, indexPath: selectIndexPath, metadataFolder: nil, viewController: self, completion: tapSelect))
+            }
+        }
+    }
+}
diff --git a/iOSClient/Menu/NCViewer+Menu.swift b/iOSClient/Menu/NCViewer+Menu.swift
index 42ffdfa179..b11e685a37 100644
--- a/iOSClient/Menu/NCViewer+Menu.swift
+++ b/iOSClient/Menu/NCViewer+Menu.swift
@@ -36,21 +36,6 @@ extension NCViewer {
         let localFile = NCManageDatabase.shared.getTableLocalFile(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
         let isOffline = localFile?.offline == true
 
-        //
-        // DETAIL
-        //
-        if !appDelegate.disableSharesView {
-            actions.append(
-                NCMenuAction(
-                    title: NSLocalizedString("_details_", comment: ""),
-                    icon: utility.loadImage(named: "info.circle"),
-                    action: { _ in
-                        NCActionCenter.shared.openShare(viewController: viewController, metadata: metadata, page: .activity)
-                    }
-                )
-            )
-        }
-
         //
         // VIEW IN FOLDER
         //
diff --git a/iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift b/iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift
index 1c94738d39..413df249ea 100644
--- a/iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift
+++ b/iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift
@@ -120,7 +120,7 @@ class NCViewerMedia: UIViewController {
         // TIP
         var preferences = EasyTipView.Preferences()
         preferences.drawing.foregroundColor = .white
-        preferences.drawing.backgroundColor = NCBrandColor.shared.nextcloud
+        preferences.drawing.backgroundColor = NCBrandColor.shared.customer
         preferences.drawing.textAlignment = .left
         preferences.drawing.arrowPosition = .bottom
         preferences.drawing.cornerRadius = 10
diff --git a/iOSClient/Viewer/NCViewerPDF/NCViewerPDF.swift b/iOSClient/Viewer/NCViewerPDF/NCViewerPDF.swift
index d46ab9fa38..118daff800 100644
--- a/iOSClient/Viewer/NCViewerPDF/NCViewerPDF.swift
+++ b/iOSClient/Viewer/NCViewerPDF/NCViewerPDF.swift
@@ -85,7 +85,7 @@ class NCViewerPDF: UIViewController, NCViewerPDFSearchDelegate {
 
         var preferences = EasyTipView.Preferences()
         preferences.drawing.foregroundColor = .white
-        preferences.drawing.backgroundColor = NCBrandColor.shared.nextcloud
+        preferences.drawing.backgroundColor = NCBrandColor.shared.customer
         preferences.drawing.textAlignment = .left
         preferences.drawing.arrowPosition = .right
         preferences.drawing.cornerRadius = 10
diff --git a/iOSClient/Viewer/NCViewerQuickLook/NCViewerQuickLook.swift b/iOSClient/Viewer/NCViewerQuickLook/NCViewerQuickLook.swift
index 909540cbcb..9f0c483110 100644
--- a/iOSClient/Viewer/NCViewerQuickLook/NCViewerQuickLook.swift
+++ b/iOSClient/Viewer/NCViewerQuickLook/NCViewerQuickLook.swift
@@ -163,7 +163,7 @@ private var hasChangesQuickLook: Bool = false
         toolbarConfig.optionButtonFontSize = 16
         toolbarConfig.optionButtonFontSizeForPad = 21
         toolbarConfig.backgroundColor = .systemGray6
-        toolbarConfig.foregroundColor = .systemBlue
+        toolbarConfig.foregroundColor = NCBrandColor.shared.customer
 
         var viewConfig = CropViewConfig()
         viewConfig.cropMaskVisualEffectType = .none

From 7faf811548413fe4daf80e76f3f07f234150ab43 Mon Sep 17 00:00:00 2001
From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com>
Date: Mon, 4 Dec 2023 13:14:42 +0530
Subject: [PATCH 2/7] NMC - 2169 - Merging conflicts resolve after NC 4.9.2
 release

---
 iOSClient/Menu/NCMedia+Menu.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/iOSClient/Menu/NCMedia+Menu.swift b/iOSClient/Menu/NCMedia+Menu.swift
index e530c373aa..03be5b71dd 100644
--- a/iOSClient/Menu/NCMedia+Menu.swift
+++ b/iOSClient/Menu/NCMedia+Menu.swift
@@ -57,7 +57,7 @@ extension NCMedia {
             actions.append(
                 NCMenuAction(
                     title: NSLocalizedString("_media_viewimage_show_", comment: ""),
-                    icon: utility.loadImage(named: filterClassTypeImage ? "nocamera" : "file_photo_menu",color: NCBrandColor.shared.iconColor),
+                    icon: utility.loadImage(named: showOnlyImages ? "nocamera" : "file_photo_menu",color: NCBrandColor.shared.iconColor),
                     selected: showOnlyImages,
                     on: true,
                     action: { _ in
@@ -71,7 +71,7 @@ extension NCMedia {
             actions.append(
                 NCMenuAction(
                     title: NSLocalizedString("_media_viewvideo_show_", comment: ""),
-                    icon: utility.loadImage(named: filterClassTypeVideo ? "videono" : "videoyes",color: NCBrandColor.shared.iconColor),
+                    icon: utility.loadImage(named: showOnlyVideos ? "videono" : "videoyes",color: NCBrandColor.shared.iconColor),
                     selected: showOnlyVideos,
                     on: true,
                     action: { _ in

From f2561e779e00e48bcece24957949a73c3ad582ad Mon Sep 17 00:00:00 2001
From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com>
Date: Tue, 5 Dec 2023 13:26:34 +0530
Subject: [PATCH 3/7] NMC 2169 - Merging conflict resolve after Nextcloud 4.9.3
 release

---
 iOSClient/Menu/NCMedia+Menu.swift   | 12 ++++++------
 iOSClient/NCImageCache.swift        | 16 ++++++++++++++--
 iOSClient/Settings/NCKeychain.swift | 15 ++++++++++++++-
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/iOSClient/Menu/NCMedia+Menu.swift b/iOSClient/Menu/NCMedia+Menu.swift
index 03be5b71dd..6fe57d74e9 100644
--- a/iOSClient/Menu/NCMedia+Menu.swift
+++ b/iOSClient/Menu/NCMedia+Menu.swift
@@ -63,7 +63,7 @@ extension NCMedia {
                     action: { _ in
                         self.showOnlyImages = true
                         self.showOnlyVideos = false
-                        self.reloadDataSourceWithCompletion { _ in }
+                        self.reloadDataSource { }
                     }
                 )
             )
@@ -77,7 +77,7 @@ extension NCMedia {
                     action: { _ in
                         self.showOnlyImages = false
                         self.showOnlyVideos = true
-                        self.reloadDataSourceWithCompletion { _ in }
+                        self.reloadDataSource { }
                     }
                 )
             )
@@ -91,7 +91,7 @@ extension NCMedia {
                     action: { _ in
                         self.showOnlyImages = false
                         self.showOnlyVideos = false
-                        self.reloadDataSourceWithCompletion { _ in }
+                        self.reloadDataSource { }
                     }
                 )
             )
@@ -125,7 +125,7 @@ extension NCMedia {
                     on: true,
                     action: { _ in
                         NCKeychain().mediaSortDate = "date"
-                        self.reloadDataSourceWithCompletion { _ in }
+                        self.reloadDataSource { }
                     }
                 )
             )
@@ -138,7 +138,7 @@ extension NCMedia {
                     on: true,
                     action: { _ in
                         NCKeychain().mediaSortDate = "creationDate"
-                        self.reloadDataSourceWithCompletion { _ in }
+                        self.reloadDataSource { }
                     }
                 )
             )
@@ -151,7 +151,7 @@ extension NCMedia {
                     on: true,
                     action: { _ in
                         NCKeychain().mediaSortDate = "uploadDate"
-                        self.reloadDataSourceWithCompletion { _ in }
+                        self.reloadDataSource { }
                     }
                 )
             )
diff --git a/iOSClient/NCImageCache.swift b/iOSClient/NCImageCache.swift
index 117a15a936..457ecc6805 100644
--- a/iOSClient/NCImageCache.swift
+++ b/iOSClient/NCImageCache.swift
@@ -196,8 +196,20 @@ import RealmSwift
     func getMediaMetadatas(account: String, predicate: NSPredicate? = nil) -> ThreadSafeArray<tableMetadata>? {
         guard let tableAccount = NCManageDatabase.shared.getAccount(predicate: NSPredicate(format: "account == %@", account)) else { return nil }
         let startServerUrl = NCUtilityFileSystem().getHomeServer(urlBase: tableAccount.urlBase, userId: tableAccount.userId) + tableAccount.mediaPath
-        let predicateBoth = NSPredicate(format: showBothPredicateMediaString, account, startServerUrl)
-        return NCManageDatabase.shared.getMediaMetadatas(predicate: predicate ?? predicateBoth)
+        let predicateBoth = NSPredicate(format: showBothPredicateMediaString, account, startServerUrl, NKCommon.TypeClassFile.image.rawValue, NKCommon.TypeClassFile.video.rawValue)
+
+        var newMetadatas = NCManageDatabase.shared.getMediaMetadatas(predicate: predicate ?? predicateBoth)
+        switch NCKeychain().mediaSortDate {
+        case "date":
+            newMetadatas = newMetadatas.sorted(by: {($0.date as Date) > ($1.date as Date)})
+        case "creationDate":
+            newMetadatas = newMetadatas.sorted(by: {($0.creationDate as Date) > ($1.creationDate as Date)})
+        case "uploadDate":
+            newMetadatas = newMetadatas.sorted(by: {($0.uploadDate as Date) > ($1.uploadDate as Date)})
+        default:
+            break
+        }
+        return newMetadatas
     }
 
     // MARK: -
diff --git a/iOSClient/Settings/NCKeychain.swift b/iOSClient/Settings/NCKeychain.swift
index 64a1565b62..66d065f861 100644
--- a/iOSClient/Settings/NCKeychain.swift
+++ b/iOSClient/Settings/NCKeychain.swift
@@ -302,7 +302,20 @@ import KeychainAccess
             keychain["mediaTypeLayout"] = String(newValue)
         }
     }
-
+    
+    var mediaSortDate: String {
+        get {
+            migrate(key: "mediaSortDate")
+            if let value = try? keychain.get("mediaSortDate") {
+                return value
+            }
+            return "date"
+        }
+        set {
+            keychain["mediaSortDate"] = newValue
+        }
+    }
+    
     var textRecognitionStatus: Bool {
         get {
             migrate(key: "textRecognitionStatus")

From 83f08f4c7cb48131134295bba413f1d71919be32 Mon Sep 17 00:00:00 2001
From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com>
Date: Tue, 26 Dec 2023 15:08:46 +0530
Subject: [PATCH 4/7] NMC 2169 - Media Menu option icon color changes

---
 iOSClient/Menu/NCMedia+Menu.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/iOSClient/Menu/NCMedia+Menu.swift b/iOSClient/Menu/NCMedia+Menu.swift
index 6fe57d74e9..0ad1f36838 100644
--- a/iOSClient/Menu/NCMedia+Menu.swift
+++ b/iOSClient/Menu/NCMedia+Menu.swift
@@ -85,7 +85,7 @@ extension NCMedia {
             actions.append(
                 NCMenuAction(
                     title: NSLocalizedString("_media_show_all_", comment: ""),
-                    icon: utility.loadImage(named: "photo.on.rectangle.angled"),
+                    icon: utility.loadImage(named: "photo.on.rectangle.angled", color: NCBrandColor.shared.iconColor),
                     selected: !showOnlyImages && !showOnlyVideos,
                     on: true,
                     action: { _ in
@@ -101,7 +101,7 @@ extension NCMedia {
             actions.append(
                 NCMenuAction(
                     title: NSLocalizedString("_select_media_folder_", comment: ""),
-                    icon: utility.loadImage(named: "folder"),
+                    icon: utility.loadImage(named: "folder", color: NCBrandColor.shared.iconColor),
                     action: { _ in
                         if let navigationController = UIStoryboard(name: "NCSelect", bundle: nil).instantiateInitialViewController() as? UINavigationController,
                            let viewController = navigationController.topViewController as? NCSelect {

From bc102373f910185eca3b39991959858824988033 Mon Sep 17 00:00:00 2001
From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com>
Date: Wed, 10 Jan 2024 12:56:38 +0530
Subject: [PATCH 5/7] NMC 2169 - method changes after Nextcloud 4.9.6 release

---
 iOSClient/Menu/NCMedia+Menu.swift | 12 ++++++------
 iOSClient/NCImageCache.swift      | 11 +++++------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/iOSClient/Menu/NCMedia+Menu.swift b/iOSClient/Menu/NCMedia+Menu.swift
index 0ad1f36838..cc1d094e39 100644
--- a/iOSClient/Menu/NCMedia+Menu.swift
+++ b/iOSClient/Menu/NCMedia+Menu.swift
@@ -63,7 +63,7 @@ extension NCMedia {
                     action: { _ in
                         self.showOnlyImages = true
                         self.showOnlyVideos = false
-                        self.reloadDataSource { }
+                        self.reloadDataSource()
                     }
                 )
             )
@@ -77,7 +77,7 @@ extension NCMedia {
                     action: { _ in
                         self.showOnlyImages = false
                         self.showOnlyVideos = true
-                        self.reloadDataSource { }
+                        self.reloadDataSource()
                     }
                 )
             )
@@ -91,7 +91,7 @@ extension NCMedia {
                     action: { _ in
                         self.showOnlyImages = false
                         self.showOnlyVideos = false
-                        self.reloadDataSource { }
+                        self.reloadDataSource()
                     }
                 )
             )
@@ -125,7 +125,7 @@ extension NCMedia {
                     on: true,
                     action: { _ in
                         NCKeychain().mediaSortDate = "date"
-                        self.reloadDataSource { }
+                        self.reloadDataSource()
                     }
                 )
             )
@@ -138,7 +138,7 @@ extension NCMedia {
                     on: true,
                     action: { _ in
                         NCKeychain().mediaSortDate = "creationDate"
-                        self.reloadDataSource { }
+                        self.reloadDataSource()
                     }
                 )
             )
@@ -151,7 +151,7 @@ extension NCMedia {
                     on: true,
                     action: { _ in
                         NCKeychain().mediaSortDate = "uploadDate"
-                        self.reloadDataSource { }
+                        self.reloadDataSource()
                     }
                 )
             )
diff --git a/iOSClient/NCImageCache.swift b/iOSClient/NCImageCache.swift
index 457ecc6805..80901dc0f5 100644
--- a/iOSClient/NCImageCache.swift
+++ b/iOSClient/NCImageCache.swift
@@ -196,20 +196,19 @@ import RealmSwift
     func getMediaMetadatas(account: String, predicate: NSPredicate? = nil) -> ThreadSafeArray<tableMetadata>? {
         guard let tableAccount = NCManageDatabase.shared.getAccount(predicate: NSPredicate(format: "account == %@", account)) else { return nil }
         let startServerUrl = NCUtilityFileSystem().getHomeServer(urlBase: tableAccount.urlBase, userId: tableAccount.userId) + tableAccount.mediaPath
-        let predicateBoth = NSPredicate(format: showBothPredicateMediaString, account, startServerUrl, NKCommon.TypeClassFile.image.rawValue, NKCommon.TypeClassFile.video.rawValue)
+        let predicateBoth = NSPredicate(format: showBothPredicateMediaString, account, startServerUrl)
 
-        var newMetadatas = NCManageDatabase.shared.getMediaMetadatas(predicate: predicate ?? predicateBoth)
         switch NCKeychain().mediaSortDate {
         case "date":
-            newMetadatas = newMetadatas.sorted(by: {($0.date as Date) > ($1.date as Date)})
+            return NCManageDatabase.shared.getResultsMetadatas(predicate: predicate ?? predicateBoth, sorted: "date")
         case "creationDate":
-            newMetadatas = newMetadatas.sorted(by: {($0.creationDate as Date) > ($1.creationDate as Date)})
+            return NCManageDatabase.shared.getResultsMetadatas(predicate: predicate ?? predicateBoth, sorted: "creationDate")
         case "uploadDate":
-            newMetadatas = newMetadatas.sorted(by: {($0.uploadDate as Date) > ($1.uploadDate as Date)})
+            return NCManageDatabase.shared.getResultsMetadatas(predicate: predicate ?? predicateBoth, sorted: "uploadDate")
         default:
             break
         }
-        return newMetadatas
+        return NCManageDatabase.shared.getResultsMetadatas(predicate: predicate ?? predicateBoth, sorted: "date")
     }
 
     // MARK: -

From cf3190e3557d7fc2abec8ca79c2014fd7a9dd913 Mon Sep 17 00:00:00 2001
From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com>
Date: Fri, 2 Feb 2024 12:17:57 +0530
Subject: [PATCH 6/7] NMC 2169 - NMC 2395 Media detail translation issue and
 theming customisation

---
 iOSClient/Viewer/NCViewerMedia/NCViewerMediaDetailView.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/iOSClient/Viewer/NCViewerMedia/NCViewerMediaDetailView.swift b/iOSClient/Viewer/NCViewerMedia/NCViewerMediaDetailView.swift
index c54c76f567..3d8787a7f5 100644
--- a/iOSClient/Viewer/NCViewerMedia/NCViewerMediaDetailView.swift
+++ b/iOSClient/Viewer/NCViewerMedia/NCViewerMediaDetailView.swift
@@ -209,6 +209,7 @@ class NCViewerMediaDetailView: UIView {
         }
 
         if metadata.isImage && !utilityFileSystem.fileProviderStorageExists(metadata) && metadata.session.isEmpty {
+            downloadImageButton.tintColor = NCBrandColor.shared.brand
             downloadImageButton.setTitle(NSLocalizedString("_try_download_full_resolution_", comment: ""), for: .normal)
             downloadImageLabel.text = NSLocalizedString("_full_resolution_image_info_", comment: "")
             downloadImageButtonContainer.isHidden = false

From 44f61223282dce1450de472eae0615207ff30932 Mon Sep 17 00:00:00 2001
From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com>
Date: Mon, 15 Apr 2024 12:36:24 +0530
Subject: [PATCH 7/7] NMC 2169 - Media Menu changes after NC 5.2 release

---
 iOSClient/Media/NCMedia+Command.swift         |  35 +-
 iOSClient/Media/NCMedia.storyboard            |   6 +-
 iOSClient/Media/NCMedia.swift                 | 332 +++++++++++++-----
 iOSClient/Media/NCMediaCommandView.xib        | 178 ++++++++++
 iOSClient/NCImageCache.swift                  |   8 +-
 .../NCViewerMedia/NCViewerMediaPage.swift     |   6 +-
 6 files changed, 450 insertions(+), 115 deletions(-)
 create mode 100644 iOSClient/Media/NCMediaCommandView.xib

diff --git a/iOSClient/Media/NCMedia+Command.swift b/iOSClient/Media/NCMedia+Command.swift
index 46b1d6b9a5..75a045dc6b 100644
--- a/iOSClient/Media/NCMedia+Command.swift
+++ b/iOSClient/Media/NCMedia+Command.swift
@@ -17,7 +17,7 @@ extension NCMedia {
 
     func setSelectcancelButton() {
         selectOcId.removeAll()
-        tabBarSelect.selectCount = selectOcId.count
+        tabBarSelect?.selectCount = selectOcId.count
         if let visibleCells = self.collectionView?.indexPathsForVisibleItems.compactMap({ self.collectionView?.cellForItem(at: $0) }) {
             for case let cell as NCGridMediaCell in visibleCells {
                 cell.selected(false)
@@ -25,35 +25,27 @@ extension NCMedia {
         }
         if isEditMode {
             activityIndicatorTrailing.constant = 150
-            selectOrCancelButton.setTitle( NSLocalizedString("_cancel_", comment: ""), for: .normal)
-            selectOrCancelButtonTrailing.constant = 10
-            selectOrCancelButton.isHidden = false
-            menuButton.isHidden = true
-            tabBarSelect.show()
+            tabBarSelect?.show()
         } else {
             activityIndicatorTrailing.constant = 150
-            selectOrCancelButton.setTitle( NSLocalizedString("_select_", comment: ""), for: .normal)
-            selectOrCancelButtonTrailing.constant = 50
-            selectOrCancelButton.isHidden = false
-            menuButton.isHidden = false
-            tabBarSelect.hide()
+            tabBarSelect?.hide()
         }
     }
 
     func setTitleDate(_ offset: CGFloat = 10) {
-        titleDate?.text = ""
+        mediaCommandView?.title.text = ""
         if let metadata = metadatas?.first {
             let contentOffsetY = collectionView.contentOffset.y
             let top = insetsTop + view.safeAreaInsets.top + offset
             if insetsTop + view.safeAreaInsets.top + contentOffsetY < 10 {
-                titleDate?.text = utility.getTitleFromDate(metadata.date as Date)
+                mediaCommandView?.title.text = utility.getTitleFromDate(metadata.date as Date)
                 return
             }
             let point = CGPoint(x: offset, y: top + contentOffsetY)
             if let indexPath = collectionView.indexPathForItem(at: point) {
                 let cell = self.collectionView(collectionView, cellForItemAt: indexPath) as? NCGridMediaCell
-                if let date = cell?.date {
-                    self.titleDate?.text = utility.getTitleFromDate(date)
+                if let date = cell?.fileDate {
+                    mediaCommandView?.title.text = utility.getTitleFromDate(date)
                 }
             } else {
                 if offset < 20 {
@@ -65,16 +57,12 @@ extension NCMedia {
 
     func setColor() {
         if isTop {
-            titleDate?.textColor = .label
+            mediaCommandView?.title?.textColor = .label
             activityIndicator.color = .label
-            selectOrCancelButton.setTitleColor(.label, for: .normal)
-            menuButton.setImage(UIImage(systemName: "ellipsis")?.withTintColor(.label, renderingMode: .alwaysOriginal), for: .normal)
             gradientView.isHidden = true
         } else {
-            titleDate?.textColor = .white
+            mediaCommandView?.title?.textColor = .white
             activityIndicator.color = .white
-            selectOrCancelButton.setTitleColor(.white, for: .normal)
-            menuButton.setImage(UIImage(systemName: "ellipsis")?.withTintColor(.white, renderingMode: .alwaysOriginal), for: .normal)
             gradientView.isHidden = false
         }
     }
@@ -85,7 +73,8 @@ extension NCMedia {
         let layoutTitle = (layout == NCGlobal.shared.mediaLayoutRatio) ? NSLocalizedString("_media_square_", comment: "") : NSLocalizedString("_media_ratio_", comment: "")
         let layoutImage = (layout == NCGlobal.shared.mediaLayoutRatio) ? UIImage(systemName: "square.grid.3x3") : UIImage(systemName: "rectangle.grid.3x2")
 
-        if UIDevice.current.userInterfaceIdiom == .phone, UIDevice.current.orientation.isLandscape {
+        if UIDevice.current.userInterfaceIdiom == .phone,
+           (UIDevice.current.orientation == .landscapeLeft || UIDevice.current.orientation == .landscapeRight) {
             columnCount += 2
         }
 
@@ -176,7 +165,7 @@ extension NCMedia {
             self.present(alert, animated: true)
         }
 
-        menuButton.menu = UIMenu(title: "", children: [zoomViewMediaFolder, playFile, playURL])
+//        menuButton.menu = UIMenu(title: "", children: [zoomViewMediaFolder, playFile, playURL])
     }
 }
 
diff --git a/iOSClient/Media/NCMedia.storyboard b/iOSClient/Media/NCMedia.storyboard
index f1e221f104..517f2fdfb8 100644
--- a/iOSClient/Media/NCMedia.storyboard
+++ b/iOSClient/Media/NCMedia.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="EFX-fO-Oip">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="EFX-fO-Oip">
     <device id="retina5_9" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -51,7 +51,7 @@
                                 <rect key="frame" x="255" y="70" width="20" height="20"/>
                                 <color key="color" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </activityIndicatorView>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Enx-va-Bud">
+                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Enx-va-Bud">
                                 <rect key="frame" x="235" y="65" width="90" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="90" id="N4t-Eb-vDt"/>
diff --git a/iOSClient/Media/NCMedia.swift b/iOSClient/Media/NCMedia.swift
index 25603e381c..a4ee2f4dab 100644
--- a/iOSClient/Media/NCMedia.swift
+++ b/iOSClient/Media/NCMedia.swift
@@ -25,7 +25,7 @@ import UIKit
 import NextcloudKit
 import RealmSwift
 
-class NCMedia: UIViewController {
+class NCMedia: UIViewController, NCEmptyDataSetDelegate {
 
     @IBOutlet weak var collectionView: UICollectionView!
     @IBOutlet weak var titleDate: UILabel!
@@ -36,10 +36,11 @@ class NCMedia: UIViewController {
     @IBOutlet weak var menuButton: UIButton!
     @IBOutlet weak var gradientView: UIView!
 
-    let layout = NCMediaLayout()
+    var mediaCommandView: NCMediaCommandView?
     var activeAccount = tableAccount()
+    var emptyDataSet: NCEmptyDataSet?
     var documentPickerViewController: NCDocumentPickerViewController?
-    var tabBarSelect: NCMediaSelectTabBar!
+    var tabBarSelect: NCMediaSelectTabBar?
     let appDelegate = (UIApplication.shared.delegate as? AppDelegate)!
     let utilityFileSystem = NCUtilityFileSystem()
     let utility = NCUtility()
@@ -50,6 +51,7 @@ class NCMedia: UIViewController {
     var isTop: Bool = true
     var isEditMode = false
     var selectOcId: [String] = []
+    internal var selectIndexPath: [IndexPath] = []
     var attributesZoomIn: UIMenuElement.Attributes = []
     var attributesZoomOut: UIMenuElement.Attributes = []
     let gradient: CAGradientLayer = CAGradientLayer()
@@ -72,38 +74,28 @@ class NCMedia: UIViewController {
 
         view.backgroundColor = .systemBackground
 
-        collectionView.register(UINib(nibName: "NCSectionHeaderEmptyData", bundle: nil), forSupplementaryViewOfKind: collectionViewMediaElementKindSectionHeader, withReuseIdentifier: "sectionHeaderEmptyData")
         collectionView.register(UINib(nibName: "NCGridMediaCell", bundle: nil), forCellWithReuseIdentifier: "gridCell")
         collectionView.alwaysBounceVertical = true
         collectionView.contentInset = UIEdgeInsets(top: insetsTop, left: 0, bottom: 50, right: 0)
         collectionView.backgroundColor = .systemBackground
         collectionView.prefetchDataSource = self
 
+        let layout = NCMediaLayout()
         layout.sectionInset = UIEdgeInsets(top: 0, left: 2, bottom: 0, right: 2)
         layout.mediaViewController = self
         collectionView.collectionViewLayout = layout
 
+        emptyDataSet = NCEmptyDataSet(view: collectionView, offset: 0, delegate: self)
+
         tabBarSelect = NCMediaSelectTabBar(tabBarController: self.tabBarController, delegate: self)
 
         livePhotoImage = utility.loadImage(named: "livephoto", color: .white)
         playImage = utility.loadImage(named: "play.fill", color: .white)
 
         titleDate.text = ""
-
-        selectOrCancelButton.backgroundColor = .clear
-        selectOrCancelButton.layer.cornerRadius = 15
-        selectOrCancelButton.layer.masksToBounds = true
-        selectOrCancelButton.setTitle( NSLocalizedString("_select_", comment: ""), for: .normal)
-        selectOrCancelButton.addBlur(style: .systemThinMaterial)
-
-        menuButton.backgroundColor = .clear
-        menuButton.layer.cornerRadius = 15
-        menuButton.layer.masksToBounds = true
-        menuButton.showsMenuAsPrimaryAction = true
-        menuButton.configuration = UIButton.Configuration.plain()
-        menuButton.setImage(UIImage(systemName: "ellipsis"), for: .normal)
-        menuButton.changesSelectionAsPrimaryAction = false
-        menuButton.addBlur(style: .systemThinMaterial)
+        titleDate.isHidden = true
+        menuButton.isHidden = true
+        setupMediaCommandView()
 
         gradient.startPoint = CGPoint(x: 0, y: 0.1)
         gradient.endPoint = CGPoint(x: 0, y: 1)
@@ -142,18 +134,17 @@ class NCMedia: UIViewController {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
 
-        navigationController?.setMediaAppreance()
-    }
-
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-
         appDelegate.activeViewController = self
+        navigationController?.setMediaAppreance()
 
         NotificationCenter.default.addObserver(self, selector: #selector(deleteFile(_:)), name: NSNotification.Name(rawValue: NCGlobal.shared.notificationCenterDeleteFile), object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(enterForeground(_:)), name: NSNotification.Name(rawValue: NCGlobal.shared.notificationCenterApplicationWillEnterForeground), object: nil)
 
         startTimer()
+    }
+
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
         createMenu()
 
         if imageCache.createMediaCacheInProgress {
@@ -169,8 +160,8 @@ class NCMedia: UIViewController {
         }
     }
 
-    override func viewDidDisappear(_ animated: Bool) {
-        super.viewDidDisappear(animated)
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
 
         NotificationCenter.default.removeObserver(self, name: NSNotification.Name(rawValue: NCGlobal.shared.notificationCenterDeleteFile), object: nil)
         NotificationCenter.default.removeObserver(self, name: NSNotification.Name(rawValue: NCGlobal.shared.notificationCenterApplicationWillEnterForeground), object: nil)
@@ -197,7 +188,7 @@ class NCMedia: UIViewController {
         super.viewWillLayoutSubviews()
 
         if let frame = tabBarController?.tabBar.frame {
-            tabBarSelect.hostingController.view.frame = frame
+            tabBarSelect?.hostingController.view.frame = frame
         }
         gradient.frame = gradientView.bounds
     }
@@ -226,6 +217,17 @@ class NCMedia: UIViewController {
     @objc func enterForeground(_ notification: NSNotification) {
         startTimer()
     }
+    // MARK: - Empty
+
+    func emptyDataSetView(_ view: NCEmptyView) {
+        view.emptyImage.image = UIImage(named: "media")?.image(color: .gray, size: UIScreen.main.bounds.width)
+        if loadingTask != nil || imageCache.createMediaCacheInProgress {
+            view.emptyTitle.text = NSLocalizedString("_search_in_progress_", comment: "")
+        } else {
+            view.emptyTitle.text = NSLocalizedString("_tutorial_photo_view_", comment: "")
+        }
+        view.emptyDescription.text = ""
+    }
 
     // MARK: - Image
 
@@ -265,6 +267,107 @@ class NCMedia: UIViewController {
             videoImage = image
         }
     }
+    
+    // MARK: - Command
+    
+    func setupMediaCommandView() {
+        mediaCommandView?.title.text = ""
+        
+        mediaCommandView = Bundle.main.loadNibNamed("NCMediaCommandView", owner: self, options: nil)?.first as? NCMediaCommandView
+        self.view.addSubview(mediaCommandView!)
+        mediaCommandView?.mediaView = self
+        updateZoomButton()
+        mediaCommandView?.collapseControlButtonView(true)
+        mediaCommandView?.translatesAutoresizingMaskIntoConstraints = false
+        mediaCommandView?.topAnchor.constraint(equalTo: view.topAnchor, constant: 0).isActive = true
+        mediaCommandView?.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 0).isActive = true
+        mediaCommandView?.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: 0).isActive = true
+        mediaCommandView?.heightAnchor.constraint(equalToConstant: 150).isActive = true
+        self.updateMediaControlVisibility()
+    }
+    
+    @objc func zoomOutGrid() {
+        UIView.animate(withDuration: 0.0, animations: {
+            NCKeychain().mediaColumnCount += 1
+            if CGFloat(NCKeychain().mediaColumnCount) >= self.maxImageGrid - 1 {
+                self.attributesZoomIn = []
+                self.attributesZoomOut = .disabled
+                self.mediaCommandView?.zoomOutButton.isEnabled = false
+            } else if NCKeychain().mediaColumnCount <= 1 {
+                self.attributesZoomIn = .disabled
+                self.attributesZoomOut = []
+                self.mediaCommandView?.zoomInButton.isEnabled = false
+            } else {
+                self.mediaCommandView?.zoomOutButton.isEnabled = true
+                self.mediaCommandView?.zoomInButton.isEnabled = true
+                self.attributesZoomIn = []
+                self.attributesZoomOut = []
+            }
+            self.collectionViewReloadData()
+        })
+    }
+
+    @objc func zoomInGrid() {
+        UIView.animate(withDuration: 0.0, animations: {
+            NCKeychain().mediaColumnCount -= 1
+            if CGFloat(NCKeychain().mediaColumnCount) >= self.maxImageGrid - 1 {
+                self.attributesZoomIn = []
+                self.attributesZoomOut = .disabled
+                self.mediaCommandView?.zoomOutButton.isEnabled = false
+            } else if NCKeychain().mediaColumnCount <= 1 {
+                self.attributesZoomIn = .disabled
+                self.attributesZoomOut = []
+                self.mediaCommandView?.zoomInButton.isEnabled = false
+            } else {
+                self.mediaCommandView?.zoomOutButton.isEnabled = true
+                self.mediaCommandView?.zoomInButton.isEnabled = true
+                self.attributesZoomIn = []
+                self.attributesZoomOut = []
+            }
+            self.collectionViewReloadData()
+        })
+    }
+    
+    func updateMediaControlVisibility() {
+
+        if let metadatas = self.metadatas, metadatas.isEmpty {
+            if !self.showOnlyImages && !self.showOnlyVideos {
+                self.mediaCommandView?.toggleEmptyView(isEmpty: true)
+                self.mediaCommandView?.isHidden = false
+            } else {
+                self.mediaCommandView?.toggleEmptyView(isEmpty: true)
+                self.mediaCommandView?.isHidden = false
+            }
+        } else {
+            self.mediaCommandView?.toggleEmptyView(isEmpty: false)
+            self.mediaCommandView?.isHidden = false
+        }
+    }
+    
+    func updateZoomButton() {
+        var columnCount = NCKeychain().mediaColumnCount
+        if UIDevice.current.userInterfaceIdiom == .phone,
+           (UIDevice.current.orientation == .landscapeLeft || UIDevice.current.orientation == .landscapeRight) {
+            columnCount += 2
+        }
+        if CGFloat(columnCount) >= maxImageGrid - 1 {
+            self.attributesZoomIn = []
+            self.attributesZoomOut = .disabled
+            mediaCommandView?.zoomOutButton.isEnabled = false
+        } else if columnCount <= 1 {
+            self.attributesZoomIn = .disabled
+            self.attributesZoomOut = []
+            mediaCommandView?.zoomInButton.isEnabled = false
+        } else {
+            self.attributesZoomIn = []
+            self.attributesZoomOut = []
+        }
+    }
+    
+    @objc func openMenuButtonMore(_ sender: Any) {
+
+        toggleMenu()
+    }
 }
 
 // MARK: - Collection View
@@ -275,7 +378,7 @@ extension NCMedia: UICollectionViewDelegate {
         if let metadata = self.metadatas?[indexPath.row] {
             if let visibleCells = self.collectionView?.indexPathsForVisibleItems.compactMap({ self.collectionView?.cellForItem(at: $0) }) {
                 for case let cell as NCGridMediaCell in visibleCells {
-                    if cell.ocId == metadata.ocId {
+                    if cell.fileObjectId == metadata.ocId {
                         mediaCell = cell
                     }
                 }
@@ -283,13 +386,15 @@ extension NCMedia: UICollectionViewDelegate {
             if isEditMode {
                 if let index = selectOcId.firstIndex(of: metadata.ocId) {
                     selectOcId.remove(at: index)
+                    selectIndexPath.removeAll(where: { $0 == indexPath })
                     mediaCell?.selected(false)
                 } else {
                     selectOcId.append(metadata.ocId)
+                    selectIndexPath.append(indexPath)
                     mediaCell?.selected(true)
 
                 }
-                tabBarSelect.selectCount = selectOcId.count
+                tabBarSelect?.selectCount = selectOcId.count
             } else {
                 // ACTIVE SERVERURL
                 appDelegate.activeServerUrl = metadata.serverUrl
@@ -309,7 +414,7 @@ extension NCMedia: UICollectionViewDelegate {
         return UIContextMenuConfiguration(identifier: identifier, previewProvider: {
             return NCViewerProviderContextMenu(metadata: metadata, image: image)
         }, actionProvider: { _ in
-            return NCContextMenu().viewMenu(ocId: metadata.ocId, viewController: self, image: image)
+            return NCContextMenu().viewMenu(ocId: metadata.ocId, indexPath: indexPath, viewController: self, image: image)
         })
     }
 
@@ -329,40 +434,21 @@ extension NCMedia: UICollectionViewDataSourcePrefetching {
 }
 
 extension NCMedia: UICollectionViewDataSource {
-    func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
-        if kind == "collectionViewMediaElementKindSectionHeader" {
-            guard let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "sectionHeaderEmptyData", for: indexPath) as? NCSectionHeaderEmptyData else { return NCSectionHeaderEmptyData() }
-            header.emptyImage.image = UIImage(named: "media")?.image(color: .gray, size: UIScreen.main.bounds.width)
-            if loadingTask != nil || imageCache.createMediaCacheInProgress {
-                header.emptyTitle.text = NSLocalizedString("_search_in_progress_", comment: "")
-            } else {
-                header.emptyTitle.text = NSLocalizedString("_tutorial_photo_view_", comment: "")
-            }
-            header.emptyDescription.text = ""
-            return header
-        }
-        return UICollectionReusableView()
-    }
-
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         var numberOfItemsInSection = 0
         if let metadatas { numberOfItemsInSection = metadatas.count }
         if numberOfItemsInSection == 0 {
-            selectOrCancelButton.isHidden = true
-            menuButton.isHidden = false
             gradientView.isHidden = true
             activityIndicatorTrailing.constant = 50
         } else if isEditMode {
-            selectOrCancelButton.isHidden = false
-            menuButton.isHidden = true
             activityIndicatorTrailing.constant = 150
         } else {
-            selectOrCancelButton.isHidden = false
-            menuButton.isHidden = false
             activityIndicatorTrailing.constant = 150
         }
 
+        emptyDataSet?.numberOfItemsInSection(numberOfItemsInSection, section: section)
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) { self.setTitleDate() }
+
         return numberOfItemsInSection
     }
 
@@ -383,15 +469,12 @@ extension NCMedia: UICollectionViewDataSource {
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "gridCell", for: indexPath) as? NCGridMediaCell,
               let metadatas = self.metadatas,
-              let metadata = metadatas[indexPath.row]
-        else {
-            return NCGridMediaCell()
-        }
+              let metadata = metadatas[indexPath.row] else { return UICollectionViewCell() }
 
-        cell.date = metadata.date as Date
-        cell.ocId = metadata.ocId
+        cell.fileDate = metadata.date as Date
+        cell.fileObjectId = metadata.ocId
         cell.indexPath = indexPath
-        cell.user = metadata.ownerId
+        cell.fileUser = metadata.ownerId
         cell.imageStatus.image = nil
         cell.imageItem.contentMode = .scaleAspectFill
 
@@ -432,35 +515,19 @@ extension NCMedia: UICollectionViewDataSource {
 
 // MARK: -
 
-extension NCMedia: NCMediaLayoutDelegate {
-    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, heightForHeaderInSection section: Int) -> Float {
-        var height: Double = 0
-        if metadatas?.count ?? 0 == 0 {
-            height = NCGlobal.shared.getHeightHeaderEmptyData(view: view, portraitOffset: 0, landscapeOffset: -20)
-        }
-        return Float(height)
-    }
-
-    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, heightForFooterInSection section: Int) -> Float {
-        return .zero
-    }
-
-    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, insetForSection section: Int) -> UIEdgeInsets {
-        return .zero
-    }
-
-    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, insetForHeaderInSection section: Int) -> UIEdgeInsets {
-        return .zero
+extension NCMedia: UICollectionViewDelegateFlowLayout {
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForHeaderInSection section: Int) -> CGSize {
+        return CGSize(width: collectionView.frame.width, height: 0)
     }
 
-    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, insetForFooterInSection section: Int) -> UIEdgeInsets {
-        return .zero
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForFooterInSection section: Int) -> CGSize {
+        return CGSize(width: collectionView.frame.width, height: 0)
     }
+}
 
-    func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, minimumInteritemSpacingForSection section: Int) -> Float {
-        return .zero
-    }
+// MARK: -
 
+extension NCMedia: NCMediaLayoutDelegate {
     func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, sizeForItemAtIndexPath indexPath: NSIndexPath, columnCount: Int, mediaLayout: String) -> CGSize {
         let size = CGSize(width: collectionView.frame.width / CGFloat(columnCount), height: collectionView.frame.width / CGFloat(columnCount))
         if mediaLayout == NCGlobal.shared.mediaLayoutRatio {
@@ -518,7 +585,7 @@ extension NCMedia: UIScrollViewDelegate {
 // MARK: -
 
 extension NCMedia: NCSelectDelegate {
-    func dismissSelect(serverUrl: String?, metadata: tableMetadata?, type: String, items: [Any], overwrite: Bool, copy: Bool, move: Bool) {
+    func dismissSelect(serverUrl: String?, metadata: tableMetadata?, type: String, items: [Any], indexPath: [IndexPath], overwrite: Bool, copy: Bool, move: Bool) {
         guard let serverUrl = serverUrl else { return }
         let home = utilityFileSystem.getHomeServer(urlBase: appDelegate.urlBase, userId: appDelegate.userId)
         let mediaPath = serverUrl.replacingOccurrences(of: home, with: "")
@@ -528,3 +595,100 @@ extension NCMedia: NCSelectDelegate {
         startTimer()
     }
 }
+
+// MARK: - Media Command View
+
+class NCMediaCommandView: UIView {
+
+    @IBOutlet weak var moreView: UIVisualEffectView!
+    @IBOutlet weak var gridSwitchButton: UIButton!
+    @IBOutlet weak var separatorView: UIView!
+    @IBOutlet weak var buttonControlWidthConstraint: NSLayoutConstraint!
+    @IBOutlet weak var zoomInButton: UIButton!
+    @IBOutlet weak var zoomOutButton: UIButton!
+    @IBOutlet weak var moreButton: UIButton!
+    @IBOutlet weak var controlButtonView: UIVisualEffectView!
+    @IBOutlet weak var title: UILabel!
+    @IBOutlet weak var activityIndicator: UIActivityIndicatorView!
+
+    var mediaView: NCMedia?
+    private let gradient: CAGradientLayer = CAGradientLayer()
+
+    override func awakeFromNib() {
+        moreView.layer.cornerRadius = 20
+        moreView.layer.masksToBounds = true
+        controlButtonView.layer.cornerRadius = 20
+        controlButtonView.layer.masksToBounds = true
+        controlButtonView.effect = UIBlurEffect(style: .dark)
+        gradient.frame = bounds
+        gradient.startPoint = CGPoint(x: 0, y: 0.5)
+        gradient.endPoint = CGPoint(x: 0, y: 1)
+        gradient.colors = [UIColor.black.withAlphaComponent(UIAccessibility.isReduceTransparencyEnabled ? 0.8 : 0.4).cgColor, UIColor.clear.cgColor]
+        layer.insertSublayer(gradient, at: 0)
+        moreButton.setImage(UIImage(named: "more")!.image(color: .white, size: 25), for: .normal)
+        title.text = ""
+    }
+
+    func toggleEmptyView(isEmpty: Bool) {
+        if isEmpty {
+            UIView.animate(withDuration: 0.3) {
+                self.moreView.effect = UIBlurEffect(style: .dark)
+                self.gradient.isHidden = true
+                self.controlButtonView.isHidden = true
+            }
+        } else {
+            UIView.animate(withDuration: 0.3) {
+                self.moreView.effect = UIBlurEffect(style: .dark)
+                self.gradient.isHidden = false
+                self.controlButtonView.isHidden = false
+            }
+        }
+    }
+
+    @IBAction func moreButtonPressed(_ sender: UIButton) {
+        mediaView?.openMenuButtonMore(sender)
+    }
+
+    @IBAction func zoomInPressed(_ sender: UIButton) {
+        mediaView?.zoomInGrid()
+    }
+
+    @IBAction func zoomOutPressed(_ sender: UIButton) {
+        mediaView?.zoomOutGrid()
+    }
+
+    @IBAction func gridSwitchButtonPressed(_ sender: Any) {
+        self.collapseControlButtonView(false)
+    }
+
+    func collapseControlButtonView(_ collapse: Bool) {
+        if collapse {
+            self.buttonControlWidthConstraint.constant = 40
+            UIView.animate(withDuration: 0.25) {
+                self.zoomOutButton.isHidden = true
+                self.zoomInButton.isHidden = true
+                self.separatorView.isHidden = true
+                self.gridSwitchButton.isHidden = false
+                self.layoutIfNeeded()
+            }
+        } else {
+            self.buttonControlWidthConstraint.constant = 80
+            UIView.animate(withDuration: 0.25) {
+                self.zoomOutButton.isHidden = false
+                self.zoomInButton.isHidden = false
+                self.separatorView.isHidden = false
+                self.gridSwitchButton.isHidden = true
+                self.layoutIfNeeded()
+            }
+        }
+    }
+
+    override func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
+        return moreView.frame.contains(point) || controlButtonView.frame.contains(point)
+    }
+
+    override func layoutSublayers(of layer: CALayer) {
+        super.layoutSublayers(of: layer)
+        gradient.frame = bounds
+    }
+}
diff --git a/iOSClient/Media/NCMediaCommandView.xib b/iOSClient/Media/NCMediaCommandView.xib
new file mode 100644
index 0000000000..b2df2d68eb
--- /dev/null
+++ b/iOSClient/Media/NCMediaCommandView.xib
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
+        <capability name="Image references" minToolsVersion="12.0"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="NCMediaCommandView" customModule="Nextcloud" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <visualEffectView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="i1s-Qa-dG1">
+                    <rect key="frame" x="297" y="69" width="40" height="40"/>
+                    <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="e3Q-e0-SQa">
+                        <rect key="frame" x="0.0" y="0.0" width="40" height="40"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jSO-Vb-jcU">
+                                <rect key="frame" x="0.0" y="0.0" width="40" height="40"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="40" id="5zz-h5-hx9"/>
+                                    <constraint firstAttribute="height" constant="40" id="lzK-bd-NlR"/>
+                                </constraints>
+                                <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <inset key="imageEdgeInsets" minX="12" minY="12" maxX="12" maxY="12"/>
+                                <state key="normal" image="plus.forwardslash.minus" catalog="system">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                </state>
+                                <state key="disabled">
+                                    <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                </state>
+                                <connections>
+                                    <action selector="gridSwitchButtonPressed:" destination="iN0-l3-epB" eventType="touchUpInside" id="0jB-EV-iMe"/>
+                                </connections>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZkU-dK-sp1">
+                                <rect key="frame" x="0.0" y="0.0" width="19.666666666666668" height="40"/>
+                                <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <inset key="imageEdgeInsets" minX="12" minY="12" maxX="12" maxY="12"/>
+                                <state key="normal" image="plus" catalog="system">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                </state>
+                                <state key="disabled">
+                                    <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                </state>
+                                <connections>
+                                    <action selector="zoomInPressed:" destination="iN0-l3-epB" eventType="touchUpInside" id="YPO-oL-Gf5"/>
+                                </connections>
+                            </button>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NwM-bk-QAK">
+                                <rect key="frame" x="19.666666666666686" y="8" width="1" height="24"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="1" id="1cE-rd-mYI"/>
+                                </constraints>
+                            </view>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="swp-Cd-CbD">
+                                <rect key="frame" x="20.666666666666686" y="0.0" width="19.333333333333329" height="40"/>
+                                <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <inset key="imageEdgeInsets" minX="12" minY="12" maxX="12" maxY="12"/>
+                                <state key="normal">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <imageReference key="image" image="minus" catalog="system" symbolScale="default"/>
+                                </state>
+                                <state key="disabled">
+                                    <color key="titleColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                </state>
+                                <connections>
+                                    <action selector="zoomOutPressed:" destination="iN0-l3-epB" eventType="touchUpInside" id="xIo-6p-l7h"/>
+                                </connections>
+                            </button>
+                        </subviews>
+                        <constraints>
+                            <constraint firstItem="NwM-bk-QAK" firstAttribute="top" secondItem="e3Q-e0-SQa" secondAttribute="top" constant="8" id="3V7-Bl-HeS"/>
+                            <constraint firstItem="jSO-Vb-jcU" firstAttribute="centerY" secondItem="e3Q-e0-SQa" secondAttribute="centerY" id="5ap-Yp-VlG"/>
+                            <constraint firstItem="NwM-bk-QAK" firstAttribute="centerX" secondItem="e3Q-e0-SQa" secondAttribute="centerX" id="70K-vU-VR6"/>
+                            <constraint firstItem="NwM-bk-QAK" firstAttribute="leading" secondItem="ZkU-dK-sp1" secondAttribute="trailing" id="Lcu-89-Iys"/>
+                            <constraint firstAttribute="bottom" secondItem="NwM-bk-QAK" secondAttribute="bottom" constant="8" id="O8t-uT-Dhh"/>
+                            <constraint firstItem="jSO-Vb-jcU" firstAttribute="centerX" secondItem="e3Q-e0-SQa" secondAttribute="centerX" id="YFf-Kh-lAp"/>
+                            <constraint firstAttribute="bottom" secondItem="swp-Cd-CbD" secondAttribute="bottom" id="dgT-Np-dTd"/>
+                            <constraint firstItem="ZkU-dK-sp1" firstAttribute="leading" secondItem="e3Q-e0-SQa" secondAttribute="leading" id="fyg-tQ-tfR"/>
+                            <constraint firstItem="ZkU-dK-sp1" firstAttribute="top" secondItem="e3Q-e0-SQa" secondAttribute="top" id="o2e-4h-ylb"/>
+                            <constraint firstAttribute="trailing" secondItem="swp-Cd-CbD" secondAttribute="trailing" id="oaa-Rc-bYC"/>
+                            <constraint firstItem="swp-Cd-CbD" firstAttribute="leading" secondItem="NwM-bk-QAK" secondAttribute="trailing" id="omu-Hf-g4C"/>
+                            <constraint firstAttribute="bottom" secondItem="ZkU-dK-sp1" secondAttribute="bottom" id="pfE-6t-fCg"/>
+                            <constraint firstItem="swp-Cd-CbD" firstAttribute="top" secondItem="e3Q-e0-SQa" secondAttribute="top" id="yoe-G6-vaw"/>
+                        </constraints>
+                    </view>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="40" id="mEu-PL-xc2"/>
+                        <constraint firstAttribute="width" constant="40" id="wkm-j1-5v4"/>
+                    </constraints>
+                    <blurEffect style="regular"/>
+                </visualEffectView>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IxY-xH-yZQ">
+                    <rect key="frame" x="8" y="69" width="281" height="40"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="40" id="S6o-Pa-sxy"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" type="boldSystem" pointSize="24"/>
+                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <visualEffectView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="enp-xt-Y5y">
+                    <rect key="frame" x="345" y="69" width="40" height="40"/>
+                    <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="KKR-Hr-av8">
+                        <rect key="frame" x="0.0" y="0.0" width="40" height="40"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3qs-Hm-qLL">
+                                <rect key="frame" x="0.0" y="0.0" width="40" height="40"/>
+                                <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <inset key="imageEdgeInsets" minX="4" minY="4" maxX="4" maxY="4"/>
+                                <state key="normal" image="ellipsis" catalog="system"/>
+                                <connections>
+                                    <action selector="moreButtonPressed:" destination="iN0-l3-epB" eventType="touchUpInside" id="EeF-Eg-Pqi"/>
+                                </connections>
+                            </button>
+                        </subviews>
+                        <constraints>
+                            <constraint firstAttribute="bottom" secondItem="3qs-Hm-qLL" secondAttribute="bottom" id="B32-ni-kC4"/>
+                            <constraint firstItem="3qs-Hm-qLL" firstAttribute="leading" secondItem="KKR-Hr-av8" secondAttribute="leading" id="NSe-Qy-mmd"/>
+                            <constraint firstItem="3qs-Hm-qLL" firstAttribute="top" secondItem="KKR-Hr-av8" secondAttribute="top" id="URa-a2-sfx"/>
+                            <constraint firstAttribute="trailing" secondItem="3qs-Hm-qLL" secondAttribute="trailing" id="fjn-eP-8DS"/>
+                        </constraints>
+                    </view>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="40" id="Ftv-5S-RKc"/>
+                        <constraint firstAttribute="width" constant="40" id="JJ2-fQ-ew9"/>
+                    </constraints>
+                    <blurEffect style="regular"/>
+                </visualEffectView>
+                <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="white" translatesAutoresizingMaskIntoConstraints="NO" id="XVj-jD-9KA">
+                    <rect key="frame" x="186.66666666666666" y="50" width="20" height="20"/>
+                    <color key="color" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                </activityIndicatorView>
+            </subviews>
+            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
+            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <constraints>
+                <constraint firstItem="XVj-jD-9KA" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="-9" id="Cpb-Vg-sov"/>
+                <constraint firstItem="i1s-Qa-dG1" firstAttribute="leading" secondItem="IxY-xH-yZQ" secondAttribute="trailing" constant="8" id="Owq-aa-Sr6"/>
+                <constraint firstItem="enp-xt-Y5y" firstAttribute="leading" secondItem="i1s-Qa-dG1" secondAttribute="trailing" constant="8" id="XcU-G8-k0a"/>
+                <constraint firstItem="IxY-xH-yZQ" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="8" id="ZhO-pY-Qwi"/>
+                <constraint firstItem="i1s-Qa-dG1" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="10" id="cWc-xe-8un"/>
+                <constraint firstItem="XVj-jD-9KA" firstAttribute="centerX" secondItem="vUN-kp-3ea" secondAttribute="centerX" id="lqb-pC-WUR"/>
+                <constraint firstItem="IxY-xH-yZQ" firstAttribute="centerY" secondItem="i1s-Qa-dG1" secondAttribute="centerY" id="mJJ-pT-yA3"/>
+                <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="enp-xt-Y5y" secondAttribute="trailing" constant="8" id="rSU-Dz-YXW"/>
+                <constraint firstItem="enp-xt-Y5y" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="10" id="z6I-sd-mmD"/>
+            </constraints>
+            <connections>
+                <outlet property="activityIndicator" destination="XVj-jD-9KA" id="cSB-RJ-RCZ"/>
+                <outlet property="buttonControlWidthConstraint" destination="wkm-j1-5v4" id="SHm-F2-NjB"/>
+                <outlet property="controlButtonView" destination="i1s-Qa-dG1" id="5q4-uE-oC5"/>
+                <outlet property="gridSwitchButton" destination="jSO-Vb-jcU" id="geS-eg-obV"/>
+                <outlet property="moreButton" destination="3qs-Hm-qLL" id="OPi-J6-wkl"/>
+                <outlet property="moreView" destination="enp-xt-Y5y" id="Fqg-Wl-V7h"/>
+                <outlet property="separatorView" destination="NwM-bk-QAK" id="wRe-37-oxD"/>
+                <outlet property="title" destination="IxY-xH-yZQ" id="ZNZ-Jy-JbH"/>
+                <outlet property="zoomInButton" destination="ZkU-dK-sp1" id="bC0-Wo-2as"/>
+                <outlet property="zoomOutButton" destination="swp-Cd-CbD" id="wvm-jt-8nI"/>
+            </connections>
+            <point key="canvasLocation" x="138.75" y="152.5"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="ellipsis" catalog="system" width="128" height="37"/>
+        <image name="minus" catalog="system" width="128" height="26"/>
+        <image name="plus" catalog="system" width="128" height="113"/>
+        <image name="plus.forwardslash.minus" catalog="system" width="128" height="115"/>
+    </resources>
+</document>
diff --git a/iOSClient/NCImageCache.swift b/iOSClient/NCImageCache.swift
index 80901dc0f5..0a08f82f72 100644
--- a/iOSClient/NCImageCache.swift
+++ b/iOSClient/NCImageCache.swift
@@ -200,15 +200,15 @@ import RealmSwift
 
         switch NCKeychain().mediaSortDate {
         case "date":
-            return NCManageDatabase.shared.getResultsMetadatas(predicate: predicate ?? predicateBoth, sorted: "date")
+            return NCManageDatabase.shared.getMediaMetadatas(predicate: predicate ?? predicateBoth, sorted: "date")
         case "creationDate":
-            return NCManageDatabase.shared.getResultsMetadatas(predicate: predicate ?? predicateBoth, sorted: "creationDate")
+            return NCManageDatabase.shared.getMediaMetadatas(predicate: predicate ?? predicateBoth, sorted: "creationDate")
         case "uploadDate":
-            return NCManageDatabase.shared.getResultsMetadatas(predicate: predicate ?? predicateBoth, sorted: "uploadDate")
+            return NCManageDatabase.shared.getMediaMetadatas(predicate: predicate ?? predicateBoth, sorted: "uploadDate")
         default:
             break
         }
-        return NCManageDatabase.shared.getResultsMetadatas(predicate: predicate ?? predicateBoth, sorted: "date")
+        return NCManageDatabase.shared.getMediaMetadatas(predicate: predicate ?? predicateBoth, sorted: "date")
     }
 
     // MARK: -
diff --git a/iOSClient/Viewer/NCViewerMedia/NCViewerMediaPage.swift b/iOSClient/Viewer/NCViewerMedia/NCViewerMediaPage.swift
index aba95bbc18..408f452ae9 100644
--- a/iOSClient/Viewer/NCViewerMedia/NCViewerMediaPage.swift
+++ b/iOSClient/Viewer/NCViewerMedia/NCViewerMediaPage.swift
@@ -398,7 +398,8 @@ class NCViewerMediaPage: UIViewController {
 
     @objc func deleteFile(_ notification: NSNotification) {
 
-        guard let userInfo = notification.userInfo as NSDictionary? else { return }
+        guard let userInfo = notification.userInfo as NSDictionary?,
+              let error = userInfo["error"] as? NKError else { return }
 
         if let ocIds = userInfo["ocId"] as? [String],
            let ocId = ocIds.first {
@@ -416,6 +417,9 @@ class NCViewerMediaPage: UIViewController {
                 shiftCurrentPage()
             }
         }
+        if error != .success {
+            NCContentPresenter().showError(error: error)
+        }
     }
 
     @objc func moveFile(_ notification: NSNotification) {