Skip to content

Commit d0d8d29

Browse files
NMC 2341 - Merging conflict resolve after NC release 4.9.2
1 parent 7695584 commit d0d8d29

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

iOSClient/Trash/Cell/NCTrashGridCell.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ class NCTrashGridCell: UICollectionViewCell, NCTrashCellProtocol {
156156
imageVisualEffect.effect = UIBlurEffect(style: .extraLight)
157157
imageVisualEffect.backgroundColor = .lightGray
158158
}
159-
imageSelect.image = NCBrandColor.cacheImages.checkedYes
159+
imageSelect.image = NCImageCache.images.checkedYes
160160
imageVisualEffect.isHidden = false
161161
} else {
162162
imageSelect.isHidden = true
@@ -171,7 +171,7 @@ class NCTrashGridCell: UICollectionViewCell, NCTrashCellProtocol {
171171
dateFormatter.timeStyle = .none
172172
dateFormatter.locale = Locale.current
173173

174-
labelInfo.text = dateFormatter.string(from: date as Date) + " · " + CCUtility.transformedSize(size)
174+
labelInfo.text = dateFormatter.string(from: date as Date) + " · " + NCUtilityFileSystem().transformedSize(size)
175175
}
176176

177177
func setAccessibility(label: String, value: String) {

0 commit comments

Comments
 (0)