Implement SpotlightsLayout

osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs

@@ -35,12 +35,6 @@ namespace osu.Game.Tests.Visual.Online
             Add(selector = new SpotlightSelector());
         }
 
-        [Test]
-        public void TestVisibility()
-        {
-            AddStep("Toggle Visibility", selector.ToggleVisibility);
-        }
-
         [Test]
         public void TestLocalSpotlights()
         {

osu.Game.Tests/Visual/Online/TestSceneSpotlightsLayout.cs

@@ -0,0 +1,55 @@
+// 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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Rankings;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Catch;
+using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Taiko;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneSpotlightsLayout : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(SpotlightsLayout),
+            typeof(SpotlightSelector),
+        };
+
+        protected override bool UseOnlineAPI => true;
+
+        [Cached]
+        private readonly OverlayColourProvider overlayColour = new OverlayColourProvider(OverlayColourScheme.Green);
+
+        public TestSceneSpotlightsLayout()
+        {
+            var ruleset = new Bindable<RulesetInfo>(new OsuRuleset().RulesetInfo);
+
+            Add(new BasicScrollContainer
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Both,
+                Width = 0.8f,
+                Child = new SpotlightsLayout
+                {
+                    Ruleset = { BindTarget = ruleset }
+                }
+            });
+
+            AddStep("Osu ruleset", () => ruleset.Value = new OsuRuleset().RulesetInfo);
+            AddStep("Mania ruleset", () => ruleset.Value = new ManiaRuleset().RulesetInfo);
+            AddStep("Taiko ruleset", () => ruleset.Value = new TaikoRuleset().RulesetInfo);
+            AddStep("Catch ruleset", () => ruleset.Value = new CatchRuleset().RulesetInfo);
+        }
+    }
+}

osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs

@@ -60,8 +60,10 @@ namespace osu.Game.Overlays.Rankings
             base.LoadComplete();
         }
 
-        private void onCurrentChanged(ValueChangedEvent<RankingsScope> scope) =>
+        private void onCurrentChanged(ValueChangedEvent<RankingsScope> scope)
-            SpotlightSelector.State.Value = scope.NewValue == RankingsScope.Spotlights ? Visibility.Visible : Visibility.Hidden;
+        {
+
+        }
 
         private class RankingsTitle : ScreenTitle
         {

osu.Game/Overlays/Rankings/SpotlightSelector.cs

@@ -18,11 +18,8 @@ using osu.Game.Online.API.Requests;
 
 namespace osu.Game.Overlays.Rankings
 {
-    public class SpotlightSelector : VisibilityContainer, IHasCurrentValue<APISpotlight>
+    public class SpotlightSelector : CompositeDrawable, IHasCurrentValue<APISpotlight>
     {
-        private const int height = 100;
-        private const int duration = 200;
-
         private readonly Box background;
         private readonly SpotlightsDropdown dropdown;
 
@@ -40,59 +37,52 @@ namespace osu.Game.Overlays.Rankings
             set => dropdown.Items = value;
         }
 
-        protected override bool StartHidden => true;
-
         private readonly InfoColumn startDateColumn;
         private readonly InfoColumn endDateColumn;
         private readonly InfoColumn mapCountColumn;
         private readonly InfoColumn participantsColumn;
-        private readonly Container content;
 
         public SpotlightSelector()
         {
             RelativeSizeAxes = Axes.X;
-            Add(content = new Container
+            Height = 100;
+            AddRangeInternal(new Drawable[]
             {
-                Height = height,
+                background = new Box
-                RelativeSizeAxes = Axes.X,
-                Children = new Drawable[]
                 {
-                    background = new Box
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding { Horizontal = UserProfileOverlay.CONTENT_X_MARGIN, Vertical = 10 },
+                    Children = new Drawable[]
                     {
-                        RelativeSizeAxes = Axes.Both,
+                        dropdown = new SpotlightsDropdown
-                    },
-                    new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Padding = new MarginPadding { Horizontal = UserProfileOverlay.CONTENT_X_MARGIN, Vertical = 10 },
-                        Children = new Drawable[]
                         {
-                            dropdown = new SpotlightsDropdown
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            RelativeSizeAxes = Axes.X,
+                            Current = Current,
+                            Depth = -float.MaxValue
+                        },
+                        new FillFlowContainer
+                        {
+                            Anchor = Anchor.BottomRight,
+                            Origin = Anchor.BottomRight,
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Horizontal,
+                            Spacing = new Vector2(15, 0),
+                            Children = new Drawable[]
                             {
-                                Anchor = Anchor.TopCentre,
+                                startDateColumn = new InfoColumn(@"Start Date"),
-                                Origin = Anchor.TopCentre,
+                                endDateColumn = new InfoColumn(@"End Date"),
-                                RelativeSizeAxes = Axes.X,
+                                mapCountColumn = new InfoColumn(@"Map Count"),
-                                Current = Current,
+                                participantsColumn = new InfoColumn(@"Participants")
-                                Depth = -float.MaxValue
-                            },
-                            new FillFlowContainer
-                            {
-                                Anchor = Anchor.BottomRight,
-                                Origin = Anchor.BottomRight,
-                                AutoSizeAxes = Axes.Both,
-                                Direction = FillDirection.Horizontal,
-                                Spacing = new Vector2(15, 0),
-                                Children = new Drawable[]
-                                {
-                                    startDateColumn = new InfoColumn(@"Start Date"),
-                                    endDateColumn = new InfoColumn(@"End Date"),
-                                    mapCountColumn = new InfoColumn(@"Map Count"),
-                                    participantsColumn = new InfoColumn(@"Participants")
-                                }
                             }
                         }
-                    },
+                    }
-                }
+                },
             });
         }
 
@@ -110,18 +100,6 @@ namespace osu.Game.Overlays.Rankings
             participantsColumn.Value = response.Spotlight.Participants?.ToString("N0");
         }
 
-        protected override void PopIn()
-        {
-            this.ResizeHeightTo(height, duration, Easing.OutQuint);
-            content.FadeIn(duration, Easing.OutQuint);
-        }
-
-        protected override void PopOut()
-        {
-            this.ResizeHeightTo(0, duration, Easing.OutQuint);
-            content.FadeOut(duration, Easing.OutQuint);
-        }
-
         private string dateToString(DateTimeOffset date) => date.ToString("yyyy-MM-dd");
 
         private class InfoColumn : FillFlowContainer

osu.Game/Overlays/Rankings/SpotlightsLayout.cs

@@ -0,0 +1,158 @@
+// 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 osu.Framework.Graphics;
+using osu.Framework.Bindables;
+using osu.Game.Rulesets;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Online.API.Requests.Responses;
+using osuTK;
+using osu.Framework.Allocation;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Overlays.Rankings.Tables;
+using System.Linq;
+using osu.Game.Overlays.Direct;
+using System.Threading;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Overlays.Rankings
+{
+    public class SpotlightsLayout : CompositeDrawable
+    {
+        public readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
+
+        private readonly Bindable<APISpotlight> selectedSpotlight = new Bindable<APISpotlight>();
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        private CancellationTokenSource cancellationToken;
+        private GetSpotlightRankingsRequest getRankingsRequest;
+        private GetSpotlightsRequest spotlightsRequest;
+
+        private readonly SpotlightSelector selector;
+        private readonly Container content;
+        private readonly DimmedLoadingLayer loading;
+
+        public SpotlightsLayout()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            InternalChild = new ReverseChildIDFillFlowContainer<Drawable>
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 20),
+                Children = new Drawable[]
+                {
+                    selector = new SpotlightSelector
+                    {
+                        Current = selectedSpotlight,
+                    },
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Children = new Drawable[]
+                        {
+                            content = new Container
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                            },
+                            loading = new DimmedLoadingLayer(),
+                        }
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            selectedSpotlight.BindValueChanged(onSpotlightChanged);
+            Ruleset.BindValueChanged(onRulesetChanged);
+
+            getSpotlights();
+        }
+
+        private void getSpotlights()
+        {
+            spotlightsRequest = new GetSpotlightsRequest();
+            spotlightsRequest.Success += response => selector.Spotlights = response.Spotlights;
+            api.Queue(spotlightsRequest);
+        }
+
+        private void onRulesetChanged(ValueChangedEvent<RulesetInfo> ruleset)
+        {
+            if (!selector.Spotlights.Any())
+                return;
+
+            selectedSpotlight.TriggerChange();
+        }
+
+        private void onSpotlightChanged(ValueChangedEvent<APISpotlight> spotlight)
+        {
+            loading.Show();
+
+            cancellationToken?.Cancel();
+            getRankingsRequest?.Cancel();
+
+            getRankingsRequest = new GetSpotlightRankingsRequest(Ruleset.Value, spotlight.NewValue.Id);
+            getRankingsRequest.Success += onSuccess;
+            api.Queue(getRankingsRequest);
+        }
+
+        private void onSuccess(GetSpotlightRankingsResponse response)
+        {
+            LoadComponentAsync(createContent(response), loaded =>
+            {
+                selector.ShowInfo(response);
+
+                content.Clear();
+                content.Add(loaded);
+
+                loading.Hide();
+            }, (cancellationToken = new CancellationTokenSource()).Token);
+        }
+
+        private Drawable createContent(GetSpotlightRankingsResponse response) => new FillFlowContainer
+        {
+            AutoSizeAxes = Axes.Y,
+            RelativeSizeAxes = Axes.X,
+            Direction = FillDirection.Vertical,
+            Spacing = new Vector2(0, 20),
+            Children = new Drawable[]
+            {
+                new ScoresTable(1, response.Users),
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.X,
+                    Spacing = new Vector2(10),
+                    Children = response.BeatmapSets.Select(b => new DirectGridPanel(b.ToBeatmapSet(rulesets))
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                    }).ToList()
+                }
+            }
+        };
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            spotlightsRequest?.Cancel();
+            getRankingsRequest?.Cancel();
+            cancellationToken?.Cancel();
+        }
+    }
+}