Make beatmap detail area abstractable

osu.Game/Configuration/OsuConfigManager.cs

@@ -20,7 +20,7 @@ namespace osu.Game.Configuration
             Set(OsuSetting.Ruleset, 0, 0, int.MaxValue);
             Set(OsuSetting.Skin, 0, -1, int.MaxValue);
 
-            Set(OsuSetting.BeatmapDetailTab, BeatmapDetailTab.Details);
+            Set(OsuSetting.BeatmapDetailTab, PlayBeatmapDetailArea.TabType.Details);
 
             Set(OsuSetting.ShowConvertedBeatmaps, true);
             Set(OsuSetting.DisplayStarsMinimum, 0.0, 0, 10, 0.1);

osu.Game/Screens/Select/BeatmapDetailArea.cs

@@ -2,37 +2,44 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
-using osu.Game.Screens.Select.Leaderboards;
 
 namespace osu.Game.Screens.Select
 {
-    public class BeatmapDetailArea : Container
+    public abstract class BeatmapDetailArea : Container
     {
         private const float details_padding = 10;
 
-        private readonly Container content;
-        protected override Container<Drawable> Content => content;
-
-        public readonly BeatmapDetails Details;
-        public readonly BeatmapLeaderboard Leaderboard;
-
         private WorkingBeatmap beatmap;
 
-        public WorkingBeatmap Beatmap
+        public virtual WorkingBeatmap Beatmap
         {
             get => beatmap;
             set
             {
                 beatmap = value;
-                Details.Beatmap = beatmap?.BeatmapInfo;
+
-                Leaderboard.Beatmap = beatmap is DummyWorkingBeatmap ? null : beatmap?.BeatmapInfo;
+                Details.Beatmap = value?.BeatmapInfo;
             }
         }
 
-        public BeatmapDetailArea()
+        public readonly BeatmapDetails Details;
+
+        protected Bindable<BeatmapDetailAreaTabItem> CurrentTab
+        {
+            get => tabControl.Current;
+            set => tabControl.Current = value;
+        }
+
+        private readonly Container content;
+        protected override Container<Drawable> Content => content;
+
+        private readonly BeatmapDetailAreaTabControl tabControl;
+
+        protected BeatmapDetailArea()
         {
             AddRangeInternal(new Drawable[]
             {
@@ -40,51 +47,62 @@ namespace osu.Game.Screens.Select
                 {
                     RelativeSizeAxes = Axes.Both,
                     Padding = new MarginPadding { Top = BeatmapDetailAreaTabControl.HEIGHT },
-                },
+                    Child = Details = new BeatmapDetails
-                new BeatmapDetailAreaTabControl
-                {
-                    RelativeSizeAxes = Axes.X,
-                    OnFilter = (tab, mods) =>
-                    {
-                        Leaderboard.FilterMods = mods;
-
-                        switch (tab)
-                        {
-                            case BeatmapDetailTab.Details:
-                                Details.Show();
-                                Leaderboard.Hide();
-                                break;
-
-                            default:
-                                Details.Hide();
-                                Leaderboard.Scope = (BeatmapLeaderboardScope)tab - 1;
-                                Leaderboard.Show();
-                                break;
-                        }
-                    },
-                },
-            });
-
-            AddRange(new Drawable[]
-            {
-                Details = new BeatmapDetails
                     {
                         RelativeSizeAxes = Axes.X,
                         Alpha = 0,
                         Margin = new MarginPadding { Top = details_padding },
-                },
-                Leaderboard = new BeatmapLeaderboard
-                {
-                    RelativeSizeAxes = Axes.Both,
                     }
+                },
+                tabControl = new BeatmapDetailAreaTabControl
+                {
+                    RelativeSizeAxes = Axes.X,
+                    TabItems = CreateTabItems(),
+                    OnFilter = OnTabChanged,
+                },
             });
         }
 
+        /// <summary>
+        /// Refreshes the currently-displayed details.
+        /// </summary>
+        public virtual void Refresh()
+        {
+        }
+
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
 
             Details.Height = Math.Min(DrawHeight - details_padding * 3 - BeatmapDetailAreaTabControl.HEIGHT, 450);
         }
+
+        /// <summary>
+        /// Invoked when a new tab is selected.
+        /// </summary>
+        /// <param name="tab">The tab that was selected.</param>
+        /// <param name="selectedMods">Whether the currently-selected mods should be considered.</param>
+        protected virtual void OnTabChanged(BeatmapDetailAreaTabItem tab, bool selectedMods)
+        {
+            switch (tab)
+            {
+                case BeatmapDetailAreaDetailTabItem _:
+                    Details.Show();
+                    break;
+
+                default:
+                    Details.Hide();
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Creates the tabs to be displayed.
+        /// </summary>
+        /// <returns>The tabs.</returns>
+        protected virtual BeatmapDetailAreaTabItem[] CreateTabItems() => new BeatmapDetailAreaTabItem[]
+        {
+            new BeatmapDetailAreaDetailTabItem(),
+        };
     }
 }

osu.Game/Screens/Select/BeatmapDetailAreaDetailTabItem.cs

@@ -0,0 +1,10 @@
+// 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.
+
+namespace osu.Game.Screens.Select
+{
+    public class BeatmapDetailAreaDetailTabItem : BeatmapDetailAreaTabItem
+    {
+        public override string Name => "Details";
+    }
+}

osu.Game/Screens/Select/BeatmapDetailAreaLeaderboardTabItem.cs

@@ -0,0 +1,22 @@
+// 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;
+
+namespace osu.Game.Screens.Select
+{
+    public class BeatmapDetailAreaLeaderboardTabItem<TScope> : BeatmapDetailAreaTabItem
+        where TScope : Enum
+    {
+        public override string Name => Scope.ToString();
+
+        public override bool FilterableByMods => true;
+
+        public readonly TScope Scope;
+
+        public BeatmapDetailAreaLeaderboardTabItem(TScope scope)
+        {
+            Scope = scope;
+        }
+    }
+}

osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using osuTK.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -18,14 +19,25 @@ namespace osu.Game.Screens.Select
     public class BeatmapDetailAreaTabControl : Container
     {
         public const float HEIGHT = 24;
+
+        public Bindable<BeatmapDetailAreaTabItem> Current
+        {
+            get => tabs.Current;
+            set => tabs.Current = value;
+        }
+
+        public Action<BeatmapDetailAreaTabItem, bool> OnFilter; //passed the selected tab and if mods is checked
+
+        public IReadOnlyList<BeatmapDetailAreaTabItem> TabItems
+        {
+            get => tabs.Items;
+            set => tabs.Items = value;
+        }
+
         private readonly OsuTabControlCheckbox modsCheckbox;
-        private readonly OsuTabControl<BeatmapDetailTab> tabs;
+        private readonly OsuTabControl<BeatmapDetailAreaTabItem> tabs;
         private readonly Container tabsContainer;
 
-        public Action<BeatmapDetailTab, bool> OnFilter; //passed the selected tab and if mods is checked
-
-        private Bindable<BeatmapDetailTab> selectedTab;
-
         public BeatmapDetailAreaTabControl()
         {
             Height = HEIGHT;
@@ -43,7 +55,7 @@ namespace osu.Game.Screens.Select
                 tabsContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Child = tabs = new OsuTabControl<BeatmapDetailTab>
+                    Child = tabs = new OsuTabControl<BeatmapDetailAreaTabItem>
                     {
                         Anchor = Anchor.BottomLeft,
                         Origin = Anchor.BottomLeft,
@@ -68,29 +80,22 @@ namespace osu.Game.Screens.Select
         private void load(OsuColour colour, OsuConfigManager config)
         {
             modsCheckbox.AccentColour = tabs.AccentColour = colour.YellowLight;
-
-            selectedTab = config.GetBindable<BeatmapDetailTab>(OsuSetting.BeatmapDetailTab);
-
-            tabs.Current.BindTo(selectedTab);
-            tabs.Current.TriggerChange();
         }
 
         private void invokeOnFilter()
         {
             OnFilter?.Invoke(tabs.Current.Value, modsCheckbox.Current.Value);
 
-            modsCheckbox.FadeTo(tabs.Current.Value == BeatmapDetailTab.Details ? 0 : 1, 200, Easing.OutQuint);
+            if (tabs.Current.Value.FilterableByMods)
-
-            tabsContainer.Padding = new MarginPadding { Right = tabs.Current.Value == BeatmapDetailTab.Details ? 0 : 100 };
-        }
-    }
-
-    public enum BeatmapDetailTab
             {
-        Details,
+                modsCheckbox.FadeTo(1, 200, Easing.OutQuint);
-        Local,
+                tabsContainer.Padding = new MarginPadding { Right = 100 };
-        Country,
+            }
-        Global,
+            else
-        Friends
+            {
+                modsCheckbox.FadeTo(0, 200, Easing.OutQuint);
+                tabsContainer.Padding = new MarginPadding();
+            }
+        }
     }
 }

osu.Game/Screens/Select/BeatmapDetailAreaTabItem.cs

@@ -0,0 +1,35 @@
+// 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;
+
+namespace osu.Game.Screens.Select
+{
+    public abstract class BeatmapDetailAreaTabItem : IEquatable<BeatmapDetailAreaTabItem>
+    {
+        /// <summary>
+        /// The name of this tab, to be displayed in the tab control.
+        /// </summary>
+        public abstract string Name { get; }
+
+        /// <summary>
+        /// Whether the contents of this tab can be filtered by the user's currently-selected mods.
+        /// </summary>
+        public virtual bool FilterableByMods => false;
+
+        public override string ToString() => Name;
+
+        public bool Equals(BeatmapDetailAreaTabItem other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return Name == other.Name;
+        }
+
+        public override int GetHashCode()
+        {
+            return Name != null ? Name.GetHashCode() : 0;
+        }
+    }
+}

osu.Game/Screens/Select/MatchSongSelect.cs

@@ -34,6 +34,8 @@ namespace osu.Game.Screens.Select
             Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
         }
 
+        protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea(); // Todo: Temporary
+
         protected override bool OnStart()
         {
             var item = new PlaylistItem

osu.Game/Screens/Select/PlayBeatmapDetailArea.cs

@@ -0,0 +1,143 @@
+// 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.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Screens.Select.Leaderboards;
+
+namespace osu.Game.Screens.Select
+{
+    public class PlayBeatmapDetailArea : BeatmapDetailArea
+    {
+        public readonly BeatmapLeaderboard Leaderboard;
+
+        public override WorkingBeatmap Beatmap
+        {
+            get => base.Beatmap;
+            set
+            {
+                base.Beatmap = value;
+
+                Leaderboard.Beatmap = value is DummyWorkingBeatmap ? null : value?.BeatmapInfo;
+            }
+        }
+
+        private Bindable<TabType> selectedTab;
+
+        public PlayBeatmapDetailArea()
+        {
+            Add(Leaderboard = new BeatmapLeaderboard { RelativeSizeAxes = Axes.Both });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            selectedTab = config.GetBindable<TabType>(OsuSetting.BeatmapDetailTab);
+            selectedTab.BindValueChanged(tab => CurrentTab.Value = getTabItemFromTabType(tab.NewValue), true);
+            CurrentTab.BindValueChanged(tab => selectedTab.Value = getTabTypeFromTabItem(tab.NewValue));
+        }
+
+        public override void Refresh()
+        {
+            base.Refresh();
+
+            Leaderboard.RefreshScores();
+        }
+
+        protected override void OnTabChanged(BeatmapDetailAreaTabItem tab, bool selectedMods)
+        {
+            base.OnTabChanged(tab, selectedMods);
+
+            Leaderboard.FilterMods = selectedMods;
+
+            switch (tab)
+            {
+                case BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope> leaderboard:
+                    Leaderboard.Scope = leaderboard.Scope;
+                    Leaderboard.Show();
+                    break;
+
+                default:
+                    Leaderboard.Hide();
+                    break;
+            }
+        }
+
+        protected override BeatmapDetailAreaTabItem[] CreateTabItems() => base.CreateTabItems().Concat(new BeatmapDetailAreaTabItem[]
+        {
+            new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Local),
+            new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Country),
+            new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Global),
+            new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Friend),
+        }).ToArray();
+
+        private BeatmapDetailAreaTabItem getTabItemFromTabType(TabType type)
+        {
+            switch (type)
+            {
+                case TabType.Details:
+                    return new BeatmapDetailAreaDetailTabItem();
+
+                case TabType.Local:
+                    return new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Local);
+
+                case TabType.Country:
+                    return new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Country);
+
+                case TabType.Global:
+                    return new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Global);
+
+                case TabType.Friends:
+                    return new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Friend);
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(type));
+            }
+        }
+
+        private TabType getTabTypeFromTabItem(BeatmapDetailAreaTabItem item)
+        {
+            switch (item)
+            {
+                case BeatmapDetailAreaDetailTabItem _:
+                    return TabType.Details;
+
+                case BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope> leaderboardTab:
+                    switch (leaderboardTab.Scope)
+                    {
+                        case BeatmapLeaderboardScope.Local:
+                            return TabType.Local;
+
+                        case BeatmapLeaderboardScope.Country:
+                            return TabType.Country;
+
+                        case BeatmapLeaderboardScope.Global:
+                            return TabType.Global;
+
+                        case BeatmapLeaderboardScope.Friend:
+                            return TabType.Friends;
+
+                        default:
+                            throw new ArgumentOutOfRangeException(nameof(item));
+                    }
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(item));
+            }
+        }
+
+        public enum TabType
+        {
+            Details,
+            Local,
+            Country,
+            Global,
+            Friends
+        }
+    }
+}

osu.Game/Screens/Select/PlaySongSelect.cs

@@ -29,8 +29,12 @@ namespace osu.Game.Screens.Select
                 ValidForResume = false;
                 Edit();
             }, Key.Number4);
+
+            ((PlayBeatmapDetailArea)BeatmapDetails).Leaderboard.ScoreSelected += score => this.Push(new SoloResults(score));
         }
 
+        protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
+
         public override void OnResuming(IScreen last)
         {
             base.OnResuming(last);

osu.Game/Screens/Select/SongSelect.cs

@@ -23,7 +23,6 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Menu;
-using osu.Game.Screens.Play;
 using osu.Game.Screens.Select.Options;
 using osu.Game.Skinning;
 using osuTK;
@@ -207,11 +206,11 @@ namespace osu.Game.Screens.Select
                                                     Left = left_area_padding,
                                                     Right = left_area_padding * 2,
                                                 },
-                                                Child = BeatmapDetails = new BeatmapDetailArea
+                                                Child = BeatmapDetails = CreateBeatmapDetailArea().With(d =>
                                                 {
-                                                    RelativeSizeAxes = Axes.Both,
+                                                    d.RelativeSizeAxes = Axes.Both;
-                                                    Padding = new MarginPadding { Top = 10, Right = 5 },
+                                                    d.Padding = new MarginPadding { Top = 10, Right = 5 };
-                                                },
+                                                })
                                             },
                                         }
                                     },
@@ -262,8 +261,6 @@ namespace osu.Game.Screens.Select
                 });
             }
 
-            BeatmapDetails.Leaderboard.ScoreSelected += score => this.Push(new SoloResults(score));
-
             if (Footer != null)
             {
                 Footer.AddButton(new FooterButtonMods { Current = Mods }, ModSelect);
@@ -319,6 +316,11 @@ namespace osu.Game.Screens.Select
             return dependencies;
         }
 
+        /// <summary>
+        /// Creates the beatmap details to be displayed underneath the wedge.
+        /// </summary>
+        protected abstract BeatmapDetailArea CreateBeatmapDetailArea();
+
         public void Edit(BeatmapInfo beatmap = null)
         {
             if (!AllowEditing)
@@ -533,7 +535,7 @@ namespace osu.Game.Screens.Select
 
             Carousel.AllowSelection = true;
 
-            BeatmapDetails.Leaderboard.RefreshScores();
+            BeatmapDetails.Refresh();
 
             Beatmap.Value.Track.Looping = true;
             music?.ResetTrackAdjustments();
@@ -716,7 +718,7 @@ namespace osu.Game.Screens.Select
 
             dialogOverlay?.Push(new BeatmapClearScoresDialog(beatmap, () =>
                 // schedule done here rather than inside the dialog as the dialog may fade out and never callback.
-                Schedule(() => BeatmapDetails.Leaderboard.RefreshScores())));
+                Schedule(() => BeatmapDetails.Refresh())));
         }
 
         public virtual bool OnPressed(GlobalAction action)