move swift dateDiff

Signed-off-by: Marino Faggiana <8616947+marinofaggiana@users.noreply.github.com>

Share/NCShareExtension+DataSource.swift

@@ -133,7 +133,7 @@ extension NCShareExtension: UICollectionViewDataSource {
             cell.imageItem.image = NCImageCache.images.folder
         }
 
-        cell.labelInfo.text = CCUtility.dateDiff(metadata.date as Date)
+        cell.labelInfo.text = utility.dateDiff(metadata.date as Date)
 
         let lockServerUrl = utilityFileSystem.stringAppendServerUrl(metadata.serverUrl, addFileName: metadata.fileName)
         let tableDirectory = NCManageDatabase.shared.getTableDirectory(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", activeAccount.account, lockServerUrl))

Widget/Files/FilesData.swift

@@ -220,7 +220,7 @@ func getFilesDataEntry(configuration: AccountIntent?, isPreview: Bool, displaySi
                 guard !isLive(file: file, files: files) else { continue }
 
                 // SUBTITLE
-                let subTitle = CCUtility.dateDiff(file.date as Date) + " · " + utilityFileSystem.transformedSize(file.size)
+                let subTitle = utility.dateDiff(file.date as Date) + " · " + utilityFileSystem.transformedSize(file.size)
 
                 // URL: nextcloud://open-file?path=Talk/IMG_0000123.jpg&user=marinofaggiana&link=https://cloud.nextcloud.com/f/123
                 guard var path = utilityFileSystem.getPath(path: file.path, user: file.user, fileName: file.fileName).urlEncoded else { continue }

iOSClient/Activity/NCActivity.swift

@@ -216,7 +216,7 @@ extension NCActivity: UITableViewDataSource {
         cell.labelUser.text = comment.actorDisplayName
         cell.labelUser.textColor = .label
         // Date
-        cell.labelDate.text = CCUtility.dateDiff(comment.creationDateTime as Date)
+        cell.labelDate.text = utility.dateDiff(comment.creationDateTime as Date)
         cell.labelDate.textColor = .systemGray4
         // Message
         cell.labelMessage.text = comment.message
@@ -311,7 +311,7 @@ extension NCActivity: UITableViewDataSource {
                 $0.color = UIColor.lightGray
             }
 
-            subject += "\n" + "<date>" + CCUtility.dateDiff(activity.date as Date) + "</date>"
+            subject += "\n" + "<date>" + utility.dateDiff(activity.date as Date) + "</date>"
             cell.subject.attributedText = subject.set(style: StyleGroup(base: normal, ["bold": bold, "date": date]))
         }
 

iOSClient/Main/Collection Common/NCListCell.swift

@@ -271,7 +271,7 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
     }
 
     func writeInfoDateSize(date: NSDate, size: Int64) {
-        labelInfo.text = CCUtility.dateDiff(date as Date) + " · " + NCUtilityFileSystem().transformedSize(size)
+        labelInfo.text = NCUtility().dateDiff(date as Date) + " · " + NCUtilityFileSystem().transformedSize(size)
     }
 
     func setAccessibility(label: String, value: String) {

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -344,7 +344,7 @@ extension NCCreateFormUploadConflict: UITableViewDataSource {
                     cell.imageAlreadyExistingFile.image = UIImage(named: metadataAlreadyExists.iconName)
                 }
             }
-            cell.labelDetailAlreadyExistingFile.text = CCUtility.dateDiff(metadataAlreadyExists.date as Date) + "\n" + utilityFileSystem.transformedSize(metadataAlreadyExists.size)
+            cell.labelDetailAlreadyExistingFile.text = utility.dateDiff(metadataAlreadyExists.date as Date) + "\n" + utilityFileSystem.transformedSize(metadataAlreadyExists.size)
 
             if metadatasConflictAlreadyExistingFiles.contains(metadataNewFile.ocId) {
                 cell.switchAlreadyExistingFile.isOn = true
@@ -383,7 +383,7 @@ extension NCCreateFormUploadConflict: UITableViewDataSource {
                         let fileDictionary = try FileManager.default.attributesOfItem(atPath: fileNamePath)
                         let fileSize = fileDictionary[FileAttributeKey.size] as? Int64 ?? 0
 
-                        cell.labelDetailNewFile.text = CCUtility.dateDiff(date) + "\n" + utilityFileSystem.transformedSize(fileSize)
+                        cell.labelDetailNewFile.text = utility.dateDiff(date) + "\n" + utilityFileSystem.transformedSize(fileSize)
 
                     } catch { print("Error: \(error)") }
 
@@ -407,7 +407,7 @@ extension NCCreateFormUploadConflict: UITableViewDataSource {
                                         DispatchQueue.main.async { cell.imageNewFile.image = image }
                                     }
                                 }
-                                DispatchQueue.main.async { cell.labelDetailNewFile.text = CCUtility.dateDiff(date) + "\n" + self.utilityFileSystem.transformedSize(fileSize) }
+                                DispatchQueue.main.async { cell.labelDetailNewFile.text = self.utility.dateDiff(date) + "\n" + self.utilityFileSystem.transformedSize(fileSize) }
                             } catch { print("Error: \(error)") }
                         }
                     }
@@ -426,13 +426,10 @@ extension NCCreateFormUploadConflict: UITableViewDataSource {
                     let fileDictionary = try FileManager.default.attributesOfItem(atPath: filePathNewFile)
                     let fileSize = fileDictionary[FileAttributeKey.size] as? Int64 ?? 0
 
-                    cell.labelDetailNewFile.text = CCUtility.dateDiff(metadataNewFile.date as Date) + "\n" + utilityFileSystem.transformedSize(fileSize)
+                    cell.labelDetailNewFile.text = utility.dateDiff(metadataNewFile.date as Date) + "\n" + utilityFileSystem.transformedSize(fileSize)
 
                 } catch { print("Error: \(error)") }
 
-            } else {
-
-                CCUtility.dateDiff(metadataNewFile.date as Date)
             }
 
             if metadatasConflictNewFiles.contains(metadataNewFile.ocId) {

iOSClient/Notification/NCNotification.swift

@@ -159,7 +159,7 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate, NCEmpty
 
         cell.date.text = DateFormatter.localizedString(from: notification.date as Date, dateStyle: .medium, timeStyle: .medium)
         cell.notification = notification
-        cell.date.text = CCUtility.dateDiff(notification.date as Date)
+        cell.date.text = utility.dateDiff(notification.date as Date)
         cell.date.textColor = .gray
         cell.subject.text = notification.subject
         cell.subject.textColor = .label

iOSClient/Select/NCSelect.swift

@@ -38,6 +38,7 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, UIAdaptivePresent
     private let appDelegate = (UIApplication.shared.delegate as? AppDelegate)!
     private var selectCommandViewSelect: NCSelectCommandView?
     let utilityFileSystem = NCUtilityFileSystem()
+    let utility = NCUtility()
 
     @objc enum selectType: Int {
         case select
@@ -388,11 +389,11 @@ extension NCSelect: UICollectionViewDataSource {
             }
             cell.imageItem.image = cell.imageItem.image?.colorizeFolder(metadata: metadata)
 
-            cell.labelInfo.text = CCUtility.dateDiff(metadata.date as Date)
+            cell.labelInfo.text = utility.dateDiff(metadata.date as Date)
 
         } else {
 
-            cell.labelInfo.text = CCUtility.dateDiff(metadata.date as Date) + " · " + utilityFileSystem.transformedSize(metadata.size)
+            cell.labelInfo.text = utility.dateDiff(metadata.date as Date) + " · " + utilityFileSystem.transformedSize(metadata.size)
 
             // image local
             if NCManageDatabase.shared.getTableLocalFile(ocId: metadata.ocId) != nil {

iOSClient/Share/Advanced/NCShareAdvancePermissionHeader.swift

@@ -47,6 +47,6 @@ class NCShareAdvancePermissionHeader: UIView {
         fileName.text = metadata.fileNameView
         fileName.textColor = .label
         info.textColor = .secondaryLabel
-        info.text = utilityFileSystem.transformedSize(metadata.size) + ", " + CCUtility.dateDiff(metadata.date as Date)
+        info.text = utilityFileSystem.transformedSize(metadata.size) + ", " + NCUtility().dateDiff(metadata.date as Date)
     }
 }

iOSClient/Transfers/NCTransferCell.swift

@@ -141,7 +141,7 @@ class NCTransferCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellP
     }
 
     func writeInfoDateSize(date: NSDate, size: Int64) {
-        labelInfo.text = CCUtility.dateDiff(date as Date) + " · " + NCUtilityFileSystem().transformedSize(size)
+        labelInfo.text = NCUtility().dateDiff(date as Date) + " · " + NCUtilityFileSystem().transformedSize(size)
     }
 }
 

iOSClient/Transfers/NCTransfers.swift

@@ -196,7 +196,7 @@ class NCTransfers: NCCollectionViewCommon, NCTransferCellDelegate {
         } else {
             cell.imageItem.image = UIImage(named: "file")
         }
-        cell.labelInfo.text = CCUtility.dateDiff(metadata.date as Date) + " · " + utilityFileSystem.transformedSize(metadata.size)
+        cell.labelInfo.text = utility.dateDiff(metadata.date as Date) + " · " + utilityFileSystem.transformedSize(metadata.size)
         if metadata.status == NCGlobal.shared.metadataStatusDownloading || metadata.status == NCGlobal.shared.metadataStatusUploading {
             cell.progressView.isHidden = false
         } else {

iOSClient/Trash/Cell/NCTrashListCell+NCTrashCellProtocol.swift

@@ -150,7 +150,7 @@ extension NCTrashCellProtocol where Self: UICollectionViewCell {
         self.labelTitle.text = tableTrash.trashbinFileName
         self.labelTitle.textColor = .label
         if self is NCTrashListCell {
-            self.labelInfo?.text = CCUtility.dateDiff(tableTrash.date as Date)
+            self.labelInfo?.text = NCUtility().dateDiff(tableTrash.date as Date)
         } else {
             let dateFormatter = DateFormatter()
             dateFormatter.dateStyle = .short

iOSClient/Utility/CCUtility.h

@@ -34,7 +34,6 @@
 
 @interface CCUtility : NSObject
 
-+ (NSString *)dateDiff:(NSDate *)convertedDate;
 + (NSString *)createFileName:(NSString *)fileName fileDate:(NSDate *)fileDate fileType:(PHAssetMediaType)fileType keyFileName:(NSString *)keyFileName keyFileNameType:(NSString *)keyFileNameType keyFileNameOriginal:(NSString *)keyFileNameOriginal forcedNewFileName:(BOOL)forcedNewFileName;
 + (NSString *)getTitleSectionDate:(NSDate *)date;
 + (NSString *)getMimeType:(NSString *)fileNameView;

iOSClient/Utility/CCUtility.m

@@ -34,43 +34,6 @@
 #pragma mark ===== Various =====
 #pragma --------------------------------------------------------------------------------------------
 
-+ (NSString *)dateDiff:(NSDate *) convertedDate
-{
-    NSDate *todayDate = [NSDate date];
-    double ti = [convertedDate timeIntervalSinceDate:todayDate];
-    ti = ti * -1;
-    if (ti < 60) {
-        return NSLocalizedString(@"_less_a_minute_", nil);
-    } else if (ti < 3600) {
-        int diff = round(ti / 60);
-        if (diff == 1) {
-            return NSLocalizedString(@"_a_minute_ago_", nil);
-        } else {
-            return [NSString stringWithFormat:NSLocalizedString(@"_minutes_ago_", nil), diff];
-        }
-    } else if (ti < 86400) {
-        int diff = round(ti / 60 / 60);
-        if (diff == 1) {
-            return NSLocalizedString(@"_an_hour_ago_", nil);
-        } else {
-            return[NSString stringWithFormat:NSLocalizedString(@"_hours_ago_", nil), diff];
-        }
-    } else if (ti < 86400 * 30) {
-        int diff = round(ti / 60 / 60 / 24);
-        if (diff == 1) {
-            return NSLocalizedString(@"_a_day_ago_", nil);
-        } else {
-            return[NSString stringWithFormat:NSLocalizedString(@"_days_ago_", nil), diff];
-        }
-    } else {
-        // Older than one month
-        NSDateFormatter *df = [[NSDateFormatter alloc] init];
-        [df setFormatterBehavior:NSDateFormatterBehavior10_4];
-        [df setDateStyle:NSDateFormatterMediumStyle];
-        return [df stringFromDate:convertedDate];
-    }
-}
-
 + (NSString *)createFileName:(NSString *)fileName fileDate:(NSDate *)fileDate fileType:(PHAssetMediaType)fileType keyFileName:(NSString *)keyFileName keyFileNameType:(NSString *)keyFileNameType keyFileNameOriginal:(NSString *)keyFileNameOriginal forcedNewFileName:(BOOL)forcedNewFileName
 {
     BOOL addFileNameType = NO;

iOSClient/Utility/NCUtility.swift

@@ -655,4 +655,40 @@ class NCUtility: NSObject {
         return fileName
     }
 
+    func dateDiff(_ date: Date?) -> String {
+
+        guard let date else { return "" }
+        let today = Date()
+        var ti = date.timeIntervalSince(today)
+        ti = ti * -1
+        if ti < 60 {
+            return NSLocalizedString("_less_a_minute_", comment: "")
+        } else if ti < 3600 {
+            let diff = Int(round(ti / 60))
+            if diff == 1 {
+                return NSLocalizedString("_a_minute_ago_", comment: "")
+            } else {
+                return String.localizedStringWithFormat(NSLocalizedString("_minutes_ago_", comment: ""), diff)
+            }
+        } else if ti < 86400 {
+            let diff = Int(round(ti / 60))
+            if diff == 1 {
+                return NSLocalizedString("_an_hour_ago_", comment: "")
+            } else {
+                return String.localizedStringWithFormat(NSLocalizedString("_hours_ago_", comment: ""), diff)
+            }
+        } else if ti < 86400 * 30 {
+            let diff = Int(round(ti / 60 / 60 / 24))
+            if diff == 1 {
+                return NSLocalizedString("_a_day_ago_", comment: "")
+            } else {
+                return String.localizedStringWithFormat(NSLocalizedString("_days_ago_", comment: ""), diff)
+            }
+        } else {
+            let formatter = DateFormatter()
+            formatter.formatterBehavior = .behavior10_4
+            formatter.dateStyle = .medium
+            return formatter.string(from: date)
+        }
+    }
 }