diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
index 667fd08084..c4178143f8 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
@@ -197,6 +197,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Accuracy = 1,
MaxCombo = 244,
TotalScore = 1707827,
+ Date = DateTime.Now,
Mods = new Mod[]
{
new OsuModHidden(),
@@ -234,6 +235,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Accuracy = 1,
MaxCombo = 244,
TotalScore = 1707827,
+ Date = DateTime.Now.AddSeconds(-30),
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
BeatmapInfo = beatmapInfo,
Ruleset = new OsuRuleset().RulesetInfo,
@@ -254,6 +256,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Accuracy = 1,
MaxCombo = 244,
TotalScore = 1707827,
+ Date = DateTime.Now.AddSeconds(-70),
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
BeatmapInfo = beatmapInfo,
Ruleset = new OsuRuleset().RulesetInfo,
@@ -275,6 +278,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Accuracy = 1,
MaxCombo = 244,
TotalScore = 1707827,
+ Date = DateTime.Now.AddMinutes(-40),
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
BeatmapInfo = beatmapInfo,
Ruleset = new OsuRuleset().RulesetInfo,
@@ -296,6 +300,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Accuracy = 1,
MaxCombo = 244,
TotalScore = 1707827,
+ Date = DateTime.Now.AddHours(-2),
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
BeatmapInfo = beatmapInfo,
Ruleset = new OsuRuleset().RulesetInfo,
@@ -317,6 +322,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Accuracy = 0.9826,
MaxCombo = 244,
TotalScore = 1707827,
+ Date = DateTime.Now.AddHours(-25),
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
BeatmapInfo = beatmapInfo,
Ruleset = new OsuRuleset().RulesetInfo,
@@ -338,6 +344,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Accuracy = 0.9654,
MaxCombo = 244,
TotalScore = 1707827,
+ Date = DateTime.Now.AddHours(-50),
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
BeatmapInfo = beatmapInfo,
Ruleset = new OsuRuleset().RulesetInfo,
@@ -359,6 +366,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Accuracy = 0.6025,
MaxCombo = 244,
TotalScore = 1707827,
+ Date = DateTime.Now.AddHours(-72),
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
BeatmapInfo = beatmapInfo,
Ruleset = new OsuRuleset().RulesetInfo,
@@ -380,6 +388,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Accuracy = 0.5140,
MaxCombo = 244,
TotalScore = 1707827,
+ Date = DateTime.Now.AddMonths(-3),
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
BeatmapInfo = beatmapInfo,
Ruleset = new OsuRuleset().RulesetInfo,
@@ -401,6 +410,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Accuracy = 0.4222,
MaxCombo = 244,
TotalScore = 1707827,
+ Date = DateTime.Now.AddYears(-2),
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
BeatmapInfo = beatmapInfo,
Ruleset = new OsuRuleset().RulesetInfo,
diff --git a/osu.Game/Extensions/TimeDisplayExtensions.cs b/osu.Game/Extensions/TimeDisplayExtensions.cs
index dc05482a05..54af6a5942 100644
--- a/osu.Game/Extensions/TimeDisplayExtensions.cs
+++ b/osu.Game/Extensions/TimeDisplayExtensions.cs
@@ -2,7 +2,9 @@
// See the LICENCE file in the repository root for full licence text.
using System;
+using Humanizer;
using osu.Framework.Localisation;
+using osu.Game.Resources.Localisation.Web;
namespace osu.Game.Extensions
{
@@ -47,5 +49,57 @@ namespace osu.Game.Extensions
return new LocalisableFormattableString(timeSpan, @"mm\:ss");
}
+
+ ///
+ /// Formats a provided date to a short relative string version for compact display.
+ ///
+ /// The time to be displayed.
+ /// A timespan denoting the time length beneath which "now" should be displayed.
+ /// A short relative string representing the input time.
+ public static string ToShortRelativeTime(this DateTimeOffset time, TimeSpan lowerCutoff)
+ {
+ if (time == default)
+ return "-";
+
+ var now = DateTime.Now;
+ var difference = now - time;
+
+ // web uses momentjs's custom locales to format the date for the purposes of the scoreboard.
+ // this is intended to be a best-effort, more legible approximation of that.
+ // compare:
+ // * https://github.com/ppy/osu-web/blob/a8f5a68fb435cb19a4faa4c7c4bce08c4f096933/resources/assets/lib/scoreboard-time.tsx
+ // * https://momentjs.com/docs/#/customization/ (reference for the customisation format)
+
+ // TODO: support localisation (probably via `CommonStrings.CountHours()` etc.)
+ // requires pluralisable string support framework-side
+
+ if (difference < lowerCutoff)
+ return CommonStrings.TimeNow.ToString();
+
+ if (difference.TotalMinutes < 1)
+ return "sec".ToQuantity((int)difference.TotalSeconds);
+ if (difference.TotalHours < 1)
+ return "min".ToQuantity((int)difference.TotalMinutes);
+ if (difference.TotalDays < 1)
+ return "hr".ToQuantity((int)difference.TotalHours);
+
+ // this is where this gets more complicated because of how the calendar works.
+ // since there's no `TotalMonths` / `TotalYears`, we have to iteratively add months/years
+ // and test against cutoff dates to determine how many months/years to show.
+
+ if (time > now.AddMonths(-1))
+ return difference.TotalDays < 2 ? "1dy" : $"{(int)difference.TotalDays}dys";
+
+ for (int months = 1; months <= 11; ++months)
+ {
+ if (time > now.AddMonths(-(months + 1)))
+ return months == 1 ? "1mo" : $"{months}mos";
+ }
+
+ int years = 1;
+ while (time <= now.AddYears(-(years + 1)))
+ years += 1;
+ return years == 1 ? "1yr" : $"{years}yrs";
+ }
}
}
diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index c2393a5de5..ddd9d9a2b2 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
+using System;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation;
@@ -16,6 +17,7 @@ using osu.Framework.Input.Events;
using osu.Framework.Localisation;
using osu.Framework.Platform;
using osu.Game.Database;
+using osu.Game.Extensions;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
@@ -56,7 +58,7 @@ namespace osu.Game.Online.Leaderboards
public GlowingSpriteText ScoreText { get; private set; }
- private Container flagBadgeContainer;
+ private FillFlowContainer flagBadgeAndDateContainer;
private FillFlowContainer modsContainer;
private List statisticsLabels;
@@ -103,7 +105,7 @@ namespace osu.Game.Online.Leaderboards
content = new Container
{
RelativeSizeAxes = Axes.Both,
- Padding = new MarginPadding { Left = rank_width, },
+ Padding = new MarginPadding { Left = rank_width },
Children = new Drawable[]
{
new Container
@@ -158,32 +160,41 @@ namespace osu.Game.Online.Leaderboards
},
new FillFlowContainer
{
- Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft,
+ Origin = Anchor.BottomLeft,
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(10f, 0f),
Children = new Drawable[]
{
- flagBadgeContainer = new Container
+ flagBadgeAndDateContainer = new FillFlowContainer
{
- Origin = Anchor.BottomLeft,
- Anchor = Anchor.BottomLeft,
- Size = new Vector2(87f, 20f),
+ Anchor = Anchor.CentreLeft,
+ Origin = Anchor.CentreLeft,
+ RelativeSizeAxes = Axes.Y,
+ Direction = FillDirection.Horizontal,
+ Spacing = new Vector2(5f, 0f),
+ Width = 87f,
Masking = true,
Children = new Drawable[]
{
new UpdateableFlag(user.Country)
{
- Width = 30,
- RelativeSizeAxes = Axes.Y,
+ Anchor = Anchor.CentreLeft,
+ Origin = Anchor.CentreLeft,
+ Size = new Vector2(30f, 20f),
+ },
+ new DateLabel(Score.Date)
+ {
+ Anchor = Anchor.CentreLeft,
+ Origin = Anchor.CentreLeft,
},
},
},
new FillFlowContainer
{
- Origin = Anchor.BottomLeft,
- Anchor = Anchor.BottomLeft,
+ Origin = Anchor.CentreLeft,
+ Anchor = Anchor.CentreLeft,
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Margin = new MarginPadding { Left = edge_margin },
@@ -243,7 +254,7 @@ namespace osu.Game.Online.Leaderboards
public override void Show()
{
- foreach (var d in new[] { avatar, nameLabel, ScoreText, scoreRank, flagBadgeContainer, modsContainer }.Concat(statisticsLabels))
+ foreach (var d in new[] { avatar, nameLabel, ScoreText, scoreRank, flagBadgeAndDateContainer, modsContainer }.Concat(statisticsLabels))
d.FadeOut();
Alpha = 0;
@@ -270,7 +281,7 @@ namespace osu.Game.Online.Leaderboards
using (BeginDelayedSequence(50))
{
- var drawables = new Drawable[] { flagBadgeContainer, modsContainer }.Concat(statisticsLabels).ToArray();
+ var drawables = new Drawable[] { flagBadgeAndDateContainer, modsContainer }.Concat(statisticsLabels).ToArray();
for (int i = 0; i < drawables.Length; i++)
drawables[i].FadeIn(100 + i * 50);
}
@@ -377,6 +388,17 @@ namespace osu.Game.Online.Leaderboards
public LocalisableString TooltipText { get; }
}
+ private class DateLabel : DrawableDate
+ {
+ public DateLabel(DateTimeOffset date)
+ : base(date)
+ {
+ Font = OsuFont.GetFont(size: 17, weight: FontWeight.Bold, italics: true);
+ }
+
+ protected override string Format() => Date.ToShortRelativeTime(TimeSpan.FromSeconds(30));
+ }
+
public class LeaderboardScoreStatistic
{
public IconUsage Icon;
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreboardTime.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreboardTime.cs
index ff1d3490b4..5018fb8c70 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreboardTime.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreboardTime.cs
@@ -2,9 +2,8 @@
// See the LICENCE file in the repository root for full licence text.
using System;
-using Humanizer;
+using osu.Game.Extensions;
using osu.Game.Graphics;
-using osu.Game.Resources.Localisation.Web;
namespace osu.Game.Overlays.BeatmapSet.Scores
{
@@ -16,41 +15,6 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
}
protected override string Format()
- {
- var now = DateTime.Now;
- var difference = now - Date;
-
- // web uses momentjs's custom locales to format the date for the purposes of the scoreboard.
- // this is intended to be a best-effort, more legible approximation of that.
- // compare:
- // * https://github.com/ppy/osu-web/blob/a8f5a68fb435cb19a4faa4c7c4bce08c4f096933/resources/assets/lib/scoreboard-time.tsx
- // * https://momentjs.com/docs/#/customization/ (reference for the customisation format)
-
- // TODO: support localisation (probably via `CommonStrings.CountHours()` etc.)
- // requires pluralisable string support framework-side
-
- if (difference.TotalHours < 1)
- return CommonStrings.TimeNow.ToString();
- if (difference.TotalDays < 1)
- return "hr".ToQuantity((int)difference.TotalHours);
-
- // this is where this gets more complicated because of how the calendar works.
- // since there's no `TotalMonths` / `TotalYears`, we have to iteratively add months/years
- // and test against cutoff dates to determine how many months/years to show.
-
- if (Date > now.AddMonths(-1))
- return difference.TotalDays < 2 ? "1dy" : $"{(int)difference.TotalDays}dys";
-
- for (int months = 1; months <= 11; ++months)
- {
- if (Date > now.AddMonths(-(months + 1)))
- return months == 1 ? "1mo" : $"{months}mos";
- }
-
- int years = 1;
- while (Date <= now.AddYears(-(years + 1)))
- years += 1;
- return years == 1 ? "1yr" : $"{years}yrs";
- }
+ => Date.ToShortRelativeTime(TimeSpan.FromHours(1));
}
}