From 66558ca8c527e44a5739389cf7dd0a716fe65b1b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 18 Mar 2020 17:21:57 +0900
Subject: [PATCH] Colourise hit result statistics

---
 .../Expanded/ExpandedPanelMiddleContent.cs    |  3 +--
 .../Expanded/Statistics/HitResultStatistic.cs | 27 +++++++++++++++++++
 .../Expanded/Statistics/StatisticDisplay.cs   |  6 +++--
 3 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 7a50a96fe7..1de071a228 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Localisation;
@@ -62,7 +61,7 @@ namespace osu.Game.Screens.Ranking.Expanded
 
             var bottomStatistics = new List<StatisticDisplay>();
             foreach (var stat in score.SortedStatistics)
-                bottomStatistics.Add(new CounterStatistic(stat.Key.GetDescription(), stat.Value));
+                bottomStatistics.Add(new HitResultStatistic(stat.Key, stat.Value));
 
             statisticDisplays.AddRange(topStatistics);
             statisticDisplays.AddRange(bottomStatistics);
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
new file mode 100644
index 0000000000..faa4a6a96c
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs
@@ -0,0 +1,27 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Extensions;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Screens.Ranking.Expanded.Statistics
+{
+    public class HitResultStatistic : CounterStatistic
+    {
+        private readonly HitResult result;
+
+        public HitResultStatistic(HitResult result, int count)
+            : base(result.GetDescription(), count)
+        {
+            this.result = result;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            HeaderText.Colour = colours.ForHitResult(result);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticDisplay.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticDisplay.cs
index a653cc82d4..9206c58bc9 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticDisplay.cs
@@ -6,6 +6,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 
@@ -16,8 +17,9 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
     /// </summary>
     public abstract class StatisticDisplay : CompositeDrawable
     {
-        private readonly string header;
+        protected SpriteText HeaderText { get; private set; }
 
+        private readonly string header;
         private Drawable content;
 
         /// <summary>
@@ -53,7 +55,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
                                 RelativeSizeAxes = Axes.Both,
                                 Colour = Color4Extensions.FromHex("#222")
                             },
-                            new OsuSpriteText
+                            HeaderText = new OsuSpriteText
                             {
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,