Merge pull request #2156 from andy840119/move-some-component-out-of-s…

…hared-component Move some component out of shared component.
karaoke-dev · Dec 17, 2023 · 21e84f6 · 21e84f6
2 parents 4beac86 + 29e775d
commit 21e84f6
Show file tree

Hide file tree

Showing 18 changed files with 16 additions and 20 deletions.
diff --git a/...ics/TestSceneMicrophoneSoundVisualizer.cs → ...ews/TestSceneMicrophoneSoundVisualizer.cs b/...ics/TestSceneMicrophoneSoundVisualizer.cs → ...ews/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/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/...ace/RearrangeableTextFlowListContainer.cs → ...ers/RearrangeableTextFlowListContainer.cs b/...ace/RearrangeableTextFlowListContainer.cs → ...ers/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;
 
 /// <summary>
 /// Implement most feature for searchable text container.

diff --git 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/...ics/Sprites/DrawableCircleSingerAvatar.cs → ...s/Drawables/DrawableCircleSingerAvatar.cs b/...ics/Sprites/DrawableCircleSingerAvatar.cs → ...s/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/.../Graphics/Sprites/DrawableSingerAvatar.cs → ...raphics/Drawables/DrawableSingerAvatar.cs b/.../Graphics/Sprites/DrawableSingerAvatar.cs → ...raphics/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/...e/Graphics/UserInterface/SingerDisplay.cs → ...raoke/Graphics/Drawables/SingerDisplay.cs b/...e/Graphics/UserInterface/SingerDisplay.cs → ...raoke/Graphics/Drawables/SingerDisplay.cs
@@ -13,10 +13,9 @@
 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.UserInterface;
+namespace osu.Game.Rulesets.Karaoke.Graphics.Drawables;
 
 public partial class SingerDisplay : Container, IHasCurrentValue<IReadOnlyList<Singer>>
 {

diff --git 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
@@ -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
@@ -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;

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
@@ -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/.../Graphics/UserInterface/CircleCheckbox.cs → ...atmaps/Lyrics/LyricList/CircleCheckbox.cs b/.../Graphics/UserInterface/CircleCheckbox.cs → ...atmaps/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/...ame.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricList/Rows/Info/Badge/SingerInfo.cs b/...ame.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;

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
@@ -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;

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
@@ -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
@@ -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;

diff --git 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/...serInterface/MicrophoneSoundVisualizer.cs → ...eviews/Input/MicrophoneSoundVisualizer.cs b/...serInterface/MicrophoneSoundVisualizer.cs → ...eviews/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
 {