Further refactorings

osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs

@@ -16,10 +16,10 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestScenePlaylistOverlay : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new Type[]
+        public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(PlaylistOverlay),
-            typeof(PlaylistList)
+            typeof(Playlist)
         };
 
         private readonly BindableList<BeatmapSetInfo> beatmapSets = new BindableList<BeatmapSetInfo>();

osu.Game/Overlays/Music/DrawablePlaylistItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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 System;
@@ -19,49 +19,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Music
 {
-    public class PlaylistList : RearrangeableListContainer<BeatmapSetInfo>
+    public class DrawablePlaylistItem : RearrangeableListItem<BeatmapSetInfo>, IFilterable
-    {
-        public Action<BeatmapSetInfo> RequestSelection;
-
-        public readonly Bindable<BeatmapSetInfo> SelectedSet = new Bindable<BeatmapSetInfo>();
-
-        public new MarginPadding Padding
-        {
-            get => base.Padding;
-            set => base.Padding = value;
-        }
-
-        public void Filter(string searchTerm) => ((PlaylistListFlowContainer)ListContainer).SearchTerm = searchTerm;
-
-        public BeatmapSetInfo FirstVisibleSet => ListContainer.FlowingChildren.Cast<DrawablePlaylistListItem>().FirstOrDefault(i => i.MatchingFilter)?.Model;
-
-        private void removeBeatmapSets(IEnumerable<BeatmapSetInfo> sets) => Schedule(() =>
-        {
-            foreach (var item in sets)
-                Items.Remove(ListContainer.Children.Select(d => d.Model).FirstOrDefault(m => m == item));
-        });
-
-        protected override DrawableRearrangeableListItem<BeatmapSetInfo> CreateDrawable(BeatmapSetInfo item) => new DrawablePlaylistListItem(item)
-        {
-            SelectedSet = { BindTarget = SelectedSet },
-            RequestSelection = set => RequestSelection?.Invoke(set)
-        };
-
-        protected override ScrollContainer<Drawable> CreateScrollContainer() => new OsuScrollContainer();
-
-        protected override FillFlowContainer<DrawableRearrangeableListItem<BeatmapSetInfo>> CreateListFillFlowContainer() => new PlaylistListFlowContainer
-        {
-            Spacing = new Vector2(0, 3),
-            LayoutDuration = 200,
-            LayoutEasing = Easing.OutQuint,
-        };
-    }
-
-    public class PlaylistListFlowContainer : SearchContainer<DrawableRearrangeableListItem<BeatmapSetInfo>>
-    {
-    }
-
-    public class DrawablePlaylistListItem : DrawableRearrangeableListItem<BeatmapSetInfo>, IFilterable
     {
         private const float fade_duration = 100;
 
@@ -77,7 +35,7 @@ namespace osu.Game.Overlays.Music
         private Color4 hoverColour;
         private Color4 artistColour;
 
-        public DrawablePlaylistListItem(BeatmapSetInfo item)
+        public DrawablePlaylistItem(BeatmapSetInfo item)
             : base(item)
         {
             RelativeSizeAxes = Axes.X;

osu.Game/Overlays/Music/Playlist.cs

@@ -0,0 +1,46 @@
+// 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 System;
+using System.Linq;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics.Containers;
+using osuTK;
+
+namespace osu.Game.Overlays.Music
+{
+    public class Playlist : RearrangeableListContainer<BeatmapSetInfo>
+    {
+        public Action<BeatmapSetInfo> RequestSelection;
+
+        public readonly Bindable<BeatmapSetInfo> SelectedSet = new Bindable<BeatmapSetInfo>();
+
+        public new MarginPadding Padding
+        {
+            get => base.Padding;
+            set => base.Padding = value;
+        }
+
+        public void Filter(string searchTerm) => ((SearchContainer<RearrangeableListItem<BeatmapSetInfo>>)ListContainer).SearchTerm = searchTerm;
+
+        public BeatmapSetInfo FirstVisibleSet => Items.FirstOrDefault(i => ((DrawablePlaylistItem)ItemMap[i]).MatchingFilter);
+
+        protected override RearrangeableListItem<BeatmapSetInfo> CreateDrawable(BeatmapSetInfo item) => new DrawablePlaylistItem(item)
+        {
+            SelectedSet = { BindTarget = SelectedSet },
+            RequestSelection = set => RequestSelection?.Invoke(set)
+        };
+
+        protected override ScrollContainer<Drawable> CreateScrollContainer() => new OsuScrollContainer();
+
+        protected override FillFlowContainer<RearrangeableListItem<BeatmapSetInfo>> CreateListFillFlowContainer() => new SearchContainer<RearrangeableListItem<BeatmapSetInfo>>
+        {
+            Spacing = new Vector2(0, 3),
+            LayoutDuration = 200,
+            LayoutEasing = Easing.OutQuint,
+        };
+    }
+}

osu.Game/Overlays/Music/PlaylistItem.cs

@@ -1,183 +0,0 @@
-// 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 System;
-using System.Collections.Generic;
-using System.Linq;
-using osuTK.Graphics;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.Events;
-using osu.Framework.Localisation;
-using osu.Game.Beatmaps;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osuTK;
-
-namespace osu.Game.Overlays.Music
-{
-    public class PlaylistItem : Container, IFilterable, IDraggable
-    {
-        private const float fade_duration = 100;
-
-        private Color4 hoverColour;
-        private Color4 artistColour;
-
-        private SpriteIcon handle;
-        private TextFlowContainer text;
-        private IEnumerable<Drawable> titleSprites;
-        private ILocalisedBindableString titleBind;
-        private ILocalisedBindableString artistBind;
-
-        public readonly BeatmapSetInfo BeatmapSetInfo;
-
-        public Action<BeatmapSetInfo> OnSelect;
-
-        public bool IsDraggable { get; private set; }
-
-        protected override bool OnMouseDown(MouseDownEvent e)
-        {
-            IsDraggable = handle.IsHovered;
-            return base.OnMouseDown(e);
-        }
-
-        protected override void OnMouseUp(MouseUpEvent e)
-        {
-            IsDraggable = false;
-            base.OnMouseUp(e);
-        }
-
-        private bool selected;
-
-        public bool Selected
-        {
-            get => selected;
-            set
-            {
-                if (value == selected) return;
-
-                selected = value;
-
-                FinishTransforms(true);
-                foreach (Drawable s in titleSprites)
-                    s.FadeColour(Selected ? hoverColour : Color4.White, fade_duration);
-            }
-        }
-
-        public PlaylistItem(BeatmapSetInfo setInfo)
-        {
-            BeatmapSetInfo = setInfo;
-
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-            Padding = new MarginPadding { Top = 3, Bottom = 3 };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours, LocalisationManager localisation)
-        {
-            hoverColour = colours.Yellow;
-            artistColour = colours.Gray9;
-
-            var metadata = BeatmapSetInfo.Metadata;
-            FilterTerms = metadata.SearchableTerms;
-
-            Children = new Drawable[]
-            {
-                handle = new PlaylistItemHandle
-                {
-                    Colour = colours.Gray5
-                },
-                text = new OsuTextFlowContainer
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Padding = new MarginPadding { Left = 20 },
-                    ContentIndent = 10f,
-                },
-            };
-
-            titleBind = localisation.GetLocalisedString(new LocalisedString((metadata.TitleUnicode, metadata.Title)));
-            artistBind = localisation.GetLocalisedString(new LocalisedString((metadata.ArtistUnicode, metadata.Artist)));
-
-            artistBind.BindValueChanged(_ => recreateText(), true);
-        }
-
-        private void recreateText()
-        {
-            text.Clear();
-
-            //space after the title to put a space between the title and artist
-            titleSprites = text.AddText(titleBind.Value + @"  ", sprite => sprite.Font = OsuFont.GetFont(weight: FontWeight.Regular)).OfType<SpriteText>();
-
-            text.AddText(artistBind.Value, sprite =>
-            {
-                sprite.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold);
-                sprite.Colour = artistColour;
-                sprite.Padding = new MarginPadding { Top = 1 };
-            });
-        }
-
-        protected override bool OnHover(HoverEvent e)
-        {
-            handle.FadeIn(fade_duration);
-
-            return base.OnHover(e);
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            handle.FadeOut(fade_duration);
-        }
-
-        protected override bool OnClick(ClickEvent e)
-        {
-            OnSelect?.Invoke(BeatmapSetInfo);
-            return true;
-        }
-
-        public IEnumerable<string> FilterTerms { get; private set; }
-
-        private bool matching = true;
-
-        public bool MatchingFilter
-        {
-            get => matching;
-            set
-            {
-                if (matching == value) return;
-
-                matching = value;
-
-                this.FadeTo(matching ? 1 : 0, 200);
-            }
-        }
-
-        public bool FilteringActive { get; set; }
-
-        private class PlaylistItemHandle : SpriteIcon
-        {
-            public PlaylistItemHandle()
-            {
-                Anchor = Anchor.CentreLeft;
-                Origin = Anchor.CentreLeft;
-                Size = new Vector2(12);
-                Icon = FontAwesome.Solid.Bars;
-                Alpha = 0f;
-                Margin = new MarginPadding { Left = 5 };
-            }
-
-            public override bool HandlePositionalInput => IsPresent;
-        }
-    }
-
-    public interface IDraggable : IDrawable
-    {
-        /// <summary>
-        /// Whether this <see cref="IDraggable"/> can be dragged in its current state.
-        /// </summary>
-        bool IsDraggable { get; }
-    }
-}

osu.Game/Overlays/Music/PlaylistOverlay.cs

@@ -29,7 +29,7 @@ namespace osu.Game.Overlays.Music
         private BeatmapManager beatmaps;
 
         private FilterControl filter;
-        private PlaylistList list;
+        private Playlist list;
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, Bindable<WorkingBeatmap> beatmap, BeatmapManager beatmaps)
@@ -57,7 +57,7 @@ namespace osu.Game.Overlays.Music
                             Colour = colours.Gray3,
                             RelativeSizeAxes = Axes.Both,
                         },
-                        list = new PlaylistList
+                        list = new Playlist
                         {
                             RelativeSizeAxes = Axes.Both,
                             Padding = new MarginPadding { Top = 95, Bottom = 10, Right = 10 },