Fix: Fixed issue where app would show a negative elapsed time in case of a future timestamp (#11125)

Author: hishitetsu

src/Files.App/ServicesImplementation/DateTimeFormatter/ApplicationDateTimeFormatter.cs

@@ -25,7 +25,10 @@ public override string ToShortLabel(DateTimeOffset offset)
 				{ TotalHours: >= 1 } => string.Format("HourAgo".GetLocalizedResource(), elapsed.Hours),
 				{ TotalMinutes: >= 2 } => string.Format("MinutesAgo".GetLocalizedResource(), elapsed.Minutes),
 				{ TotalMinutes: >= 1 } => string.Format("MinuteAgo".GetLocalizedResource(), elapsed.Minutes),
-				_ => string.Format("SecondsAgo".GetLocalizedResource(), elapsed.Seconds),
+				{ TotalSeconds: >= 2 } => string.Format("SecondsAgo".GetLocalizedResource(), elapsed.Seconds),
+				{ TotalSeconds: >= 1 } => "OneSecondAgo".GetLocalizedResource(),
+				{ TotalSeconds: >= 0 } => "Now".GetLocalizedResource(),
+				_ => ToString(offset, "D"),
 			};
 		}
 
@@ -38,7 +41,7 @@ public override string ToLongLabel(DateTimeOffset offset)
 				return " ";
 			}
 			var localTime = offset.ToLocalTime();
-			if (elapsed.TotalDays < 7)
+			if (elapsed.TotalDays < 7 && elapsed.TotalSeconds >= 0)
 			{
 				return $"{localTime:D} {localTime:t} ({ToShortLabel(offset)})";
 			}

src/Files.App/Strings/en-US/Resources.resw

@@ -495,6 +495,12 @@
   <data name="SecondsAgo" xml:space="preserve">
     <value>{0} seconds ago</value>
   </data>
+  <data name="OneSecondAgo" xml:space="preserve">
+    <value>1 second ago</value>
+  </data>
+  <data name="Now" xml:space="preserve">
+    <value>Now</value>
+  </data>
   <data name="SettingsOnStartupOpenASpecificPagePath.PlaceholderText" xml:space="preserve">
     <value>New Tab</value>
   </data>
@@ -2886,4 +2892,4 @@
   <data name="BundlesBeingRemovedTitle" xml:space="preserve">
     <value>Bundles will be retiring in a future update 📎</value>
   </data>
-</root>
+</root>

src/Files.App/ViewModels/SettingsViewModels/PreferencesViewModel.cs

@@ -128,7 +128,7 @@ public PreferencesViewModel()
 
 		private void AddDateTimeOptions()
 		{
-			DateTimeOffset sampleDate1 = DateTime.Now;
+			DateTimeOffset sampleDate1 = DateTime.Now.AddSeconds(-5);
 			DateTimeOffset sampleDate2 = new DateTime(sampleDate1.Year - 5, 12, 31, 14, 30, 0);
 			var styles = new DateTimeFormats[] { DateTimeFormats.Application, DateTimeFormats.System, DateTimeFormats.Universal };
 			DateFormats = styles.Select(style => new DateTimeFormatItem(style, sampleDate1, sampleDate2)).ToList();