From 1ac615b4905581b50c48e45c22f027a43ddb2a81 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Mon, 10 Dec 2018 19:20:41 +0900 Subject: [PATCH] Renamespace --- osu.Game.Tests/Visual/TestCaseDrawableRoom.cs | 2 +- osu.Game.Tests/Visual/TestCaseLounge.cs | 40 +++++++++---------- osu.Game.Tests/Visual/TestCaseMatch.cs | 10 ++--- osu.Game.Tests/Visual/TestCaseMatchInfo.cs | 2 +- .../Visual/TestCaseMatchParticipants.cs | 2 +- osu.Game.Tests/Visual/TestCaseMultiHeader.cs | 8 ++-- osu.Game.Tests/Visual/TestCaseMultiScreen.cs | 5 ++- .../Visual/TestCaseRoomInspector.cs | 2 +- osu.Game.Tests/Visual/TestCaseRoomSettings.cs | 3 +- osu.Game/Screens/Multi/Header.cs | 1 - .../Multi/{Screens => }/IMultiplayerScreen.cs | 2 +- .../{ => Lounge}/Components/DrawableRoom.cs | 3 +- .../Components}/FilterControl.cs | 2 +- .../Components/ParticipantInfo.cs | 2 +- .../{ => Lounge}/Components/RoomInspector.cs | 3 +- .../Lounge.cs => Lounge/LoungeScreen.cs} | 13 +++--- .../{ => Match}/Components/GameTypePicker.cs | 3 +- .../Match => Match/Components}/Header.cs | 2 +- .../Match => Match/Components}/Info.cs | 2 +- .../Match => Match/Components}/MatchPage.cs | 2 +- .../Components}/MatchTabControl.cs | 2 +- .../Components}/Participants.cs | 2 +- .../Components/RoomAvailabilityPicker.cs | 3 +- .../Components}/RoomSettingsOverlay.cs | 3 +- .../Match/Match.cs => Match/MatchScreen.cs} | 17 ++++---- osu.Game/Screens/Multi/Multiplayer.cs | 10 ++--- .../Multi/{Screens => }/MultiplayerScreen.cs | 2 +- osu.Game/Screens/Select/MatchSongSelect.cs | 2 +- 28 files changed, 77 insertions(+), 73 deletions(-) rename osu.Game/Screens/Multi/{Screens => }/IMultiplayerScreen.cs (85%) rename osu.Game/Screens/Multi/{ => Lounge}/Components/DrawableRoom.cs (99%) rename osu.Game/Screens/Multi/{Screens/Lounge => Lounge/Components}/FilterControl.cs (95%) rename osu.Game/Screens/Multi/{ => Lounge}/Components/ParticipantInfo.cs (99%) rename osu.Game/Screens/Multi/{ => Lounge}/Components/RoomInspector.cs (99%) rename osu.Game/Screens/Multi/{Screens/Lounge/Lounge.cs => Lounge/LoungeScreen.cs} (95%) rename osu.Game/Screens/Multi/{ => Match}/Components/GameTypePicker.cs (97%) rename osu.Game/Screens/Multi/{Screens/Match => Match/Components}/Header.cs (98%) rename osu.Game/Screens/Multi/{Screens/Match => Match/Components}/Info.cs (99%) rename osu.Game/Screens/Multi/{Screens/Match => Match/Components}/MatchPage.cs (93%) rename osu.Game/Screens/Multi/{Screens/Match => Match/Components}/MatchTabControl.cs (97%) rename osu.Game/Screens/Multi/{Screens/Match => Match/Components}/Participants.cs (98%) rename osu.Game/Screens/Multi/{ => Match}/Components/RoomAvailabilityPicker.cs (97%) rename osu.Game/Screens/Multi/{Screens/Match => Match/Components}/RoomSettingsOverlay.cs (99%) rename osu.Game/Screens/Multi/{Screens/Match/Match.cs => Match/MatchScreen.cs} (87%) rename osu.Game/Screens/Multi/{Screens => }/MultiplayerScreen.cs (97%) diff --git a/osu.Game.Tests/Visual/TestCaseDrawableRoom.cs b/osu.Game.Tests/Visual/TestCaseDrawableRoom.cs index 8fd8880fd6..bcebf0a8d9 100644 --- a/osu.Game.Tests/Visual/TestCaseDrawableRoom.cs +++ b/osu.Game.Tests/Visual/TestCaseDrawableRoom.cs @@ -9,7 +9,7 @@ using osu.Game.Beatmaps; using osu.Game.Graphics.UserInterface; using osu.Game.Online.Multiplayer; using osu.Game.Rulesets; -using osu.Game.Screens.Multi.Components; +using osu.Game.Screens.Multi.Lounge.Components; using osu.Game.Users; namespace osu.Game.Tests.Visual diff --git a/osu.Game.Tests/Visual/TestCaseLounge.cs b/osu.Game.Tests/Visual/TestCaseLounge.cs index e0e6332ef0..ecf7c5194c 100644 --- a/osu.Game.Tests/Visual/TestCaseLounge.cs +++ b/osu.Game.Tests/Visual/TestCaseLounge.cs @@ -10,8 +10,8 @@ using osu.Game.Online.Multiplayer; using osu.Game.Rulesets; using osu.Game.Screens; using osu.Game.Screens.Backgrounds; -using osu.Game.Screens.Multi.Components; -using osu.Game.Screens.Multi.Screens.Lounge; +using osu.Game.Screens.Multi.Lounge; +using osu.Game.Screens.Multi.Lounge.Components; using osu.Game.Users; using osuTK.Input; @@ -20,12 +20,12 @@ namespace osu.Game.Tests.Visual [TestFixture] public class TestCaseLounge : ManualInputManagerTestCase { - private TestLounge lounge; + private TestLoungeScreen loungeScreen; [BackgroundDependencyLoader] private void load(RulesetStore rulesets) { - lounge = new TestLounge(); + loungeScreen = new TestLoungeScreen(); Room[] rooms = { @@ -159,47 +159,47 @@ namespace osu.Game.Tests.Visual }, }; - AddStep(@"show", () => Add(lounge)); - AddStep(@"set rooms", () => lounge.Rooms = rooms); + AddStep(@"show", () => Add(loungeScreen)); + AddStep(@"set rooms", () => loungeScreen.Rooms = rooms); selectAssert(0); - AddStep(@"clear rooms", () => lounge.Rooms = new Room[] {}); - AddAssert(@"no room selected", () => lounge.SelectedRoom == null); - AddStep(@"set rooms", () => lounge.Rooms = rooms); + AddStep(@"clear rooms", () => loungeScreen.Rooms = new Room[] {}); + AddAssert(@"no room selected", () => loungeScreen.SelectedRoom == null); + AddStep(@"set rooms", () => loungeScreen.Rooms = rooms); selectAssert(1); AddStep(@"open room 1", () => clickRoom(1)); - AddUntilStep(() => lounge.ChildScreen?.IsCurrentScreen == true, "wait until room current"); - AddStep(@"make lounge current", lounge.MakeCurrent); + AddUntilStep(() => loungeScreen.ChildScreen?.IsCurrentScreen == true, "wait until room current"); + AddStep(@"make lounge current", loungeScreen.MakeCurrent); filterAssert(@"THE FINAL", LoungeTab.Public, 1); filterAssert(string.Empty, LoungeTab.Public, 2); filterAssert(string.Empty, LoungeTab.Private, 1); filterAssert(string.Empty, LoungeTab.Public, 2); filterAssert(@"no matches", LoungeTab.Public, 0); - AddStep(@"clear rooms", () => lounge.Rooms = new Room[] {}); - AddStep(@"set rooms", () => lounge.Rooms = rooms); - AddAssert(@"no matches after clear", () => !lounge.ChildRooms.Any()); + AddStep(@"clear rooms", () => loungeScreen.Rooms = new Room[] {}); + AddStep(@"set rooms", () => loungeScreen.Rooms = rooms); + AddAssert(@"no matches after clear", () => !loungeScreen.ChildRooms.Any()); filterAssert(string.Empty, LoungeTab.Public, 2); - AddStep(@"exit", lounge.Exit); + AddStep(@"exit", loungeScreen.Exit); } private void clickRoom(int n) { - InputManager.MoveMouseTo(lounge.ChildRooms.ElementAt(n)); + InputManager.MoveMouseTo(loungeScreen.ChildRooms.ElementAt(n)); InputManager.Click(MouseButton.Left); } private void selectAssert(int n) { AddStep($@"select room {n}", () => clickRoom(n)); - AddAssert($@"room {n} selected", () => lounge.SelectedRoom == lounge.ChildRooms.ElementAt(n).Room); + AddAssert($@"room {n} selected", () => loungeScreen.SelectedRoom == loungeScreen.ChildRooms.ElementAt(n).Room); } private void filterAssert(string filter, LoungeTab tab, int endCount) { - AddStep($@"filter '{filter}', {tab}", () => lounge.SetFilter(filter, tab)); - AddAssert(@"filtered correctly", () => lounge.ChildRooms.Count() == endCount); + AddStep($@"filter '{filter}', {tab}", () => loungeScreen.SetFilter(filter, tab)); + AddAssert(@"filtered correctly", () => loungeScreen.ChildRooms.Count() == endCount); } - private class TestLounge : Lounge + private class TestLoungeScreen : LoungeScreen { protected override BackgroundScreen CreateBackground() => new BackgroundScreenDefault(); diff --git a/osu.Game.Tests/Visual/TestCaseMatch.cs b/osu.Game.Tests/Visual/TestCaseMatch.cs index 6099ed41bb..fd4806ac90 100644 --- a/osu.Game.Tests/Visual/TestCaseMatch.cs +++ b/osu.Game.Tests/Visual/TestCaseMatch.cs @@ -8,8 +8,8 @@ using osu.Framework.Allocation; using osu.Game.Beatmaps; using osu.Game.Online.Multiplayer; using osu.Game.Rulesets; -using osu.Game.Screens.Multi.Components; -using osu.Game.Screens.Multi.Screens.Match; +using osu.Game.Screens.Multi.Match; +using osu.Game.Screens.Multi.Match.Components; using osu.Game.Users; namespace osu.Game.Tests.Visual @@ -96,9 +96,9 @@ namespace osu.Game.Tests.Visual }, }; - Match match = new Match(room); + MatchScreen matchScreen = new MatchScreen(room); - AddStep(@"show", () => Add(match)); + AddStep(@"show", () => Add(matchScreen)); AddStep(@"null beatmap", () => room.Beatmap.Value = null); AddStep(@"change name", () => room.Name.Value = @"Two Awesome Rooms"); AddStep(@"change status", () => room.Status.Value = new RoomStatusPlaying()); @@ -146,7 +146,7 @@ namespace osu.Game.Tests.Visual }, }); - AddStep(@"exit", match.Exit); + AddStep(@"exit", matchScreen.Exit); } } } diff --git a/osu.Game.Tests/Visual/TestCaseMatchInfo.cs b/osu.Game.Tests/Visual/TestCaseMatchInfo.cs index 6998ff4c39..37b3f6030d 100644 --- a/osu.Game.Tests/Visual/TestCaseMatchInfo.cs +++ b/osu.Game.Tests/Visual/TestCaseMatchInfo.cs @@ -6,7 +6,7 @@ using osu.Framework.Allocation; using osu.Game.Beatmaps; using osu.Game.Online.Multiplayer; using osu.Game.Rulesets; -using osu.Game.Screens.Multi.Screens.Match; +using osu.Game.Screens.Multi.Match.Components; namespace osu.Game.Tests.Visual { diff --git a/osu.Game.Tests/Visual/TestCaseMatchParticipants.cs b/osu.Game.Tests/Visual/TestCaseMatchParticipants.cs index 6024ec8ea6..67a56e525f 100644 --- a/osu.Game.Tests/Visual/TestCaseMatchParticipants.cs +++ b/osu.Game.Tests/Visual/TestCaseMatchParticipants.cs @@ -3,7 +3,7 @@ using NUnit.Framework; using osu.Framework.Graphics; -using osu.Game.Screens.Multi.Screens.Match; +using osu.Game.Screens.Multi.Match.Components; using osu.Game.Users; namespace osu.Game.Tests.Visual diff --git a/osu.Game.Tests/Visual/TestCaseMultiHeader.cs b/osu.Game.Tests/Visual/TestCaseMultiHeader.cs index d27a447077..e416000f31 100644 --- a/osu.Game.Tests/Visual/TestCaseMultiHeader.cs +++ b/osu.Game.Tests/Visual/TestCaseMultiHeader.cs @@ -4,7 +4,7 @@ using NUnit.Framework; using osu.Framework.Graphics; using osu.Game.Screens.Multi; -using osu.Game.Screens.Multi.Screens.Lounge; +using osu.Game.Screens.Multi.Lounge; namespace osu.Game.Tests.Visual { @@ -13,14 +13,14 @@ namespace osu.Game.Tests.Visual { public TestCaseMultiHeader() { - Lounge lounge; + LoungeScreen loungeScreen; Children = new Drawable[] { - lounge = new Lounge + loungeScreen = new LoungeScreen { Padding = new MarginPadding { Top = Header.HEIGHT }, }, - new Header(lounge), + new Header(loungeScreen), }; } } diff --git a/osu.Game.Tests/Visual/TestCaseMultiScreen.cs b/osu.Game.Tests/Visual/TestCaseMultiScreen.cs index 9df057806e..c65ab4e3e3 100644 --- a/osu.Game.Tests/Visual/TestCaseMultiScreen.cs +++ b/osu.Game.Tests/Visual/TestCaseMultiScreen.cs @@ -5,7 +5,8 @@ using System; using System.Collections.Generic; using NUnit.Framework; using osu.Game.Screens.Multi; -using osu.Game.Screens.Multi.Screens.Lounge; +using osu.Game.Screens.Multi.Lounge; +using osu.Game.Screens.Multi.Lounge.Components; namespace osu.Game.Tests.Visual { @@ -15,7 +16,7 @@ namespace osu.Game.Tests.Visual public override IReadOnlyList RequiredTypes => new[] { typeof(Multiplayer), - typeof(Lounge), + typeof(LoungeScreen), typeof(FilterControl) }; diff --git a/osu.Game.Tests/Visual/TestCaseRoomInspector.cs b/osu.Game.Tests/Visual/TestCaseRoomInspector.cs index 06b9c4a6f9..57ed8419df 100644 --- a/osu.Game.Tests/Visual/TestCaseRoomInspector.cs +++ b/osu.Game.Tests/Visual/TestCaseRoomInspector.cs @@ -7,7 +7,7 @@ using osu.Framework.Graphics; using osu.Game.Beatmaps; using osu.Game.Online.Multiplayer; using osu.Game.Rulesets; -using osu.Game.Screens.Multi.Components; +using osu.Game.Screens.Multi.Lounge.Components; using osu.Game.Users; namespace osu.Game.Tests.Visual diff --git a/osu.Game.Tests/Visual/TestCaseRoomSettings.cs b/osu.Game.Tests/Visual/TestCaseRoomSettings.cs index b0b287fdb3..19e27ddefe 100644 --- a/osu.Game.Tests/Visual/TestCaseRoomSettings.cs +++ b/osu.Game.Tests/Visual/TestCaseRoomSettings.cs @@ -8,8 +8,7 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Testing.Input; using osu.Game.Online.Multiplayer; -using osu.Game.Screens.Multi.Components; -using osu.Game.Screens.Multi.Screens.Match; +using osu.Game.Screens.Multi.Match.Components; using osuTK.Input; namespace osu.Game.Tests.Visual diff --git a/osu.Game/Screens/Multi/Header.cs b/osu.Game/Screens/Multi/Header.cs index 612a3e6993..8e5a7381e9 100644 --- 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; diff --git a/osu.Game/Screens/Multi/Screens/IMultiplayerScreen.cs b/osu.Game/Screens/Multi/IMultiplayerScreen.cs similarity index 85% rename from osu.Game/Screens/Multi/Screens/IMultiplayerScreen.cs rename to osu.Game/Screens/Multi/IMultiplayerScreen.cs index 0b6ebc3716..c1f43fa30d 100644 --- a/osu.Game/Screens/Multi/Screens/IMultiplayerScreen.cs +++ b/osu.Game/Screens/Multi/IMultiplayerScreen.cs @@ -1,7 +1,7 @@ // Copyright (c) 2007-2018 ppy Pty Ltd . // 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 { diff --git a/osu.Game/Screens/Multi/Components/DrawableRoom.cs b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs similarity index 99% rename from osu.Game/Screens/Multi/Components/DrawableRoom.cs rename to osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs index 9425457670..57ce9fc0b9 100644 --- a/osu.Game/Screens/Multi/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, IFilterable { diff --git a/osu.Game/Screens/Multi/Screens/Lounge/FilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs similarity index 95% rename from osu.Game/Screens/Multi/Screens/Lounge/FilterControl.cs rename to osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs index 301e235b79..fdc6c6f693 100644 --- a/osu.Game/Screens/Multi/Screens/Lounge/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 { diff --git a/osu.Game/Screens/Multi/Components/ParticipantInfo.cs b/osu.Game/Screens/Multi/Lounge/Components/ParticipantInfo.cs similarity index 99% rename from osu.Game/Screens/Multi/Components/ParticipantInfo.cs rename to osu.Game/Screens/Multi/Lounge/Components/ParticipantInfo.cs index 47aff3f200..3bc20b58c5 100644 --- a/osu.Game/Screens/Multi/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 { diff --git a/osu.Game/Screens/Multi/Components/RoomInspector.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs similarity index 99% rename from osu.Game/Screens/Multi/Components/RoomInspector.cs rename to osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs index 07cf5541c5..496d8b52ca 100644 --- a/osu.Game/Screens/Multi/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 { diff --git a/osu.Game/Screens/Multi/Screens/Lounge/Lounge.cs b/osu.Game/Screens/Multi/Lounge/LoungeScreen.cs similarity index 95% rename from osu.Game/Screens/Multi/Screens/Lounge/Lounge.cs rename to osu.Game/Screens/Multi/Lounge/LoungeScreen.cs index 19205065bc..3e81c7d652 100644 --- a/osu.Game/Screens/Multi/Screens/Lounge/Lounge.cs +++ b/osu.Game/Screens/Multi/Lounge/LoungeScreen.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, IHasFilterableChildren diff --git a/osu.Game/Screens/Multi/Components/GameTypePicker.cs b/osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs similarity index 97% rename from osu.Game/Screens/Multi/Components/GameTypePicker.cs rename to osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs index d9619ad35d..aec26a751e 100644 --- a/osu.Game/Screens/Multi/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 { diff --git a/osu.Game/Screens/Multi/Screens/Match/Header.cs b/osu.Game/Screens/Multi/Match/Components/Header.cs similarity index 98% rename from osu.Game/Screens/Multi/Screens/Match/Header.cs rename to osu.Game/Screens/Multi/Match/Components/Header.cs index 7d3525370f..9c72403806 100644 --- a/osu.Game/Screens/Multi/Screens/Match/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 { diff --git a/osu.Game/Screens/Multi/Screens/Match/Info.cs b/osu.Game/Screens/Multi/Match/Components/Info.cs similarity index 99% rename from osu.Game/Screens/Multi/Screens/Match/Info.cs rename to osu.Game/Screens/Multi/Match/Components/Info.cs index d479765159..b3de5abf67 100644 --- a/osu.Game/Screens/Multi/Screens/Match/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 { diff --git a/osu.Game/Screens/Multi/Screens/Match/MatchPage.cs b/osu.Game/Screens/Multi/Match/Components/MatchPage.cs similarity index 93% rename from osu.Game/Screens/Multi/Screens/Match/MatchPage.cs rename to osu.Game/Screens/Multi/Match/Components/MatchPage.cs index 710e41ec69..54ba345934 100644 --- a/osu.Game/Screens/Multi/Screens/Match/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 { diff --git a/osu.Game/Screens/Multi/Screens/Match/MatchTabControl.cs b/osu.Game/Screens/Multi/Match/Components/MatchTabControl.cs similarity index 97% rename from osu.Game/Screens/Multi/Screens/Match/MatchTabControl.cs rename to osu.Game/Screens/Multi/Match/Components/MatchTabControl.cs index 5fd64179cd..51698fa50f 100644 --- a/osu.Game/Screens/Multi/Screens/Match/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 { diff --git a/osu.Game/Screens/Multi/Screens/Match/Participants.cs b/osu.Game/Screens/Multi/Match/Components/Participants.cs similarity index 98% rename from osu.Game/Screens/Multi/Screens/Match/Participants.cs rename to osu.Game/Screens/Multi/Match/Components/Participants.cs index 98ab758f81..92732dc045 100644 --- a/osu.Game/Screens/Multi/Screens/Match/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 { diff --git a/osu.Game/Screens/Multi/Components/RoomAvailabilityPicker.cs b/osu.Game/Screens/Multi/Match/Components/RoomAvailabilityPicker.cs similarity index 97% rename from osu.Game/Screens/Multi/Components/RoomAvailabilityPicker.cs rename to osu.Game/Screens/Multi/Match/Components/RoomAvailabilityPicker.cs index 287add5de1..4ddc9b30e9 100644 --- a/osu.Game/Screens/Multi/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 { diff --git a/osu.Game/Screens/Multi/Screens/Match/RoomSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/RoomSettingsOverlay.cs similarity index 99% rename from osu.Game/Screens/Multi/Screens/Match/RoomSettingsOverlay.cs rename to osu.Game/Screens/Multi/Match/Components/RoomSettingsOverlay.cs index 747c109e3f..56990403c2 100644 --- a/osu.Game/Screens/Multi/Screens/Match/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 { diff --git a/osu.Game/Screens/Multi/Screens/Match/Match.cs b/osu.Game/Screens/Multi/Match/MatchScreen.cs similarity index 87% rename from osu.Game/Screens/Multi/Screens/Match/Match.cs rename to osu.Game/Screens/Multi/Match/MatchScreen.cs index 40590a6982..755b071f30 100644 --- a/osu.Game/Screens/Multi/Screens/Match/Match.cs +++ b/osu.Game/Screens/Multi/Match/MatchScreen.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, diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs index 7822fa68dc..d90e9ea33d 100644 --- 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) diff --git a/osu.Game/Screens/Multi/Screens/MultiplayerScreen.cs b/osu.Game/Screens/Multi/MultiplayerScreen.cs similarity index 97% rename from osu.Game/Screens/Multi/Screens/MultiplayerScreen.cs rename to osu.Game/Screens/Multi/MultiplayerScreen.cs index 3184316a33..da9a2b3051 100644 --- a/osu.Game/Screens/Multi/Screens/MultiplayerScreen.cs +++ b/osu.Game/Screens/Multi/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 { diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs index 28525215fb..94ac951159 100644 --- a/osu.Game/Screens/Select/MatchSongSelect.cs +++ b/osu.Game/Screens/Select/MatchSongSelect.cs @@ -1,7 +1,7 @@ // Copyright (c) 2007-2018 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using osu.Game.Screens.Multi.Screens; +using osu.Game.Screens.Multi; namespace osu.Game.Screens.Select {