Remove RoomInspector from the lounge

osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs

@@ -1,49 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using NUnit.Framework;
-using osu.Framework.Graphics;
-using osu.Game.Online.Rooms;
-using osu.Game.Online.Rooms.RoomStatuses;
-using osu.Game.Screens.OnlinePlay.Lounge.Components;
-using osu.Game.Tests.Visual.OnlinePlay;
-using osu.Game.Users;
-
-namespace osu.Game.Tests.Visual.Multiplayer
-{
-    public class TestSceneLoungeRoomInfo : OnlinePlayTestScene
-    {
-        [SetUp]
-        public new void Setup() => Schedule(() =>
-        {
-            SelectedRoom.Value = new Room();
-
-            Child = new RoomInfo
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Width = 500
-            };
-        });
-
-        [Test]
-        public void TestNonSelectedRoom()
-        {
-            AddStep("set null room", () => SelectedRoom.Value.RoomID.Value = null);
-        }
-
-        [Test]
-        public void TestOpenRoom()
-        {
-            AddStep("set open room", () =>
-            {
-                SelectedRoom.Value.RoomID.Value = 0;
-                SelectedRoom.Value.Name.Value = "Room 0";
-                SelectedRoom.Value.Host.Value = new User { Username = "peppy", Id = 2 };
-                SelectedRoom.Value.EndDate.Value = DateTimeOffset.Now.AddMonths(1);
-                SelectedRoom.Value.Status.Value = new RoomStatusOpen();
-            });
-        }
-    }
-}

osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs

@@ -1,88 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Humanizer;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Users.Drawables;
-using osuTK;
-
-namespace osu.Game.Screens.OnlinePlay.Lounge.Components
-{
-    public class ParticipantInfo : OnlinePlayComposite
-    {
-        public ParticipantInfo()
-        {
-            RelativeSizeAxes = Axes.X;
-            Height = 15f;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            OsuSpriteText summary;
-            Container flagContainer;
-            LinkFlowContainer hostText;
-
-            InternalChildren = new Drawable[]
-            {
-                new FillFlowContainer
-                {
-                    AutoSizeAxes = Axes.X,
-                    RelativeSizeAxes = Axes.Y,
-                    Direction = FillDirection.Horizontal,
-                    Spacing = new Vector2(5f, 0f),
-                    Children = new Drawable[]
-                    {
-                        flagContainer = new Container
-                        {
-                            Width = 22f,
-                            RelativeSizeAxes = Axes.Y,
-                        },
-                        hostText = new LinkFlowContainer
-                        {
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
-                            AutoSizeAxes = Axes.Both
-                        }
-                    },
-                },
-                new FillFlowContainer
-                {
-                    Anchor = Anchor.CentreRight,
-                    Origin = Anchor.CentreRight,
-                    AutoSizeAxes = Axes.Both,
-                    Direction = FillDirection.Horizontal,
-                    Colour = colours.Gray9,
-                    Children = new[]
-                    {
-                        summary = new OsuSpriteText
-                        {
-                            Text = "0 participants",
-                        }
-                    },
-                },
-            };
-
-            Host.BindValueChanged(host =>
-            {
-                hostText.Clear();
-                flagContainer.Clear();
-
-                if (host.NewValue != null)
-                {
-                    hostText.AddText("hosted by ");
-                    hostText.AddUserLink(host.NewValue, s => s.Font = s.Font.With(Typeface.Torus, weight: FontWeight.Bold, italics: true));
-
-                    flagContainer.Child = new UpdateableFlag(host.NewValue.Country) { RelativeSizeAxes = Axes.Both };
-                }
-            }, true);
-
-            ParticipantCount.BindValueChanged(count => summary.Text = "participant".ToQuantity(count.NewValue), true);
-        }
-    }
-}

osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs

@@ -1,86 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System.Collections.Generic;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Screens.OnlinePlay.Components;
-using osuTK;
-
-namespace osu.Game.Screens.OnlinePlay.Lounge.Components
-{
-    public class RoomInfo : OnlinePlayComposite
-    {
-        private readonly List<Drawable> statusElements = new List<Drawable>();
-        private readonly OsuTextFlowContainer roomName;
-
-        public RoomInfo()
-        {
-            AutoSizeAxes = Axes.Y;
-
-            RoomLocalUserInfo localUserInfo;
-            EndDateInfo statusInfo;
-            ModeTypeInfo typeInfo;
-            ParticipantInfo participantInfo;
-
-            InternalChild = new FillFlowContainer
-            {
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.CentreLeft,
-                RelativeSizeAxes = Axes.X,
-                Spacing = new Vector2(0, 10),
-                AutoSizeAxes = Axes.Y,
-                Direction = FillDirection.Vertical,
-                Children = new Drawable[]
-                {
-                    roomName = new OsuTextFlowContainer(t => t.Font = OsuFont.GetFont(size: 30))
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                    },
-                    participantInfo = new ParticipantInfo(),
-                    new Container
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Children = new Drawable[]
-                        {
-                            statusInfo = new EndDateInfo(),
-                            typeInfo = new ModeTypeInfo
-                            {
-                                Anchor = Anchor.BottomRight,
-                                Origin = Anchor.BottomRight
-                            }
-                        }
-                    },
-                    localUserInfo = new RoomLocalUserInfo(),
-                }
-            };
-
-            statusElements.AddRange(new Drawable[]
-            {
-                statusInfo, typeInfo, participantInfo, localUserInfo
-            });
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            if (RoomID.Value == null)
-                statusElements.ForEach(e => e.FadeOut());
-            RoomID.BindValueChanged(id =>
-            {
-                if (id.NewValue == null)
-                    statusElements.ForEach(e => e.FadeOut(100));
-                else
-                    statusElements.ForEach(e => e.FadeIn(100));
-            }, true);
-            RoomName.BindValueChanged(name =>
-            {
-                roomName.Text = name.NewValue ?? "No room selected";
-            }, true);
-        }
-    }
-}

osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs

@@ -1,91 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Beatmaps;
-using osu.Game.Graphics;
-using osu.Game.Screens.OnlinePlay.Components;
-using osuTK.Graphics;
-
-namespace osu.Game.Screens.OnlinePlay.Lounge.Components
-{
-    public class RoomInspector : OnlinePlayComposite
-    {
-        private const float transition_duration = 100;
-
-        private readonly MarginPadding contentPadding = new MarginPadding { Horizontal = 20, Vertical = 10 };
-
-        [Resolved]
-        private BeatmapManager beatmaps { get; set; }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            OverlinedHeader participantsHeader;
-
-            InternalChildren = new Drawable[]
-            {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = Color4.Black,
-                    Alpha = 0.25f
-                },
-                new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Horizontal = 30 },
-                    Child = new GridContainer
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Content = new[]
-                        {
-                            new Drawable[]
-                            {
-                                new FillFlowContainer
-                                {
-                                    RelativeSizeAxes = Axes.X,
-                                    AutoSizeAxes = Axes.Y,
-                                    Direction = FillDirection.Vertical,
-                                    Children = new Drawable[]
-                                    {
-                                        new RoomInfo
-                                        {
-                                            RelativeSizeAxes = Axes.X,
-                                            Margin = new MarginPadding { Vertical = 60 },
-                                        },
-                                        participantsHeader = new OverlinedHeader("Recent Participants"),
-                                        new ParticipantsDisplay(Direction.Vertical)
-                                        {
-                                            RelativeSizeAxes = Axes.X,
-                                            Height = ParticipantsList.TILE_SIZE * 3,
-                                            Details = { BindTarget = participantsHeader.Details }
-                                        }
-                                    }
-                                }
-                            },
-                            new Drawable[] { new OverlinedPlaylistHeader(), },
-                            new Drawable[]
-                            {
-                                new DrawableRoomPlaylist(false, false)
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Items = { BindTarget = Playlist }
-                                },
-                            },
-                        },
-                        RowDimensions = new[]
-                        {
-                            new Dimension(GridSizeMode.AutoSize),
-                            new Dimension(GridSizeMode.AutoSize),
-                            new Dimension(),
-                        }
-                    }
-                }
-            };
-        }
-    }
-}

osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs

@@ -60,7 +60,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                     Direction = FillDirection.Vertical,
-                    Spacing = new Vector2(2),
+                    Spacing = new Vector2(10),
                 }
             };
         }

osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs

@@ -57,12 +57,9 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
                 content = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
+                    Child = new Container
-                    {
-                        new Container
                     {
                         RelativeSizeAxes = Axes.Both,
-                            Width = 0.55f,
                         Children = new Drawable[]
                         {
                             scrollContainer = new OsuScrollContainer
@@ -75,14 +72,6 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
                             loadingLayer = new LoadingLayer(true),
                         }
                     },
-                        new RoomInspector
-                        {
-                            Anchor = Anchor.TopRight,
-                            Origin = Anchor.TopRight,
-                            RelativeSizeAxes = Axes.Both,
-                            Width = 0.45f,
-                        },
-                    },
                 },
                 filter = CreateFilterControl().With(d =>
                 {