Renamespace

2025-08-05 07:33:55 +09:00 · 2018-12-10 19:20:41 +09:00
parent cd41c45686
commit 1ac615b490
28 changed files with 77 additions and 73 deletions
--- a/osu.Game/Screens/Multi/Header.cs
+++ b/osu.Game/Screens/Multi/Header.cs
@ -10,7 +10,6 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.SearchableList;
-using osu.Game.Screens.Multi.Screens;
 using osuTK;
 using osuTK.Graphics;

--- a/osu.Game/Screens/Multi/Screens/IMultiplayerScreen.cs
+++ b/osu.Game/Screens/Multi/Screens/IMultiplayerScreen.cs
@ -1,7 +1,7 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-namespace osu.Game.Screens.Multi.Screens
+namespace osu.Game.Screens.Multi
 {
    public interface IMultiplayerScreen
    {
--- a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
@ -17,11 +17,12 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Screens.Multi.Components;
 using osu.Game.Users;
 using osuTK;
 using osuTK.Graphics;

-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.Multi.Lounge.Components
 {
    public class DrawableRoom : OsuClickableContainer, IStateful<SelectionState>, IFilterable
    {
--- a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
@ -6,7 +6,7 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays.SearchableList;
 using osuTK.Graphics;

-namespace osu.Game.Screens.Multi.Screens.Lounge
+namespace osu.Game.Screens.Multi.Lounge.Components
 {
    public class FilterControl : SearchableListFilterControl<LoungeTab, LoungeTab>
    {
--- a/osu.Game/Screens/Multi/Lounge/Components/ParticipantInfo.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/ParticipantInfo.cs
@ -13,7 +13,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Users;
 using osuTK;

-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.Multi.Lounge.Components
 {
    public class ParticipantInfo : Container
    {
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
@ -17,11 +17,12 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Screens.Multi.Components;
 using osu.Game.Users;
 using osuTK;
 using osuTK.Graphics;

-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.Multi.Lounge.Components
 {
    public class RoomInspector : Container
    {
--- a/osu.Game/Screens/Multi/Screens/Lounge/Lounge.cs
+++ b/osu.Game/Screens/Multi/Screens/Lounge/Lounge.cs
@ -11,12 +11,13 @@ using osu.Framework.Screens;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays.SearchableList;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.Multi.Match;
 using osuTK;

-namespace osu.Game.Screens.Multi.Screens.Lounge
+namespace osu.Game.Screens.Multi.Lounge
 {
-    public class Lounge : MultiplayerScreen
+    public class LoungeScreen : MultiplayerScreen
    {
        private readonly Container content;
        private readonly SearchContainer search;
@ -32,7 +33,7 @@ namespace osu.Game.Screens.Multi.Screens.Lounge

        protected override Drawable TransitionContent => content;

-        public Lounge()
+        public LoungeScreen()
        {
            Children = new Drawable[]
            {
@ -164,7 +165,7 @@ namespace osu.Game.Screens.Multi.Screens.Lounge

                Filter.Tabs.Current.Value = LoungeTab.Public;

-                Push(new Match.Match(roomBeingCreated));
+                Push(new MatchScreen(roomBeingCreated));
            }

            search.SearchTerm = Filter.Search.Current.Value ?? string.Empty;
@ -194,7 +195,7 @@ namespace osu.Game.Screens.Multi.Screens.Lounge
            RoomsContainer.ForEach(c => c.State = c == room ? SelectionState.Selected : SelectionState.NotSelected);
            Inspector.Room = room.Room;

-            Push(new Match.Match(room.Room));
+            Push(new MatchScreen(room.Room));
        }

        private class RoomsFilterContainer : FillFlowContainer<DrawableRoom>, IHasFilterableChildren
--- a/osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs
+++ b/osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs
@ -9,9 +9,10 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Screens.Multi.Components;
 using osuTK;

-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.Multi.Match.Components
 {
    public class GameTypePicker : DisableableTabControl<GameType>
    {
--- a/osu.Game/Screens/Multi/Match/Components/Header.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Header.cs
@ -17,7 +17,7 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays.SearchableList;
 using osuTK.Graphics;

-namespace osu.Game.Screens.Multi.Screens.Match
+namespace osu.Game.Screens.Multi.Match.Components
 {
    public class Header : Container
    {
--- a/osu.Game/Screens/Multi/Match/Components/Info.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Info.cs
@ -17,7 +17,7 @@ using osu.Game.Overlays.SearchableList;
 using osu.Game.Screens.Multi.Components;
 using osuTK;

-namespace osu.Game.Screens.Multi.Screens.Match
+namespace osu.Game.Screens.Multi.Match.Components
 {
    public class Info : Container
    {
--- a/osu.Game/Screens/Multi/Match/Components/MatchPage.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchPage.cs
@ -3,7 +3,7 @@

 using osu.Framework.Configuration;

-namespace osu.Game.Screens.Multi.Screens.Match
+namespace osu.Game.Screens.Multi.Match.Components
 {
    public abstract class MatchPage
    {
--- a/osu.Game/Screens/Multi/Match/Components/MatchTabControl.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchTabControl.cs
@ -10,7 +10,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osuTK.Graphics;

-namespace osu.Game.Screens.Multi.Screens.Match
+namespace osu.Game.Screens.Multi.Match.Components
 {
    public class MatchTabControl : PageTabControl<MatchPage>
    {
--- a/osu.Game/Screens/Multi/Match/Components/Participants.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Participants.cs
@ -11,7 +11,7 @@ using osu.Game.Screens.Multi.Components;
 using osu.Game.Users;
 using osuTK;

-namespace osu.Game.Screens.Multi.Screens.Match
+namespace osu.Game.Screens.Multi.Match.Components
 {
    public class Participants : CompositeDrawable
    {
--- a/osu.Game/Screens/Multi/Match/Components/RoomAvailabilityPicker.cs
+++ b/osu.Game/Screens/Multi/Match/Components/RoomAvailabilityPicker.cs
@ -10,10 +10,11 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Screens.Multi.Components;
 using osuTK;
 using osuTK.Graphics;

-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.Multi.Match.Components
 {
    public class RoomAvailabilityPicker : DisableableTabControl<RoomAvailability>
    {
--- a/osu.Game/Screens/Multi/Match/Components/RoomSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/RoomSettingsOverlay.cs
@ -12,11 +12,10 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays.SearchableList;
-using osu.Game.Screens.Multi.Components;
 using osuTK;
 using osuTK.Graphics;

-namespace osu.Game.Screens.Multi.Screens.Match
+namespace osu.Game.Screens.Multi.Match.Components
 {
    public class RoomSettingsOverlay : FocusedOverlayContainer
    {
--- a/osu.Game/Screens/Multi/Screens/Match/Match.cs
+++ b/osu.Game/Screens/Multi/Screens/Match/Match.cs
@ -9,12 +9,13 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Screens.Select;
 using osu.Game.Users;

-namespace osu.Game.Screens.Multi.Screens.Match
+namespace osu.Game.Screens.Multi.Match
 {
-    public class Match : MultiplayerScreen
+    public class MatchScreen : MultiplayerScreen
    {
        private readonly Participants participants;

@ -41,7 +42,7 @@ namespace osu.Game.Screens.Multi.Screens.Match
        [Resolved]
        private APIAccess api { get; set; }

-        public Match(Room room)
+        public MatchScreen(Room room)
        {
            this.room = room;

@ -53,29 +54,29 @@ namespace osu.Game.Screens.Multi.Screens.Match
            participantsBind.BindTo(room.Participants);
            maxParticipantsBind.BindTo(room.MaxParticipants);

-            Header header;
+            Components.Header header;
            RoomSettingsOverlay settings;
            Info info;

            Children = new Drawable[]
            {
-                header = new Header
+                header = new Components.Header
                {
                    Depth = -1,
                },
                info = new Info
                {
-                    Margin = new MarginPadding { Top = Header.HEIGHT },
+                    Margin = new MarginPadding { Top = Components.Header.HEIGHT },
                },
                participants = new Participants
                {
                    RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Top = Header.HEIGHT + Info.HEIGHT },
+                    Padding = new MarginPadding { Top = Components.Header.HEIGHT + Info.HEIGHT },
                },
                new Container
                {
                    RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Top = Header.HEIGHT },
+                    Padding = new MarginPadding { Top = Components.Header.HEIGHT },
                    Child = settings = new RoomSettingsOverlay
                    {
                        RelativeSizeAxes = Axes.Both,
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@ -9,7 +9,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Containers;
 using osu.Game.Screens.Menu;
-using osu.Game.Screens.Multi.Screens.Lounge;
+using osu.Game.Screens.Multi.Lounge;

 namespace osu.Game.Screens.Multi
 {
@ -26,7 +26,7 @@ namespace osu.Game.Screens.Multi
                RelativeSizeAxes = Axes.Both,
            };

-            Lounge lounge;
+            LoungeScreen loungeScreen;
            Children = new Drawable[]
            {
                new Container
@ -53,12 +53,12 @@ namespace osu.Game.Screens.Multi
                {
                    RelativeSizeAxes = Axes.Both,
                    Padding = new MarginPadding { Top = Header.HEIGHT },
-                    Child = lounge = new Lounge(),
+                    Child = loungeScreen = new LoungeScreen(),
                },
-                new Header(lounge),
+                new Header(loungeScreen),
            };

-            lounge.Exited += s => Exit();
+            loungeScreen.Exited += s => Exit();
        }

        protected override void OnEntering(Screen last)
--- a/osu.Game/Screens/Multi/Screens/MultiplayerScreen.cs
+++ b/osu.Game/Screens/Multi/Screens/MultiplayerScreen.cs
@ -5,7 +5,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Game.Graphics.Containers;

-namespace osu.Game.Screens.Multi.Screens
+namespace osu.Game.Screens.Multi
 {
    public abstract class MultiplayerScreen : OsuScreen, IMultiplayerScreen
    {