From d77b0acd906a3fbb1af6bf10ca1f82fff6b9c439 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Mar 2020 16:25:41 +0900
Subject: [PATCH] Move rank colour to OsuColour

---
 osu.Game/Graphics/OsuColour.cs               | 30 +++++++++++++++++++
 osu.Game/Online/Leaderboards/DrawableRank.cs | 31 +-------------------
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index 984f5e52d1..f7ed55410c 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Game.Beatmaps;
+using osu.Game.Scoring;
 using osuTK.Graphics;
 
 namespace osu.Game.Graphics
@@ -37,6 +38,35 @@ namespace osu.Game.Graphics
             }
         }
 
+        /// <summary>
+        /// Retrieves the colour for a <see cref="ScoreRank"/>.
+        /// </summary>
+        public static Color4 ForRank(ScoreRank rank)
+        {
+            switch (rank)
+            {
+                case ScoreRank.XH:
+                case ScoreRank.X:
+                    return Color4Extensions.FromHex(@"ce1c9d");
+
+                case ScoreRank.SH:
+                case ScoreRank.S:
+                    return Color4Extensions.FromHex(@"00a8b5");
+
+                case ScoreRank.A:
+                    return Color4Extensions.FromHex(@"7cce14");
+
+                case ScoreRank.B:
+                    return Color4Extensions.FromHex(@"e3b130");
+
+                case ScoreRank.C:
+                    return Color4Extensions.FromHex(@"f18252");
+
+                default:
+                    return Color4Extensions.FromHex(@"e95353");
+            }
+        }
+
         // See https://github.com/ppy/osu-web/blob/master/resources/assets/less/colors.less
         public readonly Color4 PurpleLighter = Color4Extensions.FromHex(@"eeeeff");
         public readonly Color4 PurpleLight = Color4Extensions.FromHex(@"aa88ff");
diff --git a/osu.Game/Online/Leaderboards/DrawableRank.cs b/osu.Game/Online/Leaderboards/DrawableRank.cs
index 45b91bbf81..0c3ab25044 100644
--- a/osu.Game/Online/Leaderboards/DrawableRank.cs
+++ b/osu.Game/Online/Leaderboards/DrawableRank.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Online.Leaderboards
             FillMode = FillMode.Fit;
             FillAspectRatio = 2;
 
-            var rankColour = getRankColour();
+            var rankColour = OsuColour.ForRank(rank);
             InternalChild = new DrawSizePreservingFillContainer
             {
                 TargetDrawSize = new Vector2(64, 32),
@@ -71,35 +71,6 @@ namespace osu.Game.Online.Leaderboards
 
         private string getRankName() => rank.GetDescription().TrimEnd('+');
 
-        /// <summary>
-        ///  Retrieves the grade background colour.
-        /// </summary>
-        private Color4 getRankColour()
-        {
-            switch (rank)
-            {
-                case ScoreRank.XH:
-                case ScoreRank.X:
-                    return Color4Extensions.FromHex(@"ce1c9d");
-
-                case ScoreRank.SH:
-                case ScoreRank.S:
-                    return Color4Extensions.FromHex(@"00a8b5");
-
-                case ScoreRank.A:
-                    return Color4Extensions.FromHex(@"7cce14");
-
-                case ScoreRank.B:
-                    return Color4Extensions.FromHex(@"e3b130");
-
-                case ScoreRank.C:
-                    return Color4Extensions.FromHex(@"f18252");
-
-                default:
-                    return Color4Extensions.FromHex(@"e95353");
-            }
-        }
-
         /// <summary>
         ///  Retrieves the grade text colour.
         /// </summary>