Keep one object per file

osu.Desktop.VisualTests/Tests/TestCaseDirect.cs

@@ -25,7 +25,7 @@ namespace osu.Desktop.VisualTests.Tests
             newBeatmaps();
 
             AddStep(@"toggle", direct.ToggleVisibility);
-            AddStep(@"result counts", () => direct.ResultCounts = new ResultCounts(1, 4, 13));
+            AddStep(@"result counts", () => direct.ResultAmounts = new DirectOverlay.ResultCounts(1, 4, 13));
         }
 
         [BackgroundDependencyLoader]

osu.Game/Database/RankStatus.cs

@@ -0,0 +1,23 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.ComponentModel;
+
+namespace osu.Game.Database
+{
+    public enum RankStatus
+    {
+    	Any = 7,
+    	[Description("Ranked & Approved")]
+    	RankedApproved = 0,
+    	Approved = 1,
+    	Loved = 8,
+    	Favourites = 2,
+    	[Description("Mod Requests")]
+    	ModRequests = 3,
+    	Pending = 4,
+    	Graveyard = 5,
+    	[Description("My Maps")]
+    	MyMaps = 6,
+    }
+}

osu.Game/Overlays/Direct/FilterControl.cs

@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.ComponentModel;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Allocation;
@@ -14,8 +13,6 @@ using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 
-using Container = osu.Framework.Graphics.Containers.Container;
-
 namespace osu.Game.Overlays.Direct
 {
     public class FilterControl : Container
@@ -30,7 +27,7 @@ namespace osu.Game.Overlays.Direct
         public readonly SearchTextBox Search;
         public readonly SortTabControl SortTabs;
         public readonly OsuEnumDropdown<RankStatus> RankStatusDropdown;
-        public readonly Bindable<PanelDisplayStyle> DisplayStyle = new Bindable<PanelDisplayStyle>();
+        public readonly Bindable<DirectOverlay.PanelDisplayStyle> DisplayStyle = new Bindable<DirectOverlay.PanelDisplayStyle>();
 
         protected override bool InternalContains(Vector2 screenSpacePos) => base.InternalContains(screenSpacePos) || RankStatusDropdown.Contains(screenSpacePos);
 
@@ -38,7 +35,7 @@ namespace osu.Game.Overlays.Direct
         {
             RelativeSizeAxes = Axes.X;
             Height = HEIGHT;
-            DisplayStyle.Value = PanelDisplayStyle.Grid;
+            DisplayStyle.Value = DirectOverlay.PanelDisplayStyle.Grid;
 
             Children = new Drawable[]
             {
@@ -96,8 +93,8 @@ namespace osu.Game.Overlays.Direct
                             Direction = FillDirection.Horizontal,
                             Children = new[]
                             {
-                                new DisplayStyleToggleButton(FontAwesome.fa_th_large, PanelDisplayStyle.Grid, DisplayStyle),
+                                new DisplayStyleToggleButton(FontAwesome.fa_th_large, DirectOverlay.PanelDisplayStyle.Grid, DisplayStyle),
-                                new DisplayStyleToggleButton(FontAwesome.fa_list_ul, PanelDisplayStyle.List, DisplayStyle),
+                                new DisplayStyleToggleButton(FontAwesome.fa_list_ul, DirectOverlay.PanelDisplayStyle.List, DisplayStyle),
                             },
                         },
                         RankStatusDropdown = new SlimEnumDropdown<RankStatus>
@@ -195,10 +192,10 @@ namespace osu.Game.Overlays.Direct
         private class DisplayStyleToggleButton : ClickableContainer
         {
             private readonly TextAwesome icon;
-            private readonly PanelDisplayStyle style;
+            private readonly DirectOverlay.PanelDisplayStyle style;
-            private readonly Bindable<PanelDisplayStyle> bindable;
+            private readonly Bindable<DirectOverlay.PanelDisplayStyle> bindable;
 
-            public DisplayStyleToggleButton(FontAwesome icon, PanelDisplayStyle style, Bindable<PanelDisplayStyle> bindable)
+            public DisplayStyleToggleButton(FontAwesome icon, DirectOverlay.PanelDisplayStyle style, Bindable<DirectOverlay.PanelDisplayStyle> bindable)
             {
                 this.bindable = bindable;
                 this.style = style;
@@ -222,7 +219,7 @@ namespace osu.Game.Overlays.Direct
                 Action = () => bindable.Value = this.style;
             }
 
-            private void Bindable_ValueChanged(PanelDisplayStyle style)
+            private void Bindable_ValueChanged(DirectOverlay.PanelDisplayStyle style)
             {
                 icon.FadeTo(style == this.style ? 1.0f : 0.5f, 100);
             }
@@ -233,40 +230,4 @@ namespace osu.Game.Overlays.Direct
             }
         }
     }
-
-    public class ResultCounts
-    {
-        public readonly int Artists;
-        public readonly int Songs;
-        public readonly int Tags;
-
-        public ResultCounts(int artists, int songs, int tags)
-        {
-            Artists = artists;
-            Songs = songs;
-            Tags = tags;
-        }
-    }
-
-    public enum RankStatus
-    {
-        Any,
-        [Description("Ranked & Approved")]
-        RankedApproved,
-        Approved,
-        Loved,
-        Favourites,
-        [Description("Mod Requests")]
-        ModRequests,
-        Pending,
-        Graveyard,
-        [Description("My Maps")]
-        MyMaps,
-    }
-
-    public enum PanelDisplayStyle
-    {
-        Grid,
-        List,
-    }
 }

osu.Game/Overlays/DirectOverlay.cs

@@ -15,6 +15,8 @@ using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays.Direct;
 
+using Container = osu.Framework.Graphics.Containers.Container;
+
 namespace osu.Game.Overlays
 {
     public class DirectOverlay : WaveOverlayContainer
@@ -41,12 +43,12 @@ namespace osu.Game.Overlays
         }
 
         private ResultCounts resultCounts;
-        public ResultCounts ResultCounts
+        public ResultCounts ResultAmounts
         {
             get { return resultCounts; }
             set
             {
-                if (value == ResultCounts) return;
+                if (value == ResultAmounts) return;
                 resultCounts = value;
 
                 updateResultCounts();
@@ -166,12 +168,12 @@ namespace osu.Game.Overlays
 
         private void updateResultCounts()
         {
-            resultCountsContainer.FadeTo(ResultCounts == null ? 0f : 1f, 200, EasingTypes.Out);
+            resultCountsContainer.FadeTo(ResultAmounts == null ? 0f : 1f, 200, EasingTypes.Out);
-            if (ResultCounts == null) return;
+            if (ResultAmounts == null) return;
 
-            resultCountsText.Text = pluralize("Artist", ResultCounts.Artists) + ", " +
+            resultCountsText.Text = pluralize("Artist", ResultAmounts.Artists) + ", " +
-                                    pluralize("Song", ResultCounts.Songs) + ", " +
+                                    pluralize("Song", ResultAmounts.Songs) + ", " +
-                                    pluralize("Tag", ResultCounts.Tags);
+                                    pluralize("Tag", ResultAmounts.Tags);
         }
 
         private string pluralize(string prefix, int value)
@@ -204,5 +206,25 @@ namespace osu.Game.Overlays
 
             filter.Search.HoldFocus = false;
         }
+
+        public class ResultCounts
+        {
+        	public readonly int Artists;
+        	public readonly int Songs;
+        	public readonly int Tags;
+
+        	public ResultCounts(int artists, int songs, int tags)
+        	{
+        		Artists = artists;
+        		Songs = songs;
+        		Tags = tags;
+        	}
+        }
+
+        public enum PanelDisplayStyle
+        {
+	        Grid,
+            List,
+        }
     }
 }

osu.Game/osu.Game.csproj

@@ -439,6 +439,7 @@
     <Compile Include="Database\BeatmapOnlineInfo.cs" />
     <Compile Include="Overlays\Direct\SlimEnumDropdown.cs" />
     <Compile Include="Graphics\Containers\ReverseDepthFillFlowContainer.cs" />
+    <Compile Include="Database\RankStatus.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">