actually implement filters

Author: flustix

fluXis/Overlay/Browse/BrowseFilter.cs

@@ -4,6 +4,7 @@
 using fluXis.Graphics.UserInterface.Color;
 using fluXis.Graphics.UserInterface.Interaction;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -16,7 +17,7 @@ namespace fluXis.Overlay.Browse;
 
 public partial class BrowseFilter<T> : FillFlowContainer
 {
-    public BrowseFilter(LocalisableString title, IEnumerable<Option> options)
+    public BrowseFilter(LocalisableString title, BindableList<T> selected, IEnumerable<Option> options)
     {
         RelativeSizeAxes = Axes.X;
         Height = 20;
@@ -35,7 +36,7 @@ public BrowseFilter(LocalisableString title, IEnumerable<Option> options)
             }
         };
 
-        options.ForEach(x => Add(new Button(x)));
+        options.ForEach(x => Add(new Button(x, selected)));
     }
 
     public class Option
@@ -58,6 +59,7 @@ private partial class Button : CompositeDrawable
         private UISamples samples { get; set; }
 
         private readonly Option option;
+        private readonly BindableList<T> selected;
 
         private Box background;
         private HoverLayer hover;
@@ -66,9 +68,10 @@ private partial class Button : CompositeDrawable
 
         private bool enabled;
 
-        public Button(Option option)
+        public Button(Option option, BindableList<T> selected)
         {
             this.option = option;
+            this.selected = selected;
         }
 
         [BackgroundDependencyLoader]
@@ -103,6 +106,20 @@ private void load()
             };
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            selected.BindCollectionChanged((_, _) =>
+            {
+                enabled = selected.Contains(option.Value);
+
+                background.Alpha = enabled ? 1f : 0f;
+                text.Alpha = enabled ? 1f : .6f;
+                text.Colour = enabled ? Theme.TextDark : Theme.Text;
+            }, true);
+        }
+
         protected override bool OnHover(HoverEvent e)
         {
             samples.Hover();
@@ -115,25 +132,15 @@ protected override void OnHoverLost(HoverLostEvent e)
             hover.Hide();
         }
 
-        protected override bool OnMouseDown(MouseDownEvent e)
-        {
-            return base.OnMouseDown(e);
-        }
-
-        protected override void OnMouseUp(MouseUpEvent e)
-        {
-            base.OnMouseUp(e);
-        }
-
         protected override bool OnClick(ClickEvent e)
         {
             enabled = !enabled;
             samples.Click();
             flash.Show();
 
-            background.Alpha = enabled ? 1f : 0f;
-            text.Alpha = enabled ? 1f : .6f;
-            text.Colour = enabled ? Theme.TextDark : Theme.Text;
+            var v = option.Value;
+            if (!selected.Remove(v))
+                selected.Add(v);
 
             return true;
         }

fluXis/Overlay/Browse/BrowseOverlay.cs

@@ -22,6 +22,8 @@
 using fluXis.Overlay.User.Header;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -73,6 +75,9 @@ public partial class BrowseOverlay : OverlayContainer, IKeyBindingHandler<FluXis
     private bool firstOpen = true;
     private double previousScrollY;
 
+    private BindableList<MapStatus> filterStatus;
+    private BindableList<int> filterKeymode;
+
     [BackgroundDependencyLoader]
     private void load()
     {
@@ -202,12 +207,14 @@ private void load()
                                             {
                                                 new BrowseFilter<MapStatus>(
                                                     "Status",
+                                                    filterStatus = new BindableList<MapStatus>(),
                                                     Enum.GetValues<MapStatus>()
                                                         .Where(x => x >= MapStatus.Unsubmitted)
                                                         .Select(x => new BrowseFilter<MapStatus>.Option(x, x.ToString(), Theme.GetStatusColor((int)x)))
                                                 ),
                                                 new BrowseFilter<int>(
                                                     "Keymode",
+                                                    filterKeymode = new BindableList<int>(),
                                                     Enumerable.Range(4, 5)
                                                               .Select(x => new BrowseFilter<int>.Option(x, $"{x}K", Theme.GetKeyCountColor(x)))
                                                 )
@@ -256,7 +263,25 @@ private void loadMapsets(long offset = 0, bool reload = false)
         if (reload)
             flow.Clear();
 
-        var req = new MapSetsRequest(offset, 48, currentQuery);
+        var query = currentQuery;
+        filterKeymode.ForEach(x => query += $" k={x}");
+
+        if (filterStatus.Count == 4)
+            query += " s=a";
+        else
+        {
+            filterStatus.ForEach(x => query += $" s={x switch {
+                MapStatus.Unsubmitted => "u",
+                MapStatus.Pending => "pen",
+                MapStatus.Impure => "i",
+                MapStatus.Pure => "p",
+                _ => throw new ArgumentOutOfRangeException(nameof(x), x, null) }
+            }");
+        }
+
+        Logger.Log(query);
+
+        var req = new MapSetsRequest(offset, 48, query);
         req.Success += response =>
         {
             loadedAll = response.Data.Count == 0;