mirror of
https://github.com/ppy/osu.git
synced 2024-11-20 04:33:22 +08:00
54982dcdd7
In theory this seemed like a good idea (and an optimisation in some cases, due to lower fill rate), but in practice this leads to weird edge cases. This aims to do away with the operations on external drawables by applying a dim to the area behind the `LoadingLayer` when required. I went over each usage and ensured they look as good or better than previously. The specific bad usage here was the restoration of the colour on dispose (if the `LoadingLayer` was disposed in a still-visible state). I'm aware that the `BeatmapListingOverlay` will now dim completely during load. I think this is fine for the time being.
261 lines
9.4 KiB
C#
261 lines
9.4 KiB
C#
// 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 System.Linq;
|
|
using System.Threading;
|
|
using osu.Framework.Allocation;
|
|
using osu.Framework.Bindables;
|
|
using osu.Framework.Graphics;
|
|
using osu.Framework.Graphics.Containers;
|
|
using osu.Framework.Graphics.Shapes;
|
|
using osu.Game.Graphics.UserInterface;
|
|
using osu.Game.Online.API;
|
|
using osu.Game.Users;
|
|
using osuTK;
|
|
|
|
namespace osu.Game.Overlays.Dashboard.Friends
|
|
{
|
|
public class FriendDisplay : CompositeDrawable
|
|
{
|
|
private List<User> users = new List<User>();
|
|
|
|
public List<User> Users
|
|
{
|
|
get => users;
|
|
set
|
|
{
|
|
users = value;
|
|
onlineStreamControl.Populate(value);
|
|
}
|
|
}
|
|
|
|
private CancellationTokenSource cancellationToken;
|
|
|
|
private Drawable currentContent;
|
|
|
|
private FriendOnlineStreamControl onlineStreamControl;
|
|
private Box background;
|
|
private Box controlBackground;
|
|
private UserListToolbar userListToolbar;
|
|
private Container itemsPlaceholder;
|
|
private LoadingLayer loading;
|
|
|
|
private readonly IBindableList<User> apiFriends = new BindableList<User>();
|
|
|
|
public FriendDisplay()
|
|
{
|
|
RelativeSizeAxes = Axes.X;
|
|
AutoSizeAxes = Axes.Y;
|
|
}
|
|
|
|
[BackgroundDependencyLoader(true)]
|
|
private void load(OverlayColourProvider colourProvider, IAPIProvider api)
|
|
{
|
|
InternalChild = new FillFlowContainer
|
|
{
|
|
RelativeSizeAxes = Axes.X,
|
|
AutoSizeAxes = Axes.Y,
|
|
Direction = FillDirection.Vertical,
|
|
Children = new Drawable[]
|
|
{
|
|
new Container
|
|
{
|
|
RelativeSizeAxes = Axes.X,
|
|
AutoSizeAxes = Axes.Y,
|
|
Children = new Drawable[]
|
|
{
|
|
controlBackground = new Box
|
|
{
|
|
RelativeSizeAxes = Axes.Both
|
|
},
|
|
new Container
|
|
{
|
|
RelativeSizeAxes = Axes.X,
|
|
AutoSizeAxes = Axes.Y,
|
|
Padding = new MarginPadding
|
|
{
|
|
Top = 20,
|
|
Horizontal = 45
|
|
},
|
|
Child = onlineStreamControl = new FriendOnlineStreamControl(),
|
|
}
|
|
}
|
|
},
|
|
new Container
|
|
{
|
|
Name = "User List",
|
|
RelativeSizeAxes = Axes.X,
|
|
AutoSizeAxes = Axes.Y,
|
|
Children = new Drawable[]
|
|
{
|
|
background = new Box
|
|
{
|
|
RelativeSizeAxes = Axes.Both
|
|
},
|
|
new FillFlowContainer
|
|
{
|
|
RelativeSizeAxes = Axes.X,
|
|
AutoSizeAxes = Axes.Y,
|
|
Direction = FillDirection.Vertical,
|
|
Margin = new MarginPadding { Bottom = 20 },
|
|
Children = new Drawable[]
|
|
{
|
|
new Container
|
|
{
|
|
RelativeSizeAxes = Axes.X,
|
|
AutoSizeAxes = Axes.Y,
|
|
Padding = new MarginPadding
|
|
{
|
|
Horizontal = 40,
|
|
Vertical = 20
|
|
},
|
|
Child = userListToolbar = new UserListToolbar
|
|
{
|
|
Anchor = Anchor.CentreRight,
|
|
Origin = Anchor.CentreRight,
|
|
}
|
|
},
|
|
new Container
|
|
{
|
|
RelativeSizeAxes = Axes.X,
|
|
AutoSizeAxes = Axes.Y,
|
|
Children = new Drawable[]
|
|
{
|
|
itemsPlaceholder = new Container
|
|
{
|
|
RelativeSizeAxes = Axes.X,
|
|
AutoSizeAxes = Axes.Y,
|
|
Padding = new MarginPadding { Horizontal = 50 }
|
|
},
|
|
loading = new LoadingLayer(true)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
};
|
|
|
|
background.Colour = colourProvider.Background4;
|
|
controlBackground.Colour = colourProvider.Background5;
|
|
|
|
apiFriends.BindTo(api.Friends);
|
|
apiFriends.BindCollectionChanged((_, __) => Schedule(() => Users = apiFriends.ToList()), true);
|
|
}
|
|
|
|
protected override void LoadComplete()
|
|
{
|
|
base.LoadComplete();
|
|
|
|
onlineStreamControl.Current.BindValueChanged(_ => recreatePanels());
|
|
userListToolbar.DisplayStyle.BindValueChanged(_ => recreatePanels());
|
|
userListToolbar.SortCriteria.BindValueChanged(_ => recreatePanels());
|
|
}
|
|
|
|
private void recreatePanels()
|
|
{
|
|
if (!users.Any())
|
|
return;
|
|
|
|
cancellationToken?.Cancel();
|
|
|
|
if (itemsPlaceholder.Any())
|
|
loading.Show();
|
|
|
|
var sortedUsers = sortUsers(getUsersInCurrentGroup());
|
|
|
|
LoadComponentAsync(createTable(sortedUsers), addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token);
|
|
}
|
|
|
|
private List<User> getUsersInCurrentGroup()
|
|
{
|
|
switch (onlineStreamControl.Current.Value?.Status)
|
|
{
|
|
default:
|
|
case OnlineStatus.All:
|
|
return users;
|
|
|
|
case OnlineStatus.Offline:
|
|
return users.Where(u => !u.IsOnline).ToList();
|
|
|
|
case OnlineStatus.Online:
|
|
return users.Where(u => u.IsOnline).ToList();
|
|
}
|
|
}
|
|
|
|
private void addContentToPlaceholder(Drawable content)
|
|
{
|
|
loading.Hide();
|
|
|
|
var lastContent = currentContent;
|
|
|
|
if (lastContent != null)
|
|
{
|
|
lastContent.FadeOut(100, Easing.OutQuint).Expire();
|
|
lastContent.Delay(25).Schedule(() => lastContent.BypassAutoSizeAxes = Axes.Y);
|
|
}
|
|
|
|
itemsPlaceholder.Add(currentContent = content);
|
|
currentContent.FadeIn(200, Easing.OutQuint);
|
|
}
|
|
|
|
private FillFlowContainer createTable(List<User> users)
|
|
{
|
|
var style = userListToolbar.DisplayStyle.Value;
|
|
|
|
return new FillFlowContainer
|
|
{
|
|
RelativeSizeAxes = Axes.X,
|
|
AutoSizeAxes = Axes.Y,
|
|
Spacing = new Vector2(style == OverlayPanelDisplayStyle.Card ? 10 : 2),
|
|
Children = users.Select(u => createUserPanel(u, style)).ToList()
|
|
};
|
|
}
|
|
|
|
private UserPanel createUserPanel(User user, OverlayPanelDisplayStyle style)
|
|
{
|
|
switch (style)
|
|
{
|
|
default:
|
|
case OverlayPanelDisplayStyle.Card:
|
|
return new UserGridPanel(user).With(panel =>
|
|
{
|
|
panel.Anchor = Anchor.TopCentre;
|
|
panel.Origin = Anchor.TopCentre;
|
|
panel.Width = 290;
|
|
});
|
|
|
|
case OverlayPanelDisplayStyle.List:
|
|
return new UserListPanel(user);
|
|
|
|
case OverlayPanelDisplayStyle.Brick:
|
|
return new UserBrickPanel(user);
|
|
}
|
|
}
|
|
|
|
private List<User> sortUsers(List<User> unsorted)
|
|
{
|
|
switch (userListToolbar.SortCriteria.Value)
|
|
{
|
|
default:
|
|
case UserSortCriteria.LastVisit:
|
|
return unsorted.OrderByDescending(u => u.LastVisit).ToList();
|
|
|
|
case UserSortCriteria.Rank:
|
|
return unsorted.OrderByDescending(u => u.CurrentModeRank.HasValue).ThenBy(u => u.CurrentModeRank ?? 0).ToList();
|
|
|
|
case UserSortCriteria.Username:
|
|
return unsorted.OrderBy(u => u.Username).ToList();
|
|
}
|
|
}
|
|
|
|
protected override void Dispose(bool isDisposing)
|
|
{
|
|
cancellationToken?.Cancel();
|
|
base.Dispose(isDisposing);
|
|
}
|
|
}
|
|
}
|