changed location of BarGraph to be more generic

osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetails.cs

@@ -5,7 +5,7 @@
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Testing;
 using osu.Game.Database;
-using osu.Game.Screens.Select.Details;
+using osu.Game.Screens.Select;
 using System;
 using System.Linq;
 

osu.Game/Graphics/UserInterface/BarGraph.cs

@@ -1,15 +1,48 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using OpenTK;
+using OpenTK.Graphics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using System.Collections.Generic;
+using System.Linq;
 
-namespace osu.Game.Screens.Select.Details
+namespace osu.Game.Graphics.UserInterface
 {
-    public class BeatmapDetailsBar : Container
+    public class BarGraph : FillFlowContainer<Bar>
+    {
+
+        public IEnumerable<float> Values
+        {
+            set
+            {
+                List<float> values = value.ToList();
+                List<Bar> graphBars = Children.ToList();
+                for (int i = 0; i < values.Count; i++)
+                    if (graphBars.Count > i)
+                    {
+                        graphBars[i].Length = values[i] / values.Max();
+                        graphBars[i].Width = 1.0f / values.Count;
+                    }
+                    else
+                        Add(new Bar
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Width = 1.0f / values.Count,
+                            Length = values[i] / values.Max(),
+                            Direction = BarDirection.BottomToTop,
+                            BackgroundColour = new Color4(0, 0, 0, 0),
+                        });
+
+            }
+        }
+
+    }
+
+    public class Bar : Container
     {
         private readonly Box background;
         private readonly Box bar;
@@ -27,7 +60,7 @@ public float Length
             }
             set
             {
-                length = MathHelper.Clamp(value,0,1);
+                length = MathHelper.Clamp(value, 0, 1);
                 updateBarLength();
             }
         }
@@ -70,9 +103,9 @@ public BarDirection Direction
             }
         }
 
-        public BeatmapDetailsBar()
+        public Bar()
         {
-            Children = new []
+            Children = new[]
             {
                 background = new Box
                 {

osu.Game/Screens/Select/BeatmapDetailArea.cs

@@ -8,7 +8,6 @@
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
-using osu.Game.Screens.Select.Details;
 using osu.Game.Screens.Select.Leaderboards;
 
 namespace osu.Game.Screens.Select

osu.Game/Screens/Select/BeatmapDetails.cs

@@ -12,11 +12,12 @@
 using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 
-namespace osu.Game.Screens.Select.Details
+namespace osu.Game.Screens.Select
 {
     public class BeatmapDetails : Container
     {
@@ -30,13 +31,13 @@ public class BeatmapDetails : Container
         private readonly DifficultyRow approachRate;
         private readonly DifficultyRow stars;
 
-        private readonly BeatmapDetailsBar ratingsBar;
+        private readonly Bar ratingsBar;
         private readonly OsuSpriteText negativeRatings;
         private readonly OsuSpriteText positiveRatings;
-        private readonly BeatmapDetailsGraph ratingsGraph;
+        private readonly BarGraph ratingsGraph;
 
-        private readonly BeatmapDetailsGraph retryGraph;
-        private readonly BeatmapDetailsGraph failGraph;
+        private readonly BarGraph retryGraph;
+        private readonly BarGraph failGraph;
 
         private BeatmapInfo beatmap;
         public BeatmapInfo Beatmap
@@ -267,7 +268,7 @@ public BeatmapDetails()
                                             Anchor = Anchor.TopCentre,
                                             Origin = Anchor.TopCentre,
                                         },
-                                        ratingsBar = new BeatmapDetailsBar
+                                        ratingsBar = new Bar
                                         {
                                             RelativeSizeAxes = Axes.X,
                                             Height = 5,
@@ -301,7 +302,7 @@ public BeatmapDetails()
                                             Anchor = Anchor.TopCentre,
                                             Origin = Anchor.TopCentre,
                                         },
-                                        ratingsGraph = new BeatmapDetailsGraph
+                                        ratingsGraph = new BarGraph
                                         {
                                             RelativeSizeAxes = Axes.X,
                                             Direction = FillDirection.Horizontal,
@@ -316,17 +317,17 @@ public BeatmapDetails()
                             Text = "Points of Failure",
                             Font = @"Exo2.0-Medium",
                         },
-                        new Container<BeatmapDetailsGraph>
+                        new Container<BarGraph>
                         {
                             RelativeSizeAxes = Axes.X,
                             Size = new Vector2(1/0.6f, 50),
                             Children = new[]
                             {
-                                retryGraph = new BeatmapDetailsGraph
+                                retryGraph = new BarGraph
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                 },
-                                failGraph = new BeatmapDetailsGraph
+                                failGraph = new BarGraph
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                 },
@@ -357,7 +358,7 @@ private void load(OsuColour colour)
         private class DifficultyRow : Container
         {
             private readonly OsuSpriteText name;
-            private readonly BeatmapDetailsBar bar;
+            private readonly Bar bar;
             private readonly OsuSpriteText valueText;
 
             private float difficultyValue;
@@ -421,7 +422,7 @@ public DifficultyRow()
                     {
                         Font = @"Exo2.0-Medium",
                     },
-                    bar = new BeatmapDetailsBar
+                    bar = new Bar
                     {
                         Origin = Anchor.CentreLeft,
                         Anchor = Anchor.CentreLeft,
@@ -447,10 +448,10 @@ private void load(OsuColour colour)
             }
         }
 
-        private class RetryAndFailBar : Container<BeatmapDetailsBar>
+        private class RetryAndFailBar : Container<Bar>
         {
-            private readonly BeatmapDetailsBar retryBar;
-            private readonly BeatmapDetailsBar failBar;
+            private readonly Bar retryBar;
+            private readonly Bar failBar;
 
             public float RetryLength
             {
@@ -480,14 +481,14 @@ public RetryAndFailBar()
             {
                 Children = new[]
                 {
-                    retryBar = new BeatmapDetailsBar
+                    retryBar = new Bar
                     {
                         RelativeSizeAxes = Axes.Both,
                         Direction = BarDirection.BottomToTop,
                         Length = 0,
                         BackgroundColour = new Color4(0,0,0,0),
                     },
-                    failBar = new BeatmapDetailsBar
+                    failBar = new Bar
                     {
                         RelativeSizeAxes = Axes.Both,
                         Direction = BarDirection.BottomToTop,

osu.Game/Screens/Select/Details/BeatmapDetailsGraph.cs

@@ -1,41 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using OpenTK.Graphics;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace osu.Game.Screens.Select.Details
-{
-    public class BeatmapDetailsGraph : FillFlowContainer<BeatmapDetailsBar>
-    {
-
-        public IEnumerable<float> Values
-        {
-            set
-            {
-                List<float> values = value.ToList();
-                List<BeatmapDetailsBar> graphBars = Children.ToList();
-                for (int i = 0; i < values.Count; i++)
-                    if (graphBars.Count > i)
-                    {
-                        graphBars[i].Length = values[i] / values.Max();
-                        graphBars[i].Width = 1.0f / values.Count;
-                    }
-                    else
-                        Add(new BeatmapDetailsBar
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Width = 1.0f / values.Count,
-                            Length = values[i] / values.Max(),
-                            Direction = BarDirection.BottomToTop,
-                            BackgroundColour = new Color4(0, 0, 0, 0),
-                        });
-
-            }
-        }
-
-    }
-}

osu.Game/osu.Game.csproj

@@ -206,9 +206,8 @@
     <Compile Include="Screens\Play\SkipButton.cs" />
     <Compile Include="Modes\UI\StandardComboCounter.cs" />
     <Compile Include="Screens\Select\BeatmapCarousel.cs" />
-    <Compile Include="Screens\Select\Details\BeatmapDetails.cs" />
-    <Compile Include="Screens\Select\Details\BeatmapDetailsBar.cs" />
-    <Compile Include="Screens\Select\Details\BeatmapDetailsGraph.cs" />
+    <Compile Include="Screens\Select\BeatmapDetails.cs" />
+    <Compile Include="Graphics\UserInterface\BarGraph.cs" />
     <Compile Include="Screens\Select\FilterCriteria.cs" />
     <Compile Include="Screens\Select\Filter\GroupMode.cs" />
     <Compile Include="Screens\Select\Filter\SortMode.cs" />
@@ -391,7 +390,9 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Screens\Select\Details\" />
+  </ItemGroup>
   <ItemGroup />
   <ItemGroup />
   <ItemGroup />