From c30b700b3a320d070ceebac14e3f43cdd770661c Mon Sep 17 00:00:00 2001
From: yhsphd <yhsphd05@gmail.com>
Date: Sun, 24 Jan 2021 00:26:52 +0900
Subject: [PATCH 1/3] "started" for past matches

fixes grammar error at 'coming up next' section in schedule screen which displays schedule like "starting an hour ago" for past matches
---
 osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index 88289ad6bd..b3fa9dc91c 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -194,7 +194,7 @@ namespace osu.Game.Tournament.Screens.Schedule
                                         {
                                             new TournamentSpriteText
                                             {
-                                                Text = "Starting ",
+                                                Text = match.NewValue.Date.Value.CompareTo(DateTimeOffset.Now) > 0 ? "Starting " : "Started ",
                                                 Font = OsuFont.Torus.With(size: 24, weight: FontWeight.Regular)
                                             },
                                             new DrawableDate(match.NewValue.Date.Value)

From 899942611fcb085fc09226c84a7bbbd47500450f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 23 Jan 2021 17:01:47 +0100
Subject: [PATCH 2/3] Add tests for time display

---
 .../Screens/TestSceneScheduleScreen.cs        | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
index b240ef3ae5..0da8d1eb4a 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
+using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Tournament.Components;
@@ -16,5 +18,23 @@ namespace osu.Game.Tournament.Tests.Screens
             Add(new TourneyVideo("main") { RelativeSizeAxes = Axes.Both });
             Add(new ScheduleScreen());
         }
+
+        [Test]
+        public void TestCurrentMatchTime()
+        {
+            setMatchDate(TimeSpan.FromDays(-1));
+            setMatchDate(TimeSpan.FromSeconds(5));
+            setMatchDate(TimeSpan.FromMinutes(4));
+            setMatchDate(TimeSpan.FromHours(3));
+        }
+
+        private void setMatchDate(TimeSpan relativeTime)
+            // Humanizer cannot handle negative timespans.
+            => AddStep($"start time is {relativeTime}", () =>
+            {
+                var match = CreateSampleMatch();
+                match.Date.Value = DateTimeOffset.Now + relativeTime;
+                Ladder.CurrentMatch.Value = match;
+            });
     }
 }

From a8fa09103cc0573dff3c0a3f2681293f40f45ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 23 Jan 2021 17:16:13 +0100
Subject: [PATCH 3/3] Update match start text prefix in real time

---
 .../Screens/Schedule/ScheduleScreen.cs        | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index b3fa9dc91c..c1d8c8ddd3 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -192,12 +192,7 @@ namespace osu.Game.Tournament.Screens.Schedule
                                         Origin = Anchor.CentreLeft,
                                         Children = new Drawable[]
                                         {
-                                            new TournamentSpriteText
-                                            {
-                                                Text = match.NewValue.Date.Value.CompareTo(DateTimeOffset.Now) > 0 ? "Starting " : "Started ",
-                                                Font = OsuFont.Torus.With(size: 24, weight: FontWeight.Regular)
-                                            },
-                                            new DrawableDate(match.NewValue.Date.Value)
+                                            new ScheduleMatchDate(match.NewValue.Date.Value)
                                             {
                                                 Font = OsuFont.Torus.With(size: 24, weight: FontWeight.Regular)
                                             }
@@ -251,6 +246,18 @@ namespace osu.Game.Tournament.Screens.Schedule
             }
         }
 
+        public class ScheduleMatchDate : DrawableDate
+        {
+            public ScheduleMatchDate(DateTimeOffset date, float textSize = OsuFont.DEFAULT_FONT_SIZE, bool italic = true)
+                : base(date, textSize, italic)
+            {
+            }
+
+            protected override string Format() => Date < DateTimeOffset.Now
+                ? $"Started {base.Format()}"
+                : $"Starting {base.Format()}";
+        }
+
         public class ScheduleContainer : Container
         {
             protected override Container<Drawable> Content => content;