From 3cd6ccfc3d5fe6d45d911800697ac09f1fd906b1 Mon Sep 17 00:00:00 2001 From: Joehu Date: Tue, 30 Apr 2019 20:47:44 -0700 Subject: [PATCH 1/6] Add number sign in front of profile rankings --- osu.Game/Overlays/Profile/Header/Components/RankGraph.cs | 2 +- osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs index bb54d0ac51..1dabf167e3 100644 --- a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs +++ b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs @@ -188,7 +188,7 @@ private Vector2 calculateBallPosition(int index) } } - public string TooltipText => User.Value?.Statistics?.Ranks.Global == null ? "" : $"{ranks[dayIndex].Value:#,##0}|{ranked_days - ranks[dayIndex].Key + 1}"; + public string TooltipText => User.Value?.Statistics?.Ranks.Global == null ? "" : $"#{ranks[dayIndex].Value:#,##0}|{ranked_days - ranks[dayIndex].Key + 1}"; public ITooltip GetCustomTooltip() => new RankGraphTooltip(); diff --git a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs index 9bb0affe7d..61409cdcc2 100644 --- a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs +++ b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs @@ -148,8 +148,8 @@ private void updateDisplay(User user) foreach (var scoreRankInfo in scoreRankInfos) scoreRankInfo.Value.RankCount = user?.Statistics?.GradesCount[scoreRankInfo.Key] ?? 0; - detailGlobalRank.Content = user?.Statistics?.Ranks.Global?.ToString("#,##0") ?? "-"; - detailCountryRank.Content = user?.Statistics?.Ranks.Country?.ToString("#,##0") ?? "-"; + detailGlobalRank.Content = $"#{user?.Statistics?.Ranks.Global?.ToString("#,##0")}" ?? "-"; + detailCountryRank.Content = $"#{user?.Statistics?.Ranks.Country?.ToString("#,##0")}" ?? "-"; rankGraph.User.Value = user; } From 1408513ebd8ac1261ce5228050dac73efe0aec3c Mon Sep 17 00:00:00 2001 From: Joehu Date: Tue, 30 Apr 2019 21:51:56 -0700 Subject: [PATCH 2/6] Use similar check used on tooltip --- osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs index 61409cdcc2..4b883444b5 100644 --- a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs +++ b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs @@ -148,8 +148,8 @@ private void updateDisplay(User user) foreach (var scoreRankInfo in scoreRankInfos) scoreRankInfo.Value.RankCount = user?.Statistics?.GradesCount[scoreRankInfo.Key] ?? 0; - detailGlobalRank.Content = $"#{user?.Statistics?.Ranks.Global?.ToString("#,##0")}" ?? "-"; - detailCountryRank.Content = $"#{user?.Statistics?.Ranks.Country?.ToString("#,##0")}" ?? "-"; + detailGlobalRank.Content = user?.Statistics?.Ranks.Global != null ? $"#{user?.Statistics?.Ranks.Global?.ToString("#,##0")}" : "-"; + detailCountryRank.Content = user?.Statistics?.Ranks.Global != null ? $"#{user?.Statistics?.Ranks.Country?.ToString("#,##0")}" : "-"; rankGraph.User.Value = user; } From 9b2d5727cdd3808807ee8f8020d78a526c0c71ba Mon Sep 17 00:00:00 2001 From: Joehu Date: Tue, 30 Apr 2019 21:54:25 -0700 Subject: [PATCH 3/6] Fix wrong check --- osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs index 4b883444b5..38a00c05e3 100644 --- a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs +++ b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs @@ -149,7 +149,7 @@ private void updateDisplay(User user) scoreRankInfo.Value.RankCount = user?.Statistics?.GradesCount[scoreRankInfo.Key] ?? 0; detailGlobalRank.Content = user?.Statistics?.Ranks.Global != null ? $"#{user?.Statistics?.Ranks.Global?.ToString("#,##0")}" : "-"; - detailCountryRank.Content = user?.Statistics?.Ranks.Global != null ? $"#{user?.Statistics?.Ranks.Country?.ToString("#,##0")}" : "-"; + detailCountryRank.Content = user?.Statistics?.Ranks.Country != null ? $"#{user?.Statistics?.Ranks.Country?.ToString("#,##0")}" : "-"; rankGraph.User.Value = user; } From 6b7397b9cf3332ba596283e411d5bd298468d156 Mon Sep 17 00:00:00 2001 From: Joehu Date: Tue, 30 Apr 2019 22:07:06 -0700 Subject: [PATCH 4/6] Check for null instead of not null --- osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs index 38a00c05e3..bb1fdee787 100644 --- a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs +++ b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs @@ -148,8 +148,8 @@ private void updateDisplay(User user) foreach (var scoreRankInfo in scoreRankInfos) scoreRankInfo.Value.RankCount = user?.Statistics?.GradesCount[scoreRankInfo.Key] ?? 0; - detailGlobalRank.Content = user?.Statistics?.Ranks.Global != null ? $"#{user?.Statistics?.Ranks.Global?.ToString("#,##0")}" : "-"; - detailCountryRank.Content = user?.Statistics?.Ranks.Country != null ? $"#{user?.Statistics?.Ranks.Country?.ToString("#,##0")}" : "-"; + detailGlobalRank.Content = user?.Statistics?.Ranks.Global == null ? "-" : $"#{user?.Statistics?.Ranks.Global?.ToString("#,##0")}"; + detailCountryRank.Content = user?.Statistics?.Ranks.Country == null ? "-" : $"#{user?.Statistics?.Ranks.Country?.ToString("#,##0")}"; rankGraph.User.Value = user; } From b61807da4077eebc51a098bffebbddb296915879 Mon Sep 17 00:00:00 2001 From: jorolf Date: Wed, 1 May 2019 17:55:30 -0700 Subject: [PATCH 5/6] Add number sign inside ToString Co-Authored-By: Joehuu --- osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs index bb1fdee787..8fcf2711dd 100644 --- a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs +++ b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs @@ -148,8 +148,8 @@ private void updateDisplay(User user) foreach (var scoreRankInfo in scoreRankInfos) scoreRankInfo.Value.RankCount = user?.Statistics?.GradesCount[scoreRankInfo.Key] ?? 0; - detailGlobalRank.Content = user?.Statistics?.Ranks.Global == null ? "-" : $"#{user?.Statistics?.Ranks.Global?.ToString("#,##0")}"; - detailCountryRank.Content = user?.Statistics?.Ranks.Country == null ? "-" : $"#{user?.Statistics?.Ranks.Country?.ToString("#,##0")}"; + detailGlobalRank.Content = user?.Statistics?.Ranks.Global?.ToString("\\##,##0") ?? "-"; + detailCountryRank.Content = user?.Statistics?.Ranks.Country?.ToString("\\##,##0") ?? "-"; rankGraph.User.Value = user; } From 015b5cecb50c43fa7f8d45f189738857911bf823 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 2 May 2019 12:53:59 +0900 Subject: [PATCH 6/6] Update framework --- osu.Game/osu.Game.csproj | 2 +- osu.iOS.props | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index f27a3ed776..b5f6be32ed 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 20810886f3..e5b4d61615 100644 --- a/osu.iOS.props +++ b/osu.iOS.props @@ -105,8 +105,8 @@ - - + +