From 2878bb592fc317b36b6f49127da42543027fb28b Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 3 Jun 2022 22:22:32 +0900
Subject: [PATCH] Use more appropriate sounds for certain components

---
 .../UserInterface/ShearedToggleButton.cs      |  8 ++++--
 .../Overlays/BeatmapListing/FilterTabItem.cs  |  2 +-
 .../Chat/Listing/ChannelListingItem.cs        | 27 +++++++++++++++++--
 .../Header/Components/ExpandDetailsButton.cs  |  2 +-
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs b/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs
index 4780270f66..ee59da7279 100644
--- a/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs
+++ b/osu.Game/Graphics/UserInterface/ShearedToggleButton.cs
@@ -13,6 +13,7 @@ namespace osu.Game.Graphics.UserInterface
 {
     public class ShearedToggleButton : ShearedButton
     {
+        private Sample? sampleClick;
         private Sample? sampleOff;
         private Sample? sampleOn;
 
@@ -39,8 +40,9 @@ public ShearedToggleButton(float? width = null)
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
-            sampleOn = audio.Samples.Get(@"UI/check-on");
-            sampleOff = audio.Samples.Get(@"UI/check-off");
+            sampleClick = audio.Samples.Get(@"UI/default-select");
+            sampleOn = audio.Samples.Get(@"UI/dropdown-open");
+            sampleOff = audio.Samples.Get(@"UI/dropdown-close");
         }
 
         protected override HoverSounds CreateHoverSounds(HoverSampleSet sampleSet) => new HoverSounds(sampleSet);
@@ -67,6 +69,8 @@ private void updateActiveState()
 
         private void playSample()
         {
+            sampleClick?.Play();
+
             if (Active.Value)
                 sampleOn?.Play();
             else
diff --git a/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs b/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
index 52dfcad2cc..ff43170207 100644
--- a/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
+++ b/osu.Game/Overlays/BeatmapListing/FilterTabItem.cs
@@ -40,7 +40,7 @@ private void load()
                     Font = OsuFont.GetFont(size: 13, weight: FontWeight.Regular),
                     Text = LabelFor(Value)
                 },
-                new HoverClickSounds()
+                new HoverClickSounds(HoverSampleSet.TabSelect)
             });
 
             Enabled.Value = true;
diff --git a/osu.Game/Overlays/Chat/Listing/ChannelListingItem.cs b/osu.Game/Overlays/Chat/Listing/ChannelListingItem.cs
index 86c81d5d79..2a21d30a4a 100644
--- a/osu.Game/Overlays/Chat/Listing/ChannelListingItem.cs
+++ b/osu.Game/Overlays/Chat/Listing/ChannelListingItem.cs
@@ -6,6 +6,8 @@
 using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -16,6 +18,7 @@
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Chat;
 using osuTK;
 
@@ -32,6 +35,8 @@ public class ChannelListingItem : OsuClickableContainer, IFilterable
         public IEnumerable<LocalisableString> FilterTerms => new LocalisableString[] { Channel.Name, Channel.Topic ?? string.Empty };
         public bool MatchingFilter { set => this.FadeTo(value ? 1f : 0f, 100); }
 
+        protected override HoverSounds CreateHoverSounds(HoverSampleSet sampleSet) => new HoverSounds();
+
         private Box hoverBox = null!;
         private SpriteIcon checkbox = null!;
         private OsuSpriteText channelText = null!;
@@ -46,14 +51,20 @@ public class ChannelListingItem : OsuClickableContainer, IFilterable
 
         private const float vertical_margin = 1.5f;
 
+        private Sample? sampleJoin;
+        private Sample? sampleLeave;
+
         public ChannelListingItem(Channel channel)
         {
             Channel = channel;
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(AudioManager audio)
         {
+            sampleJoin = audio.Samples.Get(@"UI/check-on");
+            sampleLeave = audio.Samples.Get(@"UI/check-off");
+
             Masking = true;
             CornerRadius = 5;
             RelativeSizeAxes = Axes.X;
@@ -156,7 +167,19 @@ protected override void LoadComplete()
                 }
             }, true);
 
-            Action = () => (channelJoined.Value ? OnRequestLeave : OnRequestJoin)?.Invoke(Channel);
+            Action = () =>
+            {
+                if (channelJoined.Value)
+                {
+                    OnRequestLeave?.Invoke(Channel);
+                    sampleLeave?.Play();
+                }
+                else
+                {
+                    OnRequestJoin?.Invoke(Channel);
+                    sampleJoin?.Play();
+                }
+            };
         }
 
         protected override bool OnHover(HoverEvent e)
diff --git a/osu.Game/Overlays/Profile/Header/Components/ExpandDetailsButton.cs b/osu.Game/Overlays/Profile/Header/Components/ExpandDetailsButton.cs
index b4a5d5e31b..4cfdf5cc86 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ExpandDetailsButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ExpandDetailsButton.cs
@@ -25,7 +25,7 @@ public class ExpandDetailsButton : ProfileHeaderButton
         private Sample sampleOpen;
         private Sample sampleClose;
 
-        protected override HoverSounds CreateHoverSounds(HoverSampleSet sampleSet) => new HoverSounds();
+        protected override HoverSounds CreateHoverSounds(HoverSampleSet sampleSet) => new HoverClickSounds();
 
         public ExpandDetailsButton()
         {