From 4ff7f251270f98602e5dda0e8909bf23c022c187 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Sun, 17 Dec 2023 20:01:31 +0800 Subject: [PATCH 1/5] Move microphone visualizer out of user interface namespace because this componnet only used in the setting screen. --- .../Settings/Previews}/TestSceneMicrophoneSoundVisualizer.cs | 4 ++-- .../Settings/Previews/Input/MicrophoneDevicePreview.cs | 1 - .../Settings/Previews/Input}/MicrophoneSoundVisualizer.cs | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) rename osu.Game.Rulesets.Karaoke.Tests/{Graphics => Screens/Settings/Previews}/TestSceneMicrophoneSoundVisualizer.cs (85%) rename osu.Game.Rulesets.Karaoke/{Graphics/UserInterface => Screens/Settings/Previews/Input}/MicrophoneSoundVisualizer.cs (99%) diff --git a/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneMicrophoneSoundVisualizer.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Settings/Previews/TestSceneMicrophoneSoundVisualizer.cs similarity index 85% rename from osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneMicrophoneSoundVisualizer.cs rename to osu.Game.Rulesets.Karaoke.Tests/Screens/Settings/Previews/TestSceneMicrophoneSoundVisualizer.cs index 6fd9f9e90..e97ac603a 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/Graphics/TestSceneMicrophoneSoundVisualizer.cs +++ b/osu.Game.Rulesets.Karaoke.Tests/Screens/Settings/Previews/TestSceneMicrophoneSoundVisualizer.cs @@ -4,10 +4,10 @@ using NUnit.Framework; using osu.Framework.Graphics; using osu.Framework.Input; -using osu.Game.Rulesets.Karaoke.Graphics.UserInterface; +using osu.Game.Rulesets.Karaoke.Screens.Settings.Previews.Input; using osu.Game.Tests.Visual; -namespace osu.Game.Rulesets.Karaoke.Tests.Graphics; +namespace osu.Game.Rulesets.Karaoke.Tests.Screens.Settings.Previews; [TestFixture] public partial class TestSceneMicrophoneSoundVisualizer : OsuTestScene diff --git a/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Input/MicrophoneDevicePreview.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Input/MicrophoneDevicePreview.cs index e3ce93eb0..e3d1f6235 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Input/MicrophoneDevicePreview.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Input/MicrophoneDevicePreview.cs @@ -8,7 +8,6 @@ using osu.Framework.Graphics; using osu.Framework.Input; using osu.Game.Rulesets.Karaoke.Configuration; -using osu.Game.Rulesets.Karaoke.Graphics.UserInterface; namespace osu.Game.Rulesets.Karaoke.Screens.Settings.Previews.Input; diff --git a/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/MicrophoneSoundVisualizer.cs b/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Input/MicrophoneSoundVisualizer.cs similarity index 99% rename from osu.Game.Rulesets.Karaoke/Graphics/UserInterface/MicrophoneSoundVisualizer.cs rename to osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Input/MicrophoneSoundVisualizer.cs index 5329d7393..b669f0fdb 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/MicrophoneSoundVisualizer.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Input/MicrophoneSoundVisualizer.cs @@ -15,7 +15,7 @@ using osuTK; using osuTK.Graphics; -namespace osu.Game.Rulesets.Karaoke.Graphics.UserInterface; +namespace osu.Game.Rulesets.Karaoke.Screens.Settings.Previews.Input; public partial class MicrophoneSoundVisualizer : CompositeDrawable { From e738d664c07904629e4ae2ffd572eba7d7935c79 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Sun, 17 Dec 2023 20:12:56 +0800 Subject: [PATCH 2/5] Move this shit out of shared interface. --- .../Edit/Beatmaps/Lyrics/LyricList}/CircleCheckbox.cs | 2 +- .../Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Row.cs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) rename osu.Game.Rulesets.Karaoke/{Graphics/UserInterface => Screens/Edit/Beatmaps/Lyrics/LyricList}/CircleCheckbox.cs (97%) diff --git a/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/CircleCheckbox.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/CircleCheckbox.cs similarity index 97% rename from osu.Game.Rulesets.Karaoke/Graphics/UserInterface/CircleCheckbox.cs rename to osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/CircleCheckbox.cs index 7358867e6..3d1bccb9a 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/CircleCheckbox.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/CircleCheckbox.cs @@ -16,7 +16,7 @@ using osuTK; using osuTK.Graphics; -namespace osu.Game.Rulesets.Karaoke.Graphics.UserInterface; +namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.LyricList; public partial class CircleCheckbox : Checkbox, IHasAccentColour, IHasTooltip { diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Row.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Row.cs index 835962237..814fa1793 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Row.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Row.cs @@ -12,7 +12,6 @@ using osu.Framework.Input.Events; using osu.Framework.Localisation; using osu.Game.Rulesets.Karaoke.Edit.Utils; -using osu.Game.Rulesets.Karaoke.Graphics.UserInterface; using osu.Game.Rulesets.Karaoke.Objects; using osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.CaretPosition; using osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.States; From ac9e1773134277316846558a308c3c0246053d5f Mon Sep 17 00:00:00 2001 From: andy840119 Date: Sun, 17 Dec 2023 20:15:04 +0800 Subject: [PATCH 3/5] This shit shoudl be shared container, not shared user interface. --- .../RearrangeableTextFlowListContainer.cs | 2 +- .../Graphics/UserInterfaceV2/FontSelector.cs | 2 +- .../Graphics/UserInterfaceV2/LanguageSelector.cs | 2 +- .../Edit/Beatmaps/Components/UserInterfaceV2/LyricSelector.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename osu.Game.Rulesets.Karaoke/Graphics/{UserInterface => Containers}/RearrangeableTextFlowListContainer.cs (98%) diff --git a/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/RearrangeableTextFlowListContainer.cs b/osu.Game.Rulesets.Karaoke/Graphics/Containers/RearrangeableTextFlowListContainer.cs similarity index 98% rename from osu.Game.Rulesets.Karaoke/Graphics/UserInterface/RearrangeableTextFlowListContainer.cs rename to osu.Game.Rulesets.Karaoke/Graphics/Containers/RearrangeableTextFlowListContainer.cs index 37cd8a869..2409bde40 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/RearrangeableTextFlowListContainer.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/Containers/RearrangeableTextFlowListContainer.cs @@ -14,7 +14,7 @@ using osuTK; using osuTK.Graphics; -namespace osu.Game.Rulesets.Karaoke.Graphics.UserInterface; +namespace osu.Game.Rulesets.Karaoke.Graphics.Containers; /// /// Implement most feature for searchable text container. diff --git a/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/FontSelector.cs b/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/FontSelector.cs index 4e96fc7eb..310a7303a 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/FontSelector.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/FontSelector.cs @@ -17,8 +17,8 @@ using osu.Game.Graphics.Sprites; using osu.Game.Graphics.UserInterface; using osu.Game.Rulesets.Karaoke.Bindables; +using osu.Game.Rulesets.Karaoke.Graphics.Containers; using osu.Game.Rulesets.Karaoke.Graphics.Shapes; -using osu.Game.Rulesets.Karaoke.Graphics.UserInterface; using osu.Game.Rulesets.Karaoke.IO.Stores; using osu.Game.Rulesets.Karaoke.Skinning.Fonts; using osu.Game.Rulesets.Karaoke.Utils; diff --git a/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LanguageSelector.cs b/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LanguageSelector.cs index 83b3413cc..52b378d43 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LanguageSelector.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LanguageSelector.cs @@ -12,7 +12,7 @@ using osu.Framework.Localisation; using osu.Game.Graphics.Containers; using osu.Game.Graphics.UserInterface; -using osu.Game.Rulesets.Karaoke.Graphics.UserInterface; +using osu.Game.Rulesets.Karaoke.Graphics.Containers; using osu.Game.Rulesets.Karaoke.Utils; using osuTK.Graphics; diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/UserInterfaceV2/LyricSelector.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/UserInterfaceV2/LyricSelector.cs index 0d915cd7c..9847efde4 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/UserInterfaceV2/LyricSelector.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Components/UserInterfaceV2/LyricSelector.cs @@ -13,7 +13,7 @@ using osu.Game.Graphics; using osu.Game.Graphics.Containers; using osu.Game.Graphics.UserInterface; -using osu.Game.Rulesets.Karaoke.Graphics.UserInterface; +using osu.Game.Rulesets.Karaoke.Graphics.Containers; using osu.Game.Rulesets.Karaoke.Objects; using osu.Game.Screens.Edit; using osuTK.Graphics; From 70a0f52d2c63c1b9fa7a2f8316463cd331c5ba15 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Sun, 17 Dec 2023 20:22:13 +0800 Subject: [PATCH 4/5] This shit should be a part of drawable. Follow how "DrawableAvatar" did in osu.game. --- .../Graphics/{UserInterface => Drawables}/SingerDisplay.cs | 2 +- .../Edit/Beatmaps/Lyrics/LyricList/ApplySelectingArea.cs | 1 - .../Beatmaps/Lyrics/LyricList/Rows/Info/Badge/SingerInfo.cs | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) rename osu.Game.Rulesets.Karaoke/Graphics/{UserInterface => Drawables}/SingerDisplay.cs (98%) diff --git a/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/SingerDisplay.cs b/osu.Game.Rulesets.Karaoke/Graphics/Drawables/SingerDisplay.cs similarity index 98% rename from osu.Game.Rulesets.Karaoke/Graphics/UserInterface/SingerDisplay.cs rename to osu.Game.Rulesets.Karaoke/Graphics/Drawables/SingerDisplay.cs index 6cc447ca1..67edbe9c4 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/UserInterface/SingerDisplay.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/Drawables/SingerDisplay.cs @@ -16,7 +16,7 @@ using osu.Game.Rulesets.Karaoke.Graphics.Sprites; using osuTK; -namespace osu.Game.Rulesets.Karaoke.Graphics.UserInterface; +namespace osu.Game.Rulesets.Karaoke.Graphics.Drawables; public partial class SingerDisplay : Container, IHasCurrentValue> { diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/ApplySelectingArea.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/ApplySelectingArea.cs index 4c3b63e7b..3e578bb27 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/ApplySelectingArea.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/ApplySelectingArea.cs @@ -11,7 +11,6 @@ using osu.Framework.Localisation; using osu.Game.Graphics; using osu.Game.Graphics.UserInterface; -using osu.Game.Rulesets.Karaoke.Graphics.UserInterface; using osu.Game.Rulesets.Karaoke.Objects; using osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.LyricList.Rows; using osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.States; diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/Badge/SingerInfo.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/Badge/SingerInfo.cs index c25eabf69..38d1e106e 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/Badge/SingerInfo.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/Badge/SingerInfo.cs @@ -7,7 +7,7 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Game.Rulesets.Karaoke.Beatmaps.Metadatas; -using osu.Game.Rulesets.Karaoke.Graphics.UserInterface; +using osu.Game.Rulesets.Karaoke.Graphics.Drawables; using osu.Game.Rulesets.Karaoke.Objects; namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.LyricList.Rows.Info.Badge; From 29e775d49b15d51df67c5806f6d2427e3820ac76 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Sun, 17 Dec 2023 21:30:07 +0800 Subject: [PATCH 5/5] Drawable singer avatar should belongs to drawable namespace. See "DrawableAvatar" in the osu.game. --- .../Edit/Setup/Components/SingerDisplay.cs | 2 +- osu.Game.Rulesets.Karaoke/Graphics/Cursor/SingerToolTip.cs | 2 +- .../{Sprites => Drawables}/DrawableCircleSingerAvatar.cs | 2 +- .../Graphics/{Sprites => Drawables}/DrawableSingerAvatar.cs | 2 +- osu.Game.Rulesets.Karaoke/Graphics/Drawables/SingerDisplay.cs | 1 - .../Edit/Beatmaps/Lyrics/Settings/Singers/SingerEditSection.cs | 2 +- .../Edit/Beatmaps/Singers/Rows/Components/SingerAvatar.cs | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) rename osu.Game.Rulesets.Karaoke/Graphics/{Sprites => Drawables}/DrawableCircleSingerAvatar.cs (95%) rename osu.Game.Rulesets.Karaoke/Graphics/{Sprites => Drawables}/DrawableSingerAvatar.cs (97%) diff --git a/osu.Game.Rulesets.Karaoke/Edit/Setup/Components/SingerDisplay.cs b/osu.Game.Rulesets.Karaoke/Edit/Setup/Components/SingerDisplay.cs index 2fa3b39d8..73d621667 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Setup/Components/SingerDisplay.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Setup/Components/SingerDisplay.cs @@ -15,7 +15,7 @@ using osu.Game.Rulesets.Karaoke.Beatmaps.Metadatas; using osu.Game.Rulesets.Karaoke.Beatmaps.Utils; using osu.Game.Rulesets.Karaoke.Graphics.Cursor; -using osu.Game.Rulesets.Karaoke.Graphics.Sprites; +using osu.Game.Rulesets.Karaoke.Graphics.Drawables; using osuTK; namespace osu.Game.Rulesets.Karaoke.Edit.Setup.Components; diff --git a/osu.Game.Rulesets.Karaoke/Graphics/Cursor/SingerToolTip.cs b/osu.Game.Rulesets.Karaoke/Graphics/Cursor/SingerToolTip.cs index 00a8159e1..7024b6e86 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/Cursor/SingerToolTip.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/Cursor/SingerToolTip.cs @@ -11,7 +11,7 @@ using osu.Game.Rulesets.Karaoke.Beatmaps; using osu.Game.Rulesets.Karaoke.Beatmaps.Metadatas; using osu.Game.Rulesets.Karaoke.Beatmaps.Metadatas.Types; -using osu.Game.Rulesets.Karaoke.Graphics.Sprites; +using osu.Game.Rulesets.Karaoke.Graphics.Drawables; using osuTK; using osuTK.Graphics; diff --git a/osu.Game.Rulesets.Karaoke/Graphics/Sprites/DrawableCircleSingerAvatar.cs b/osu.Game.Rulesets.Karaoke/Graphics/Drawables/DrawableCircleSingerAvatar.cs similarity index 95% rename from osu.Game.Rulesets.Karaoke/Graphics/Sprites/DrawableCircleSingerAvatar.cs rename to osu.Game.Rulesets.Karaoke/Graphics/Drawables/DrawableCircleSingerAvatar.cs index be2752c0e..708aa2779 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/Sprites/DrawableCircleSingerAvatar.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/Drawables/DrawableCircleSingerAvatar.cs @@ -9,7 +9,7 @@ using osu.Game.Rulesets.Karaoke.Beatmaps.Metadatas.Types; using osu.Game.Rulesets.Karaoke.Beatmaps.Utils; -namespace osu.Game.Rulesets.Karaoke.Graphics.Sprites; +namespace osu.Game.Rulesets.Karaoke.Graphics.Drawables; public partial class DrawableCircleSingerAvatar : DrawableSingerAvatar { diff --git a/osu.Game.Rulesets.Karaoke/Graphics/Sprites/DrawableSingerAvatar.cs b/osu.Game.Rulesets.Karaoke/Graphics/Drawables/DrawableSingerAvatar.cs similarity index 97% rename from osu.Game.Rulesets.Karaoke/Graphics/Sprites/DrawableSingerAvatar.cs rename to osu.Game.Rulesets.Karaoke/Graphics/Drawables/DrawableSingerAvatar.cs index 51276c176..b5ccd72b1 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/Sprites/DrawableSingerAvatar.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/Drawables/DrawableSingerAvatar.cs @@ -11,7 +11,7 @@ using osu.Game.Rulesets.Karaoke.Beatmaps.Metadatas; using osu.Game.Rulesets.Karaoke.Beatmaps.Metadatas.Types; -namespace osu.Game.Rulesets.Karaoke.Graphics.Sprites; +namespace osu.Game.Rulesets.Karaoke.Graphics.Drawables; public partial class DrawableSingerAvatar : CompositeDrawable { diff --git a/osu.Game.Rulesets.Karaoke/Graphics/Drawables/SingerDisplay.cs b/osu.Game.Rulesets.Karaoke/Graphics/Drawables/SingerDisplay.cs index 67edbe9c4..e8675f741 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/Drawables/SingerDisplay.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/Drawables/SingerDisplay.cs @@ -13,7 +13,6 @@ using osu.Game.Rulesets.Karaoke.Beatmaps.Metadatas; using osu.Game.Rulesets.Karaoke.Beatmaps.Metadatas.Types; using osu.Game.Rulesets.Karaoke.Graphics.Cursor; -using osu.Game.Rulesets.Karaoke.Graphics.Sprites; using osuTK; namespace osu.Game.Rulesets.Karaoke.Graphics.Drawables; diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Singers/SingerEditSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Singers/SingerEditSection.cs index cf587620c..75755c993 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Singers/SingerEditSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Settings/Singers/SingerEditSection.cs @@ -17,7 +17,7 @@ using osu.Game.Rulesets.Karaoke.Edit.ChangeHandlers.Lyrics; using osu.Game.Rulesets.Karaoke.Edit.Utils; using osu.Game.Rulesets.Karaoke.Graphics.Cursor; -using osu.Game.Rulesets.Karaoke.Graphics.Sprites; +using osu.Game.Rulesets.Karaoke.Graphics.Drawables; using osu.Game.Rulesets.Karaoke.Objects; using osuTK; diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/Components/SingerAvatar.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/Components/SingerAvatar.cs index 30f456927..3e0016df6 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/Components/SingerAvatar.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/Components/SingerAvatar.cs @@ -19,7 +19,7 @@ using osu.Game.Graphics.UserInterfaceV2; using osu.Game.Rulesets.Karaoke.Beatmaps.Metadatas; using osu.Game.Rulesets.Karaoke.Edit.ChangeHandlers.Beatmaps; -using osu.Game.Rulesets.Karaoke.Graphics.Sprites; +using osu.Game.Rulesets.Karaoke.Graphics.Drawables; using osuTK; namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Singers.Rows.Components;