Make optional/move repetitive checks of property values outside item enumeration loop (#2069)

Author: lukeblevins

Files/Filesystem/ListedItem.cs

@@ -160,21 +160,73 @@ public bool IsImage()
             return false;
         }
 
-        public ListedItem(string folderRelativeId)
+        /// <summary>
+        /// Create an item object, optionally with an explicitly-specified dateReturnFormat.
+        /// </summary>
+        /// <param name="folderRelativeId"></param>
+        /// <param name="dateReturnFormat">Specify a date return format to reduce redundant checks of this setting.</param>
+        public ListedItem(string folderRelativeId, string dateReturnFormat = null)
         {
             FolderRelativeId = folderRelativeId;
+            if (dateReturnFormat != null)
+            {
+                DateReturnFormat = dateReturnFormat;
+            }
+            else
+            {
+                ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings;
+                string returnformat = Enum.Parse<TimeStyle>(localSettings.Values[LocalSettings.DateTimeFormat].ToString()) == TimeStyle.Application ? "D" : "g";
+                DateReturnFormat = returnformat;
+            }
         }
 
-        public static string GetFriendlyDate(DateTimeOffset d)
+        private string DateReturnFormat { get; }
+
+        private string GetFriendlyDate(DateTimeOffset d)
         {
-            ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings;
             var elapsed = DateTimeOffset.Now - d;
 
-            string returnformat = Enum.Parse<TimeStyle>(localSettings.Values[LocalSettings.DateTimeFormat].ToString()) == TimeStyle.Application ? "D" : "g";
+            if (elapsed.TotalDays > 7)
+            {
+                return d.ToString(DateReturnFormat);
+            }
+            else if (elapsed.TotalDays > 2)
+            {
+                return string.Format(ResourceController.GetTranslation("DaysAgo"), elapsed.Days);
+            }
+            else if (elapsed.TotalDays > 1)
+            {
+                return string.Format(ResourceController.GetTranslation("DayAgo"), elapsed.Days);
+            }
+            else if (elapsed.TotalHours > 2)
+            {
+                return string.Format(ResourceController.GetTranslation("HoursAgo"), elapsed.Hours);
+            }
+            else if (elapsed.TotalHours > 1)
+            {
+                return string.Format(ResourceController.GetTranslation("HourAgo"), elapsed.Hours);
+            }
+            else if (elapsed.TotalMinutes > 2)
+            {
+                return string.Format(ResourceController.GetTranslation("MinutesAgo"), elapsed.Minutes);
+            }
+            else if (elapsed.TotalMinutes > 1)
+            {
+                return string.Format(ResourceController.GetTranslation("MinuteAgo"), elapsed.Minutes);
+            }
+            else
+            {
+                return string.Format(ResourceController.GetTranslation("SecondsAgo"), elapsed.Seconds);
+            }
+        }
+
+        public static string GetFriendlyDateFromFormat(DateTimeOffset d, string returnFormat)
+        {
+            var elapsed = DateTimeOffset.Now - d;
 
             if (elapsed.TotalDays > 7)
             {
-                return d.ToString(returnformat);
+                return d.ToString(returnFormat);
             }
             else if (elapsed.TotalDays > 2)
             {
@@ -213,7 +265,7 @@ public static string GetFriendlyDate(DateTimeOffset d)
 
     public class RecycleBinItem : ListedItem
     {
-        public RecycleBinItem(string folderRelativeId) : base(folderRelativeId)
+        public RecycleBinItem(string folderRelativeId, string returnFormat) : base(folderRelativeId, returnFormat)
         {
         }
 
@@ -223,7 +275,7 @@ public RecycleBinItem(string folderRelativeId) : base(folderRelativeId)
 
     public class ShortcutItem : ListedItem
     {
-        public ShortcutItem(string folderRelativeId) : base(folderRelativeId)
+        public ShortcutItem(string folderRelativeId, string returnFormat) : base(folderRelativeId, returnFormat)
         {
         }