New song select footer design implementation

osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooterV2.cs

@@ -0,0 +1,146 @@
+// 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.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Mods;
+using osu.Game.Screens.Select.FooterV2;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.SongSelect
+{
+    public partial class TestSceneSongSelectFooterV2 : OsuManualInputManagerTestScene
+    {
+        private FooterButtonRandomV2 randomButton = null!;
+        private FooterButtonModsV2 modsButton = null!;
+
+        private bool nextRandomCalled;
+        private bool previousRandomCalled;
+
+        private DummyOverlay overlay = null!;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            nextRandomCalled = false;
+            previousRandomCalled = false;
+
+            FooterV2 footer;
+
+            Children = new Drawable[]
+            {
+                footer = new FooterV2
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre
+                },
+                overlay = new DummyOverlay()
+            };
+
+            footer.AddButton(modsButton = new FooterButtonModsV2(), overlay);
+            footer.AddButton(randomButton = new FooterButtonRandomV2
+            {
+                NextRandom = () => nextRandomCalled = true,
+                PreviousRandom = () => previousRandomCalled = true
+            });
+            footer.AddButton(new FooterButtonOptionsV2());
+
+            InputManager.MoveMouseTo(Vector2.Zero);
+
+            overlay.Hide();
+        });
+
+        [Test]
+        public void TestState()
+        {
+            AddRepeatStep("toggle options state", () => this.ChildrenOfType<FooterButtonV2>().Last().Enabled.Toggle(), 20);
+        }
+
+        [Test]
+        public void TestFooterRandom()
+        {
+            AddStep("press F2", () => InputManager.Key(Key.F2));
+            AddAssert("next random invoked", () => nextRandomCalled && !previousRandomCalled);
+        }
+
+        [Test]
+        public void TestFooterRandomViaMouse()
+        {
+            AddStep("click button", () =>
+            {
+                InputManager.MoveMouseTo(randomButton);
+                InputManager.Click(MouseButton.Left);
+            });
+            AddAssert("next random invoked", () => nextRandomCalled && !previousRandomCalled);
+        }
+
+        [Test]
+        public void TestFooterRewind()
+        {
+            AddStep("press Shift+F2", () =>
+            {
+                InputManager.PressKey(Key.LShift);
+                InputManager.PressKey(Key.F2);
+                InputManager.ReleaseKey(Key.F2);
+                InputManager.ReleaseKey(Key.LShift);
+            });
+            AddAssert("previous random invoked", () => previousRandomCalled && !nextRandomCalled);
+        }
+
+        [Test]
+        public void TestFooterRewindViaShiftMouseLeft()
+        {
+            AddStep("shift + click button", () =>
+            {
+                InputManager.PressKey(Key.LShift);
+                InputManager.MoveMouseTo(randomButton);
+                InputManager.Click(MouseButton.Left);
+                InputManager.ReleaseKey(Key.LShift);
+            });
+            AddAssert("previous random invoked", () => previousRandomCalled && !nextRandomCalled);
+        }
+
+        [Test]
+        public void TestFooterRewindViaMouseRight()
+        {
+            AddStep("right click button", () =>
+            {
+                InputManager.MoveMouseTo(randomButton);
+                InputManager.Click(MouseButton.Right);
+            });
+            AddAssert("previous random invoked", () => previousRandomCalled && !nextRandomCalled);
+        }
+
+        [Test]
+        public void TestOverlayPresent()
+        {
+            AddStep("Press F1", () =>
+            {
+                InputManager.MoveMouseTo(modsButton);
+                InputManager.Click(MouseButton.Left);
+            });
+            AddAssert("Overlay visible", () => overlay.State.Value == Visibility.Visible);
+            AddStep("Hide", () => overlay.Hide());
+        }
+
+        private partial class DummyOverlay : ShearedOverlayContainer
+        {
+            public DummyOverlay()
+                : base(OverlayColourScheme.Green)
+            {
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                Header.Title = "An overlay";
+            }
+        }
+    }
+}

osu.Game/Screens/Select/FooterV2/FooterButtonModsV2.cs

@@ -0,0 +1,20 @@
+// 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.Allocation;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+
+namespace osu.Game.Screens.Select.FooterV2
+{
+    public partial class FooterButtonModsV2 : FooterButtonV2
+    {
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colour)
+        {
+            Text = "Mods";
+            Icon = FontAwesome.Solid.ExchangeAlt;
+            AccentColour = colour.Lime1;
+        }
+    }
+}

osu.Game/Screens/Select/FooterV2/FooterButtonOptionsV2.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 osu.Framework.Allocation;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Input.Bindings;
+
+namespace osu.Game.Screens.Select.FooterV2
+{
+    public partial class FooterButtonOptionsV2 : FooterButtonV2
+    {
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colour)
+        {
+            Text = "Options";
+            Icon = FontAwesome.Solid.Cog;
+            AccentColour = colour.Purple1;
+            Hotkey = GlobalAction.ToggleBeatmapOptions;
+        }
+    }
+}

osu.Game/Screens/Select/FooterV2/FooterButtonRandomV2.cs

@@ -0,0 +1,161 @@
+// 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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Input.Bindings;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Screens.Select.FooterV2
+{
+    public partial class FooterButtonRandomV2 : FooterButtonV2
+    {
+        public Action NextRandom { get; set; } = null!;
+        public Action PreviousRandom { get; set; } = null!;
+
+        private Container persistentText = null!;
+        private OsuSpriteText randomSpriteText = null!;
+        private OsuSpriteText rewindSpriteText = null!;
+        private bool rewindSearch;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colour)
+        {
+            //TODO: use https://fontawesome.com/icons/shuffle?s=solid&f=classic when local Fontawesome is updated
+            Icon = FontAwesome.Solid.Random;
+            AccentColour = colour.Blue1;
+            TextContainer.Add(persistentText = new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                AlwaysPresent = true,
+                AutoSizeAxes = Axes.Both,
+                Children = new[]
+                {
+                    randomSpriteText = new OsuSpriteText
+                    {
+                        Font = OsuFont.TorusAlternate.With(size: 19),
+                        AlwaysPresent = true,
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Text = "Random",
+                    },
+                    rewindSpriteText = new OsuSpriteText
+                    {
+                        Font = OsuFont.TorusAlternate.With(size: 19),
+                        AlwaysPresent = true,
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Text = "Rewind",
+                        Alpha = 0f,
+                    }
+                }
+            });
+
+            Action = () =>
+            {
+                if (rewindSearch)
+                {
+                    const double fade_time = 500;
+
+                    OsuSpriteText fallingRewind;
+
+                    TextContainer.Add(fallingRewind = new OsuSpriteText
+                    {
+                        Alpha = 0,
+                        Text = rewindSpriteText.Text,
+                        AlwaysPresent = true, // make sure the button is sized large enough to always show this
+                        Anchor = Anchor.BottomCentre,
+                        Origin = Anchor.BottomCentre,
+                        Font = OsuFont.TorusAlternate.With(size: 19),
+                    });
+
+                    fallingRewind.FadeOutFromOne(fade_time, Easing.In);
+                    fallingRewind.MoveTo(Vector2.Zero).MoveTo(new Vector2(0, 10), fade_time, Easing.In);
+                    fallingRewind.Expire();
+
+                    persistentText.FadeInFromZero(fade_time, Easing.In);
+
+                    PreviousRandom.Invoke();
+                }
+                else
+                {
+                    NextRandom.Invoke();
+                }
+            };
+        }
+
+        protected override bool OnKeyDown(KeyDownEvent e)
+        {
+            updateText(e.ShiftPressed);
+            return base.OnKeyDown(e);
+        }
+
+        protected override void OnKeyUp(KeyUpEvent e)
+        {
+            updateText(e.ShiftPressed);
+            base.OnKeyUp(e);
+        }
+
+        protected override bool OnClick(ClickEvent e)
+        {
+            try
+            {
+                // this uses OR to handle rewinding when clicks are triggered by other sources (i.e. right button in OnMouseUp).
+                rewindSearch |= e.ShiftPressed;
+                return base.OnClick(e);
+            }
+            finally
+            {
+                rewindSearch = false;
+            }
+        }
+
+        protected override void OnMouseUp(MouseUpEvent e)
+        {
+            if (e.Button == MouseButton.Right)
+            {
+                rewindSearch = true;
+                TriggerClick();
+                return;
+            }
+
+            base.OnMouseUp(e);
+        }
+
+        public override bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+        {
+            rewindSearch = e.Action == GlobalAction.SelectPreviousRandom;
+
+            if (e.Action != GlobalAction.SelectNextRandom && e.Action != GlobalAction.SelectPreviousRandom)
+            {
+                return false;
+            }
+
+            if (!e.Repeat)
+                TriggerClick();
+            return true;
+        }
+
+        public override void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
+        {
+            if (e.Action == GlobalAction.SelectPreviousRandom)
+            {
+                rewindSearch = false;
+            }
+        }
+
+        private void updateText(bool rewind = false)
+        {
+            randomSpriteText.Alpha = rewind ? 0 : 1;
+            rewindSpriteText.Alpha = rewind ? 1 : 0;
+        }
+    }
+}