Эх сурвалжийг харах

coding

Signed-off-by: marinofaggiana <ios@nextcloud.com>
marinofaggiana 2 жил өмнө
parent
commit
a7656fade9

+ 1 - 1
iOSClient/Data/NCManageDatabase+Metadata.swift

@@ -164,7 +164,7 @@ extension NCManageDatabase {
         completion(metadataFolder, metadataFolders, metadatas)
     }
 
-    @objc func createMetadata(account: String, user: String, userId: String, fileName: String, fileNameView: String, ocId: String, serverUrl: String, urlBase: String, url: String, contentType: String, isLivePhoto: Bool = false, isUrl: Bool = false, name: String = "Files", subline: String? = nil, iconName: String? = nil) -> tableMetadata {
+    @objc func createMetadata(account: String, user: String, userId: String, fileName: String, fileNameView: String, ocId: String, serverUrl: String, urlBase: String, url: String, contentType: String, isLivePhoto: Bool = false, isUrl: Bool = false, name: String = "files", subline: String? = nil, iconName: String? = nil) -> tableMetadata {
 
         let metadata = tableMetadata()
         if isUrl {

+ 12 - 4
iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -93,6 +93,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
             searchController?.obscuresBackgroundDuringPresentation = false
             searchController?.delegate = self
             searchController?.searchBar.delegate = self
+            searchController?.searchBar.autocapitalizationType = .none
             navigationItem.searchController = searchController
             navigationItem.hidesSearchBarWhenScrolling = false
         }
@@ -1371,15 +1372,22 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
             cell.fileObjectId = metadata.ocId
             cell.fileUser = metadata.ownerId
             if isSearching {
-                cell.labelTitle.text = NCUtilityFileSystem.shared.getPath(metadata: metadata)
-                cell.labelTitle.lineBreakMode = .byTruncatingHead
+                if metadata.name == "files" {
+                    cell.labelTitle.text = NCUtilityFileSystem.shared.getPath(metadata: metadata)
+                    cell.labelTitle.lineBreakMode = .byTruncatingHead
+                    cell.labelInfo.text = CCUtility.dateDiff(metadata.date as Date) + " · " + CCUtility.transformedSize(metadata.size)
+                } else {
+                    cell.labelTitle.text = metadata.fileName
+                    cell.labelTitle.lineBreakMode = .byTruncatingTail
+                    cell.labelInfo.text = metadata.subline
+                }
             } else {
                 cell.labelTitle.text = metadata.fileNameView
                 cell.labelTitle.lineBreakMode = .byTruncatingMiddle
-
+                cell.labelInfo.text = CCUtility.dateDiff(metadata.date as Date) + " · " + CCUtility.transformedSize(metadata.size)
             }
+
             cell.labelTitle.textColor = NCBrandColor.shared.label
-            cell.labelInfo.text = CCUtility.dateDiff(metadata.date as Date) + " · " + CCUtility.transformedSize(metadata.size)
             cell.labelInfo.textColor = NCBrandColor.shared.systemGray
 
             cell.imageSelect.image = nil

+ 1 - 1
iOSClient/Networking/NCNetworking.swift

@@ -947,7 +947,7 @@ import Queuer
                     if iconName.isEmpty {
                         iconName = entry.icon
                     }
-                    let metadata = NCManageDatabase.shared.createMetadata(account: urlBase.account, user: urlBase.user, userId: urlBase.userId, fileName: entry.title, fileNameView: entry.title, ocId: NSUUID().uuidString, serverUrl: urlBase.urlBase, urlBase: urlBase.urlBase, url: entry.resourceURL, contentType: "", isUrl: true, name: partialResult.name, subline: entry.subline, iconName: iconName)
+                    let metadata = NCManageDatabase.shared.createMetadata(account: urlBase.account, user: urlBase.user, userId: urlBase.userId, fileName: entry.title, fileNameView: entry.title, ocId: NSUUID().uuidString, serverUrl: urlBase.urlBase, urlBase: urlBase.urlBase, url: entry.resourceURL, contentType: "", isUrl: true, name: partialResult.name.lowercased(), subline: entry.subline, iconName: iconName)
                     searchFiles.insert(metadata)
                 })
             case "files":