diff --git a/osu.Android.props b/osu.Android.props
index 7bc60ef884..bb283dc0c5 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -61,6 +61,6 @@
-
+
diff --git a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
index 47324ee646..6593531099 100644
--- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
@@ -72,17 +72,11 @@ namespace osu.Game.Graphics.UserInterface
Current.DisabledChanged += disabled => labelText.Alpha = Nub.Alpha = disabled ? 0.3f : 1;
}
- protected override void LoadComplete()
+ [BackgroundDependencyLoader]
+ private void load(AudioManager audio)
{
- base.LoadComplete();
-
- Current.ValueChanged += enabled =>
- {
- if (enabled.NewValue)
- sampleChecked?.Play();
- else
- sampleUnchecked?.Play();
- };
+ sampleChecked = audio.Samples.Get(@"UI/check-on");
+ sampleUnchecked = audio.Samples.Get(@"UI/check-off");
}
protected override bool OnHover(HoverEvent e)
@@ -99,11 +93,13 @@ namespace osu.Game.Graphics.UserInterface
base.OnHoverLost(e);
}
- [BackgroundDependencyLoader]
- private void load(AudioManager audio)
+ protected override void OnUserChange(bool value)
{
- sampleChecked = audio.Samples.Get(@"UI/check-on");
- sampleUnchecked = audio.Samples.Get(@"UI/check-off");
+ base.OnUserChange(value);
+ if (value)
+ sampleChecked?.Play();
+ else
+ sampleUnchecked?.Play();
}
}
}
diff --git a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
index 9cb9d48de7..de760eedfd 100644
--- a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
@@ -196,17 +196,30 @@ namespace osu.Game.Overlays.Profile.Header.Components
}
}
- public string TooltipText => Statistics.Value?.Ranks.Global == null ? "" : $"#{ranks[dayIndex].Value:#,##0}|{ranked_days - ranks[dayIndex].Key + 1}";
+ public object TooltipContent
+ {
+ get
+ {
+ if (Statistics.Value?.Ranks.Global == null)
+ return null;
+
+ var days = ranked_days - ranks[dayIndex].Key + 1;
+
+ return new TooltipDisplayContent
+ {
+ Rank = $"#{ranks[dayIndex].Value:#,##0}",
+ Time = days == 0 ? "now" : $"{days} days ago"
+ };
+ }
+ }
public ITooltip GetCustomTooltip() => new RankGraphTooltip();
- public class RankGraphTooltip : VisibilityContainer, ITooltip
+ private class RankGraphTooltip : VisibilityContainer, ITooltip
{
private readonly OsuSpriteText globalRankingText, timeText;
private readonly Box background;
- public string TooltipText { get; set; }
-
public RankGraphTooltip()
{
AutoSizeAxes = Axes.Both;
@@ -260,11 +273,14 @@ namespace osu.Game.Overlays.Profile.Header.Components
background.Colour = colours.GreySeafoamDark;
}
- public void Refresh()
+ public bool SetContent(object content)
{
- var info = TooltipText.Split('|');
- globalRankingText.Text = info[0];
- timeText.Text = info[1] == "0" ? "now" : $"{info[1]} days ago";
+ if (!(content is TooltipDisplayContent info))
+ return false;
+
+ globalRankingText.Text = info.Rank;
+ timeText.Text = info.Time;
+ return true;
}
private bool instantMove = true;
@@ -280,9 +296,24 @@ namespace osu.Game.Overlays.Profile.Header.Components
this.MoveTo(pos, 200, Easing.OutQuint);
}
+ public void Refresh()
+ {
+ }
+
+ public string TooltipText
+ {
+ set => throw new InvalidOperationException();
+ }
+
protected override void PopIn() => this.FadeIn(200, Easing.OutQuint);
protected override void PopOut() => this.FadeOut(200, Easing.OutQuint);
}
+
+ private class TooltipDisplayContent
+ {
+ public string Rank;
+ public string Time;
+ }
}
}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index f5e4d4b1fb..758c4dda4c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/osu.iOS.props b/osu.iOS.props
index 63fa354418..d6ad35b663 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -118,8 +118,8 @@
-
-
+
+