From 3efb51e4646c332cd8687081987d8093216b10cb Mon Sep 17 00:00:00 2001 From: HoutarouOreki Date: Fri, 25 May 2018 14:00:32 +0200 Subject: [PATCH] Create Format(), override TooltipText.. --- osu.Game/Graphics/DrawableDate.cs | 8 +++----- osu.Game/Graphics/DrawableJoinDate.cs | 8 +++++++- osu.Game/Overlays/Profile/ProfileHeader.cs | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/osu.Game/Graphics/DrawableDate.cs b/osu.Game/Graphics/DrawableDate.cs index 5ca28f17b9..7e16575ed5 100644 --- a/osu.Game/Graphics/DrawableDate.cs +++ b/osu.Game/Graphics/DrawableDate.cs @@ -13,7 +13,6 @@ namespace osu.Game.Graphics public class DrawableDate : OsuSpriteText, IHasTooltip { private readonly DateTimeOffset date; - private readonly string dateFormat; /// The string to format the date text with. /// May be null if the humanized format should be used. @@ -23,7 +22,6 @@ namespace osu.Game.Graphics Font = "Exo2.0-RegularItalic"; this.date = date.ToLocalTime(); - this.dateFormat = dateFormat; } [BackgroundDependencyLoader] @@ -62,9 +60,9 @@ namespace osu.Game.Graphics public override bool HandleMouseInput => true; - private void updateTime() => Text = string.IsNullOrEmpty(dateFormat) ? - date.Humanize() : - string.Format(dateFormat, date); + protected virtual string Format() => Text = date.Humanize(); + + private void updateTime() => Format(); public virtual string TooltipText => string.Format("{0:d MMMM yyyy H:mm \"UTC\"z}", date); } diff --git a/osu.Game/Graphics/DrawableJoinDate.cs b/osu.Game/Graphics/DrawableJoinDate.cs index 1921c9473d..1472eddd8f 100644 --- a/osu.Game/Graphics/DrawableJoinDate.cs +++ b/osu.Game/Graphics/DrawableJoinDate.cs @@ -6,9 +6,15 @@ namespace osu.Game.Graphics { public class DrawableJoinDate : DrawableDate { + private readonly DateTimeOffset date; + public DrawableJoinDate(DateTimeOffset date) : base(date) { - + this.date = date; } + + protected override string Format() => Text = string.Format("{0:MMMM yyyy}", date); + + public override string TooltipText => string.Format("{0:d MMMM yyyy}", date); } } diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs index 4c411b3210..996c6384c9 100644 --- a/osu.Game/Overlays/Profile/ProfileHeader.cs +++ b/osu.Game/Overlays/Profile/ProfileHeader.cs @@ -364,7 +364,7 @@ namespace osu.Game.Overlays.Profile else { infoTextLeft.AddText("Joined ", lightText); - infoTextLeft.AddText(new DrawableDate(user.JoinDate), boldItalic); + infoTextLeft.AddText(new DrawableJoinDate(user.JoinDate), boldItalic); } infoTextLeft.NewLine();