Varie bug fix (#3095)

* rename fix Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * cleaning Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * cod Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * background color Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * code improved Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * cod Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * fix Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> --------- Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
nextcloud · Oct 7, 2024 · f972587 · f972587
1 parent 228fa35
commit f972587
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 19 deletions.
diff --git a/File Provider Extension/FileProviderExtension+Actions.swift b/File Provider Extension/FileProviderExtension+Actions.swift
@@ -135,31 +135,23 @@ extension FileProviderExtension {
     }
 
     override func renameItem(withIdentifier itemIdentifier: NSFileProviderItemIdentifier, toName itemName: String, completionHandler: @escaping (NSFileProviderItem?, Error?) -> Void) {
-        guard let metadata = providerUtility.getTableMetadataFromItemIdentifier(itemIdentifier),
-              let directoryTable = self.database.getTableDirectory(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", metadata.account, metadata.serverUrl)) else {
+        guard let metadata = providerUtility.getTableMetadataFromItemIdentifier(itemIdentifier) else {
             return completionHandler(nil, NSFileProviderError(.noSuchItem))
         }
         let fileNameFrom = metadata.fileNameView
         let fileNamePathFrom = metadata.serverUrl + "/" + fileNameFrom
         let fileNamePathTo = metadata.serverUrl + "/" + itemName
         let ocId = metadata.ocId
 
-        NextcloudKit.shared.moveFileOrFolder(serverUrlFileNameSource: fileNamePathFrom, serverUrlFileNameDestination: fileNamePathTo, overwrite: false, account: metadata.account) { account, error in
+        NextcloudKit.shared.moveFileOrFolder(serverUrlFileNameSource: fileNamePathFrom, serverUrlFileNameDestination: fileNamePathTo, overwrite: false, account: metadata.account) { _, error in
             if error == .success {
-                // Rename metadata
+
                 self.database.renameMetadata(fileNameNew: itemName, ocId: ocId)
                 self.database.setMetadataServeUrlFileNameStatusNormal(ocId: ocId)
 
                 guard let metadata = self.database.getMetadataFromOcId(ocId) else {
                     return completionHandler(nil, NSFileProviderError(.noSuchItem))
                 }
-                if metadata.directory {
-                    self.database.setDirectory(serverUrl: fileNamePathFrom, serverUrlTo: fileNamePathTo, encrypted: directoryTable.e2eEncrypted, account: account)
-                } else {
-                    let itemIdentifier = self.providerUtility.getItemIdentifier(metadata: metadata)
-                    self.providerUtility.moveFile(self.utilityFileSystem.getDirectoryProviderStorageOcId(itemIdentifier.rawValue, fileNameView: fileNameFrom), toPath: self.utilityFileSystem.getDirectoryProviderStorageOcId(itemIdentifier.rawValue, fileNameView: itemName))
-                    self.database.setLocalFile(ocId: ocId, fileName: itemName)
-                }
 
                 guard let parentItemIdentifier = self.providerUtility.getParentItemIdentifier(metadata: metadata) else {
                     return completionHandler(nil, NSFileProviderError(.noSuchItem))

diff --git a/iOSClient/Main/Collection Common/Cell/NCPhotoCell.xib b/iOSClient/Main/Collection Common/Cell/NCPhotoCell.xib
@@ -58,6 +58,7 @@
                     </button>
                 </subviews>
             </view>
+            <color key="backgroundColor" systemColor="secondarySystemBackgroundColor"/>
             <constraints>
                 <constraint firstAttribute="bottom" secondItem="PfR-89-FqQ" secondAttribute="bottom" constant="8" id="0XY-5K-ZuW"/>
                 <constraint firstItem="DHy-Up-3Bh" firstAttribute="leading" secondItem="vf1-Kf-9uL" secondAttribute="leading" constant="5" id="1T3-8p-uIW"/>
@@ -87,6 +88,9 @@
     </objects>
     <resources>
         <image name="ellipsis" catalog="system" width="128" height="37"/>
+        <systemColor name="secondarySystemBackgroundColor">
+            <color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
         <systemColor name="systemGray2Color">
             <color red="0.68235294117647061" green="0.68235294117647061" blue="0.69803921568627447" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>

diff --git a/iOSClient/Main/Collection Common/NCCollectionViewCommon+CollectionViewDataSource.swift b/iOSClient/Main/Collection Common/NCCollectionViewCommon+CollectionViewDataSource.swift
@@ -67,13 +67,22 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
 
         cell.ocId = metadata.ocId
         cell.ocIdTransfer = metadata.ocIdTransfer
+        cell.hideButtonMore(true)
+        cell.hideImageStatus(true)
 
         /// Image
         ///
         if let image = NCImageCache.shared.getImageCache(ocId: metadata.ocId, etag: metadata.etag, ext: ext) {
+
             cell.filePreviewImageView?.image = image
             cell.filePreviewImageView?.contentMode = .scaleAspectFill
+
         } else {
+
+            if isPinchGestureActive || ext == global.previewExt512 || ext == global.previewExt1024 {
+                cell.filePreviewImageView?.image = self.utility.getImage(ocId: metadata.ocId, etag: metadata.etag, ext: ext)
+            }
+
             DispatchQueue.global(qos: .userInteractive).async {
                 let image = self.utility.getImage(ocId: metadata.ocId, etag: metadata.etag, ext: ext)
                 if let image {
@@ -82,7 +91,7 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
                         cell.filePreviewImageView?.image = image
                         cell.filePreviewImageView?.contentMode = .scaleAspectFill
                     }
-                } else {
+                } else if !metadata.hasPreview {
                     DispatchQueue.main.async {
                         cell.filePreviewImageView?.contentMode = .scaleAspectFit
                         if metadata.iconName.isEmpty {
@@ -110,10 +119,7 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
             cell.selected(false, isEditMode: isEditMode)
         }
 
-        if width < 100 {
-            cell.hideButtonMore(true)
-            cell.hideImageStatus(true)
-        } else {
+        if width > 100 && cell.filePreviewImageView?.image != nil {
             cell.hideButtonMore(false)
             cell.hideImageStatus(false)
         }

diff --git a/iOSClient/Main/Collection Common/NCCollectionViewCommon.swift b/iOSClient/Main/Collection Common/NCCollectionViewCommon.swift
@@ -135,6 +135,10 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         return totalItems == 0
     }
 
+    var isPinchGestureActive: Bool {
+        return pinchGesture.state == .began || pinchGesture.state == .changed
+    }
+
     // MARK: - View Life Cycle
 
     override func viewDidLoad() {
@@ -236,6 +240,8 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
             collectionView?.collectionViewLayout = mediaLayout
             self.layoutType = global.layoutPhotoSquare
         }
+
+        collectionView.reloadData()
     }
 
     override func viewDidAppear(_ animated: Bool) {
@@ -379,7 +385,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         layoutForView.layout = layoutForView.layout
         self.layoutType = layoutForView.layout
 
-        self.reloadDataSource()
+        collectionView.reloadData()
 
         switch layoutForView.layout {
         case global.layoutList:

diff --git a/iOSClient/Main/Collection Common/NCCollectionViewDownloadThumbnail.swift b/iOSClient/Main/Collection Common/NCCollectionViewDownloadThumbnail.swift
@@ -69,6 +69,12 @@ class NCCollectionViewDownloadThumbnail: ConcurrentOperation, @unchecked Sendabl
                                 filePreviewImageView.layer.borderColor = UIColor.systemGray3.cgColor
                             }
 
+                            if let photoCell = (cell as? NCPhotoCell),
+                               photoCell.bounds.size.width > 100 {
+                                    cell.hideButtonMore(false)
+                                    cell.hideImageStatus(false)
+                            }
+
                             UIView.transition(with: filePreviewImageView,
                                               duration: 0.75,
                                               options: .transitionCrossDissolve,

diff --git a/iOSClient/Media/Cell/NCMediaCell.xib b/iOSClient/Media/Cell/NCMediaCell.xib
@@ -4,6 +4,7 @@
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -44,6 +45,7 @@
                     </imageView>
                 </subviews>
             </view>
+            <color key="backgroundColor" systemColor="secondarySystemBackgroundColor"/>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="r1K-4X-gNd" secondAttribute="trailing" id="1Hu-GT-dJv"/>
                 <constraint firstItem="DHy-Up-3Bh" firstAttribute="leading" secondItem="vf1-Kf-9uL" secondAttribute="leading" constant="5" id="1T3-8p-uIW"/>
@@ -70,5 +72,8 @@
     </objects>
     <resources>
         <image name="checkmark.circle.fill" width="300" height="300"/>
+        <systemColor name="secondarySystemBackgroundColor">
+            <color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
     </resources>
 </document>
diff --git a/iOSClient/Media/NCMedia+CollectionViewDataSource.swift b/iOSClient/Media/NCMedia+CollectionViewDataSource.swift
@@ -104,7 +104,6 @@ extension NCMedia: UICollectionViewDataSource {
         let ext = global.getSizeExtension(column: self.numberOfColumns)
         let imageCache = imageCache.getImageCache(ocId: metadata.ocId, etag: metadata.etag, ext: ext)
 
-        cell.backgroundColor = .secondarySystemBackground
         cell.imageItem.image = imageCache
         cell.date = metadata.date as Date
         cell.ocId = metadata.ocId

diff --git a/iOSClient/Media/NCMediaPinchGesture.swift b/iOSClient/Media/NCMediaPinchGesture.swift
@@ -47,7 +47,6 @@ extension NCMedia {
                     self.collectionView.collectionViewLayout.invalidateLayout()
 
                 } completion: { _ in
-                    self.setTitleDate()
 
                     if let layoutForView = self.database.getLayoutForView(account: self.session.account, key: self.global.layoutViewMedia, serverUrl: "") {
                         layoutForView.columnPhoto = self.numberOfColumns
@@ -86,6 +85,7 @@ extension NCMedia {
             UIView.animate(withDuration: 0.30) {
                 self.currentScale = 1.0
                 self.collectionView.transform = .identity
+                self.setTitleDate()
             }
         default:
             break