h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-06 07:42:55 +08:00
Code Issues Releases Wiki Activity

Refactor to fix sorting issues

Browse Source
This commit is contained in:
smoogipoo 2019-12-19 02:02:57 +09:00
parent 37d7c984bc
commit 007e2e80c1
1 changed files with 30 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
osu.Game/Overlays/SocialOverlay.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // 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. // See the LICENCE file in the repository root for full licence text.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Framework.Bindables; using osu.Framework.Bindables;
@ -15,7 +16,6 @@ using osu.Game.Online.API.Requests;
using osu.Game.Overlays.SearchableList; using osu.Game.Overlays.SearchableList;
using osu.Game.Overlays.Social; using osu.Game.Overlays.Social;
using osu.Game.Users; using osu.Game.Users;
using System;
using System.Threading; using System.Threading;
using osu.Framework.Threading; using osu.Framework.Threading;
@ -33,17 +33,18 @@ namespace osu.Game.Overlays
protected override SearchableListHeader<SocialTab> CreateHeader() => new Header(); protected override SearchableListHeader<SocialTab> CreateHeader() => new Header();
protected override SearchableListFilterControl<SocialSortCriteria, SortDirection> CreateFilterControl() => new FilterControl(); protected override SearchableListFilterControl<SocialSortCriteria, SortDirection> CreateFilterControl() => new FilterControl();
private IEnumerable<User> users; private User[] users = Array.Empty<User>();
public IEnumerable<User> Users public User[] Users
{ {
get => users; get => users;
set set
{ {
if (ReferenceEquals(users, value)) if (users == value)
return; return;
users = value?.ToList(); users = value ?? Array.Empty<User>();
recreatePanels();
} }
} }
@ -72,8 +73,8 @@ namespace osu.Game.Overlays
Filter.Tabs.Current.ValueChanged += _ => onFilterUpdate(); Filter.Tabs.Current.ValueChanged += _ => onFilterUpdate();
Filter.DisplayStyleControl.DisplayStyle.ValueChanged += style => recreatePanels(style.NewValue); Filter.DisplayStyleControl.DisplayStyle.ValueChanged += _ => recreatePanels();
Filter.DisplayStyleControl.Dropdown.Current.ValueChanged += _ => updateUsers(Users); Filter.DisplayStyleControl.Dropdown.Current.ValueChanged += _ => recreatePanels();
currentQuery.BindTo(Filter.Search.Current); currentQuery.BindTo(Filter.Search.Current);
currentQuery.ValueChanged += query => currentQuery.ValueChanged += query =>
@ -115,19 +116,19 @@ namespace osu.Game.Overlays
{ {
case SocialTab.Friends: case SocialTab.Friends:
var friendRequest = new GetFriendsRequest(); // TODO filter arguments? var friendRequest = new GetFriendsRequest(); // TODO filter arguments?
friendRequest.Success += updateUsers; friendRequest.Success += users => Users = users.ToArray();
API.Queue(getUsersRequest = friendRequest); API.Queue(getUsersRequest = friendRequest);
break; break;
default: default:
var userRequest = new GetUsersRequest(); // TODO filter arguments! var userRequest = new GetUsersRequest(); // TODO filter arguments!
userRequest.Success += res => updateUsers(res.Users.Select(r => r.User)); userRequest.Success += res => Users = res.Users.Select(r => r.User).ToArray();
API.Queue(getUsersRequest = userRequest); API.Queue(getUsersRequest = userRequest);
break; break;
} }
} }
private void recreatePanels(PanelDisplayStyle displayStyle) private void recreatePanels()
{ {
clearPanels(); clearPanels();
@ -139,17 +140,33 @@ namespace osu.Game.Overlays
loadCancellation = new CancellationTokenSource(); loadCancellation = new CancellationTokenSource();
IEnumerable<User> sortedUsers = Users;
switch (Filter.Tabs.Current.Value)
{
case SocialSortCriteria.Location:
sortedUsers = sortedUsers.OrderBy(u => u.Country.FullName);
break;
case SocialSortCriteria.Name:
sortedUsers = sortedUsers.OrderBy(u => u.Username);
break;
}
if (Filter.DisplayStyleControl.Dropdown.Current.Value == SortDirection.Descending)
sortedUsers = sortedUsers.Reverse();
var newPanels = new FillFlowContainer<SocialPanel> var newPanels = new FillFlowContainer<SocialPanel>
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Spacing = new Vector2(10f), Spacing = new Vector2(10f),
Margin = new MarginPadding { Top = 10 }, Margin = new MarginPadding { Top = 10 },
ChildrenEnumerable = Users.Select(u => ChildrenEnumerable = sortedUsers.Select(u =>
{ {
SocialPanel panel; SocialPanel panel;
switch (displayStyle) switch (Filter.DisplayStyleControl.DisplayStyle.Value)
{ {
case PanelDisplayStyle.Grid: case PanelDisplayStyle.Grid:
panel = new SocialGridPanel(u) panel = new SocialGridPanel(u)
@ -188,36 +205,9 @@ namespace osu.Game.Overlays
return; return;
} }
updateUsers(Users); recreatePanels();
} }
private void updateUsers(IEnumerable<User> newUsers)
{
var sortDirection = Filter.DisplayStyleControl.Dropdown.Current.Value;
IEnumerable<User> sortedUsers = newUsers;
if (sortedUsers.Any())
{
switch (Filter.Tabs.Current.Value)
{
case SocialSortCriteria.Location:
sortedUsers = sortBy(sortedUsers, u => u.Country.FullName, sortDirection);
break;
case SocialSortCriteria.Name:
sortedUsers = sortBy(sortedUsers, u => u.Username, sortDirection);
break;
}
}
Users = sortedUsers;
recreatePanels(Filter.DisplayStyleControl.DisplayStyle.Value);
}
private IEnumerable<User> sortBy<T>(IEnumerable<User> users, Func<User, T> condition, SortDirection sortDirection) =>
sortDirection == SortDirection.Ascending ? users.OrderBy(condition) : users.OrderByDescending(condition);
private void clearPanels() private void clearPanels()
{ {
loading.Show(); loading.Show();