osu!direct (basic logic and layout)

osu.Desktop.VisualTests/Tests/TestCaseDirect.cs

@@ -0,0 +1,200 @@
+// 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.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Testing;
+using osu.Game.Database;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Direct;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    public class TestCaseDirect : TestCase
+    {
+        public override string Description => @"osu!direct overlay";
+
+        private DirectOverlay direct;
+        private RulesetDatabase rulesets;
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            Add(direct = new DirectOverlay());
+            newBeatmaps();
+            direct.ResultCounts = new ResultCounts(1, 432, 3);
+
+            AddStep(@"Toggle", direct.ToggleVisibility);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(RulesetDatabase rulesets)
+        {
+            this.rulesets = rulesets;
+        }
+
+        private void newBeatmaps()
+        {
+            var ruleset = rulesets.GetRuleset(0);
+
+            direct.BeatmapSets = new[]
+            {
+                new BeatmapSetInfo
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Title = @"OrVid",
+                        Artist = @"An",
+                        Author = @"RLC",
+                        Source = @"",
+                    },
+                    Beatmaps = new List<BeatmapInfo>
+                    {
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 5.35f,
+                            Metadata = new BeatmapMetadata(),
+                            OnlineInfo = new BeatmapOnlineInfo
+                            {
+                                Covers = new[] { @"https://assets.ppy.sh//beatmaps/578332/covers/cover.jpg?1494591390" },
+                                Preview = @"https://b.ppy.sh/preview/578332.mp3",
+                                PlayCount = 97,
+                                FavouriteCount = 72,
+                            },
+                        },
+                    },
+                },
+                new BeatmapSetInfo
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Title = @"tiny lamp",
+                        Artist = @"fhana",
+                        Author = @"Sotarks",
+                        Source = @"ぎんぎつね",
+                    },
+                    Beatmaps = new List<BeatmapInfo>
+                    {
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 5.81f,
+                            Metadata = new BeatmapMetadata(),
+                            OnlineInfo = new BeatmapOnlineInfo
+                            {
+                                Covers = new[] { @"https://assets.ppy.sh//beatmaps/599627/covers/cover.jpg?1494539318" },
+                                Preview = @"https//b.ppy.sh/preview/599627.mp3",
+                                PlayCount = 3082,
+                                FavouriteCount = 14,
+                            },
+                        },
+                    },
+                },
+                new BeatmapSetInfo
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Title = @"At Gwanghwamun",
+                        Artist = @"KYUHYUN",
+                        Author = @"Cerulean Veyron",
+                        Source = @"",
+                    },
+                    Beatmaps = new List<BeatmapInfo>
+                    {
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 0.9f,
+                            Metadata = new BeatmapMetadata(),
+                            OnlineInfo = new BeatmapOnlineInfo
+                            {
+                                Covers = new[] { @"https://assets.ppy.sh//beatmaps/513268/covers/cover.jpg?1494502863" },
+                                Preview = @"https//b.ppy.sh/preview/513268.mp3",
+                                PlayCount = 2762,
+                                FavouriteCount = 15,
+                            },
+                        },
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 1.1f,
+                        },
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 2.02f,
+                        },
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 3.49f,
+                        },
+                    },
+                },
+                new BeatmapSetInfo
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Title = @"RHAPSODY OF BLUE SKY",
+                        Artist = @"fhana",
+                        Author = @"[Kamiya]",
+                        Source = @"小林さんちのメイドラゴン",
+                    },
+                    Beatmaps = new List<BeatmapInfo>
+                    {
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 1.26f,
+                            Metadata = new BeatmapMetadata(),
+                            OnlineInfo = new BeatmapOnlineInfo
+                            {
+                                Covers = new[] { @"https://assets.ppy.sh//beatmaps/586841/covers/cover.jpg?1494052741" },
+                                Preview = @"https//b.ppy.sh/preview/586841.mp3",
+                                PlayCount = 62317,
+                                FavouriteCount = 161,
+                            },
+                        },
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 2.01f,
+                        },
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 2.87f,
+                        },
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 3.76f,
+                        },
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 3.93f,
+                        },
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 4.37f,
+                        },
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 5.13f,
+                        },
+                        new BeatmapInfo
+                        {
+                            Ruleset = ruleset,
+                            StarDifficulty = 5.42f,
+                        },
+                    },
+                },
+            };
+        }
+    }
+}

osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj

@@ -220,6 +220,7 @@
     <Compile Include="Tests\TestCaseLeaderboard.cs" />
     <Compile Include="Beatmaps\TestWorkingBeatmap.cs" />
     <Compile Include="Tests\TestCaseBeatmapDetailArea.cs" />
+    <Compile Include="Tests\TestCaseDirect.cs" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup />

osu.Game/Beatmaps/Drawables/DifficultyColouredContainer.cs

@@ -9,7 +9,7 @@
 
 namespace osu.Game.Beatmaps.Drawables
 {
-    internal class DifficultyColouredContainer : Container, IHasAccentColour
+    public class DifficultyColouredContainer : Container, IHasAccentColour
     {
         public Color4 AccentColour { get; set; }
 

osu.Game/Beatmaps/Drawables/DifficultyIcon.cs

@@ -11,7 +11,7 @@
 namespace osu.Game.Beatmaps.Drawables
 {
 
-    internal class DifficultyIcon : DifficultyColouredContainer
+    public class DifficultyIcon : DifficultyColouredContainer
     {
         private readonly BeatmapInfo beatmap;
 

osu.Game/Database/BeatmapInfo.cs

@@ -43,6 +43,9 @@ public class BeatmapInfo : IEquatable<BeatmapInfo>, IJsonSerializable
         [Ignore]
         public BeatmapMetrics Metrics { get; set; }
 
+        [Ignore]
+        public BeatmapOnlineInfo OnlineInfo { get; set; }
+
         public string Path { get; set; }
 
         [JsonProperty("file_md5")]

osu.Game/Database/BeatmapOnlineInfo.cs

@@ -0,0 +1,38 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace osu.Game.Database
+{
+    /// <summary>
+    /// Beatmap info retrieved for previewing locally without having the beatmap downloaded.
+    /// </summary>
+    public class BeatmapOnlineInfo
+    {
+        /// <summary>
+        /// The different sizes of cover art for this beatmap: cover, cover@2x, card, card@2x, list, list@2x.
+        /// </summary>
+        [JsonProperty(@"covers")]
+        public IEnumerable<string> Covers { get; set; }
+
+        /// <summary>
+        /// A small sample clip of this beatmap's song.
+        /// </summary>
+        [JsonProperty(@"previewUrl")]
+        public string Preview { get; set; }
+
+        /// <summary>
+        /// The amount of plays this beatmap has.
+        /// </summary>
+        [JsonProperty(@"play_count")]
+        public int PlayCount { get; set; }
+
+        /// <summary>
+        /// The amount of people who have favourited this map.
+        /// </summary>
+        [JsonProperty(@"favourite_count")]
+        public int FavouriteCount { get; set; }
+    }
+}

osu.Game/Database/OnlineWorkingBeatmap.cs

@@ -0,0 +1,37 @@
+// 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.Linq;
+using osu.Framework.Audio.Track;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Beatmaps;
+
+namespace osu.Game.Database
+{
+    internal class OnlineWorkingBeatmap : WorkingBeatmap
+    {
+        private readonly TextureStore textures;
+        private readonly TrackManager tracks;
+
+        public OnlineWorkingBeatmap(BeatmapInfo beatmapInfo, TextureStore textures, TrackManager tracks) : base(beatmapInfo)
+        {
+            this.textures = textures;
+            this.tracks = tracks;
+        }
+
+        protected override Beatmap GetBeatmap()
+        {
+            return new Beatmap();
+        }
+
+        protected override Texture GetBackground()
+        {
+            return textures.Get(BeatmapInfo.OnlineInfo.Covers.FirstOrDefault());
+        }
+
+        protected override Track GetTrack()
+        {
+            return tracks.Get(BeatmapInfo.OnlineInfo.Preview);
+        }
+    }
+}

osu.Game/Graphics/Containers/ReverseDepthFillFlowContainer.cs

@@ -0,0 +1,16 @@
+// 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.Collections.Generic;
+using System.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Graphics.Containers
+{
+    public class ReverseDepthFillFlowContainer<T> : FillFlowContainer<T> where T : Drawable
+    {
+        protected override IComparer<Drawable> DepthComparer => new ReverseCreationOrderDepthComparer();
+        protected override IEnumerable<T> FlowingChildren => base.FlowingChildren.Reverse();
+    }
+}

osu.Game/Graphics/UserInterface/OsuDropdown.cs

@@ -113,7 +113,7 @@ private void load(OsuColour colours)
             }
         }
 
-        protected class OsuDropdownHeader : DropdownHeader
+        public class OsuDropdownHeader : DropdownHeader
         {
             private readonly SpriteText label;
             protected override string Label

osu.Game/Graphics/UserInterface/OsuEnumDropdown.cs

@@ -0,0 +1,32 @@
+// 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;
+using System.ComponentModel;
+using System.Reflection;
+using System.Collections.Generic;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public class OsuEnumDropdown<T> : OsuDropdown<T>
+    {
+        public OsuEnumDropdown()
+        {
+            if (!typeof(T).IsEnum)
+                throw new InvalidOperationException("OsuEnumDropdown only supports enums as the generic type argument");
+
+            List<KeyValuePair<string, T>> items = new List<KeyValuePair<string, T>>();
+            foreach(var val in (T[])Enum.GetValues(typeof(T)))
+            {
+                var field = typeof(T).GetField(Enum.GetName(typeof(T), val));
+                items.Add(
+                    new KeyValuePair<string, T>(
+                        field.GetCustomAttribute<DescriptionAttribute>()?.Description ?? Enum.GetName(typeof(T), val),
+                        val
+                    )
+                );
+            }
+            Items = items;
+        }
+    }
+}