h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 21:02:54 +08:00
Code Issues Releases Wiki Activity

Tidy up code, remove unnecessary string.Formats

Browse Source
This commit is contained in:
Dean Herbert 2018-06-28 19:19:00 +09:00
parent 98fec94693
commit 0ef5b8f464
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Graphics/DrawableDate.cs
View File

@ -12,14 +12,14 @@ namespace osu.Game.Graphics
{ {
public class DrawableDate : OsuSpriteText, IHasTooltip public class DrawableDate : OsuSpriteText, IHasTooltip
{ {
private readonly DateTimeOffset date; protected readonly DateTimeOffset Date;
public DrawableDate(DateTimeOffset date) public DrawableDate(DateTimeOffset date)
{ {
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
Font = "Exo2.0-RegularItalic"; Font = "Exo2.0-RegularItalic";
this.date = date.ToLocalTime(); this.Date = date.ToLocalTime();
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -38,7 +38,7 @@ namespace osu.Game.Graphics
{ {
updateTime(); updateTime();
var diffToNow = DateTimeOffset.Now.Subtract(date); var diffToNow = DateTimeOffset.Now.Subtract(Date);
double timeUntilNextUpdate = 1000; double timeUntilNextUpdate = 1000;
if (diffToNow.TotalSeconds > 60) if (diffToNow.TotalSeconds > 60)
@ -58,10 +58,10 @@ namespace osu.Game.Graphics
public override bool HandleMouseInput => true; public override bool HandleMouseInput => true;
protected virtual string Format() => date.Humanize(); protected virtual string Format() => Date.Humanize();
private void updateTime() => Text = Format(); private void updateTime() => Text = Format();
public virtual string TooltipText => string.Format($"{date:MMMM d, yyyy h:mm tt \"UTC\"z}"); public virtual string TooltipText => string.Format($"{Date:MMMM d, yyyy h:mm tt \"UTC\"z}");
} }
} }

12
osu.Game/Graphics/DrawableJoinDate.cs
View File

@ -7,17 +7,13 @@ namespace osu.Game.Graphics
{ {
public class DrawableJoinDate : DrawableDate public class DrawableJoinDate : DrawableDate
{ {
private readonly DateTimeOffset date; public DrawableJoinDate(DateTimeOffset date)
: base(date)
public DrawableJoinDate(DateTimeOffset date) : base(date)
{ {
this.date = date;
} }
protected override string Format() => Text = date.ToUniversalTime().Year < 2008 ? protected override string Format() => Text = Date.ToUniversalTime().Year < 2008 ? "Here since the beginning" : $"{Date:MMMM yyyy}";
"Here since the beginning" :
string.Format($"{date:MMMM yyyy}");
public override string TooltipText => string.Format($"{date:MMMM d, yyyy}"); public override string TooltipText => $"{Date:MMMM d, yyyy}";
} }
} }