Skip to content

Commit

Permalink
(revert)
Browse files Browse the repository at this point in the history 
Signed-off-by: Marino Faggiana <[email protected]>
  • Loading branch information
@marinofaggiana
marinofaggiana committed Jul 4, 2024
1 parent 96de02b commit d82c797
Showing 1 changed file with 69 additions and 70 deletions.
139 changes: 69 additions & 70 deletions iOSClient/Main/Collection Common/NCCollectionViewCommon+CollectionViewDataSource.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,14 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
let cell = (cell as? NCCellProtocol) else { return }
let existsIcon = utilityFileSystem.fileProviderStoragePreviewIconExists(metadata.ocId, etag: metadata.etag)

func downloadAvatar(fileName: String, user: String, dispalyName: String?) {
if let image = NCManageDatabase.shared.getImageAvatarLoaded(fileName: fileName) {
cell.fileAvatarImageView?.contentMode = .scaleAspectFill
cell.fileAvatarImageView?.image = image
} else {
NCNetworking.shared.downloadAvatar(user: user, dispalyName: dispalyName, fileName: fileName, cell: cell, view: collectionView)
}
}
/// CONTENT MODE
cell.filePreviewImageView?.layer.borderWidth = 0
if existsIcon {
Expand All @@ -47,9 +55,65 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
cell.filePreviewImageView?.contentMode = .scaleAspectFit
}
cell.fileAvatarImageView?.contentMode = .center
if !metadata.directory, metadata.hasPreviewBorder {
cell.filePreviewImageView?.layer.borderWidth = 0.2
cell.filePreviewImageView?.layer.borderColor = UIColor.lightGray.cgColor
/// THUMBNAIL
if !metadata.directory {
if metadata.hasPreviewBorder {
cell.filePreviewImageView?.layer.borderWidth = 0.2
cell.filePreviewImageView?.layer.borderColor = UIColor.lightGray.cgColor
}
if metadata.name == NCGlobal.shared.appName {
if let image = NCImageCache.shared.getIconImage(ocId: metadata.ocId, etag: metadata.etag) {
cell.filePreviewImageView?.image = image
} else if let image = utility.createFilePreviewImage(ocId: metadata.ocId, etag: metadata.etag, fileNameView: metadata.fileNameView, classFile: metadata.classFile, status: metadata.status, createPreviewMedia: !metadata.hasPreview) {
cell.filePreviewImageView?.image = image
} else {
if metadata.iconName.isEmpty {
cell.filePreviewImageView?.image = NCImageCache.images.file
} else {
cell.filePreviewImageView?.image = utility.loadImage(named: metadata.iconName, useTypeIconFile: true)
}
if metadata.hasPreview && metadata.status == NCGlobal.shared.metadataStatusNormal && !existsIcon {
for case let operation as NCCollectionViewDownloadThumbnail in NCNetworking.shared.downloadThumbnailQueue.operations where operation.metadata.ocId == metadata.ocId { return }
NCNetworking.shared.downloadThumbnailQueue.addOperation(NCCollectionViewDownloadThumbnail(metadata: metadata, cell: cell, collectionView: collectionView))
}
}
} else {
/// APP NAME - UNIFIED SEARCH
switch metadata.iconName {
case let str where str.contains("contacts"):
cell.filePreviewImageView?.image = NCImageCache.images.iconContacts
case let str where str.contains("conversation"):
cell.filePreviewImageView?.image = NCImageCache.images.iconTalk
case let str where str.contains("calendar"):
cell.filePreviewImageView?.image = NCImageCache.images.iconCalendar
case let str where str.contains("deck"):
cell.filePreviewImageView?.image = NCImageCache.images.iconDeck
case let str where str.contains("mail"):
cell.filePreviewImageView?.image = NCImageCache.images.iconMail
case let str where str.contains("talk"):
cell.filePreviewImageView?.image = NCImageCache.images.iconTalk
case let str where str.contains("confirm"):
cell.filePreviewImageView?.image = NCImageCache.images.iconConfirm
case let str where str.contains("pages"):
cell.filePreviewImageView?.image = NCImageCache.images.iconPages
default:
cell.filePreviewImageView?.image = NCImageCache.images.iconFile
}
if !metadata.iconUrl.isEmpty {
if let ownerId = getAvatarFromIconUrl(metadata: metadata) {
let fileName = metadata.userBaseUrl + "-" + ownerId + ".png"
downloadAvatar(fileName: fileName, user: ownerId, dispalyName: nil)
}
}
}
}

/// AVATAR
if !metadata.ownerId.isEmpty,
metadata.ownerId != appDelegate.userId,
appDelegate.account == metadata.account {
let fileName = metadata.userBaseUrl + "-" + metadata.ownerId + ".png"
downloadAvatar(fileName: fileName, user: metadata.ownerId, dispalyName: metadata.ownerDisplayName)
}
}

Expand Down Expand Up @@ -137,7 +201,6 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {

if metadata.directory {
let tableDirectory = NCManageDatabase.shared.getTableDirectory(ocId: metadata.ocId)

if metadata.e2eEncrypted {
cell.filePreviewImageView?.image = NCImageCache.images.folderEncrypted
} else if isShare {
Expand All @@ -157,10 +220,12 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
} else {
cell.filePreviewImageView?.image = NCImageCache.images.folder
}

// Local image: offline
if let tableDirectory, tableDirectory.offline {
cell.fileLocalImage?.image = NCImageCache.images.offlineFlag
}

// color folder
cell.filePreviewImageView?.image = cell.filePreviewImageView?.image?.colorizeFolder(metadata: metadata, tableDirectory: tableDirectory)
} else {
Expand All @@ -173,72 +238,6 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
} else if utilityFileSystem.fileProviderStorageExists(metadata) {
cell.fileLocalImage?.image = NCImageCache.images.local
}
/// THUMBNAIL
if metadata.name == NCGlobal.shared.appName {
if let image = utility.createFilePreviewImage(ocId: metadata.ocId, etag: metadata.etag, fileNameView: metadata.fileNameView, classFile: metadata.classFile, status: metadata.status, createPreviewMedia: !metadata.hasPreview) {
cell.filePreviewImageView?.image = image
} else {
let existsIcon = utilityFileSystem.fileProviderStoragePreviewIconExists(metadata.ocId, etag: metadata.etag)
if metadata.iconName.isEmpty {
cell.filePreviewImageView?.image = NCImageCache.images.file
} else {
cell.filePreviewImageView?.image = utility.loadImage(named: metadata.iconName, useTypeIconFile: true)
}
if metadata.hasPreview && metadata.status == NCGlobal.shared.metadataStatusNormal && !existsIcon {
var foundDownloadThumbnail: Bool = false
for case let operation as NCCollectionViewDownloadThumbnail in NCNetworking.shared.downloadThumbnailQueue.operations where operation.metadata.ocId == metadata.ocId { foundDownloadThumbnail = true }
if !foundDownloadThumbnail {
NCNetworking.shared.downloadThumbnailQueue.addOperation(NCCollectionViewDownloadThumbnail(metadata: metadata, cell: cell, collectionView: collectionView))
}
}
}
} else {
/// APP NAME - UNIFIED SEARCH
switch metadata.iconName {
case let str where str.contains("contacts"):
cell.filePreviewImageView?.image = NCImageCache.images.iconContacts
case let str where str.contains("conversation"):
cell.filePreviewImageView?.image = NCImageCache.images.iconTalk
case let str where str.contains("calendar"):
cell.filePreviewImageView?.image = NCImageCache.images.iconCalendar
case let str where str.contains("deck"):
cell.filePreviewImageView?.image = NCImageCache.images.iconDeck
case let str where str.contains("mail"):
cell.filePreviewImageView?.image = NCImageCache.images.iconMail
case let str where str.contains("talk"):
cell.filePreviewImageView?.image = NCImageCache.images.iconTalk
case let str where str.contains("confirm"):
cell.filePreviewImageView?.image = NCImageCache.images.iconConfirm
case let str where str.contains("pages"):
cell.filePreviewImageView?.image = NCImageCache.images.iconPages
default:
cell.filePreviewImageView?.image = NCImageCache.images.iconFile
}
if !metadata.iconUrl.isEmpty {
if let ownerId = getAvatarFromIconUrl(metadata: metadata) {
let fileName = metadata.userBaseUrl + "-" + ownerId + ".png"
if let image = NCManageDatabase.shared.getImageAvatarLoaded(fileName: fileName) {
cell.fileAvatarImageView?.contentMode = .scaleAspectFill
cell.fileAvatarImageView?.image = image
} else {
NCNetworking.shared.downloadAvatar(user: ownerId, dispalyName: nil, fileName: fileName, cell: cell, view: collectionView)
}
}
}
}
}

/// AVATAR
if !metadata.ownerId.isEmpty,
metadata.ownerId != appDelegate.userId,
appDelegate.account == metadata.account {
let fileName = metadata.userBaseUrl + "-" + metadata.ownerId + ".png"
if let image = NCManageDatabase.shared.getImageAvatarLoaded(fileName: fileName) {
cell.fileAvatarImageView?.contentMode = .scaleAspectFill
cell.fileAvatarImageView?.image = image
} else {
NCNetworking.shared.downloadAvatar(user: metadata.ownerId, dispalyName: metadata.ownerDisplayName, fileName: fileName, cell: cell, view: collectionView)
}
}

// image Favorite
Expand Down

0 comments on commit d82c797

Please sign in to comment.