sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 06:36:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into user-status-wiring

Browse Source
This commit is contained in:
Lucas A
2019-05-14 18:09:58 +02:00
parent 1fe4d20d9b c04cdd170a
commit 2d966682dc
49 changed files with 728 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,6 @@
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osuTK;
using osuTK.Graphics;
@ -20,9 +19,8 @@ using osu.Framework.Threading;
namespace osu.Game.Overlays
{
public class SocialOverlay : SearchableListOverlay<SocialTab, SocialSortCriteria, SortDirection>, IOnlineComponent
public class SocialOverlay : SearchableListOverlay<SocialTab, SocialSortCriteria, SortDirection>
{
private IAPIProvider api;
private readonly LoadingAnimation loading;
private FillFlowContainer<SocialPanel> panels;
@ -88,13 +86,6 @@ namespace osu.Game.Overlays
currentQuery.BindTo(Filter.Search.Current);
}
[BackgroundDependencyLoader]
private void load(IAPIProvider api)
{
this.api = api;
api.Register(this);
}
private void recreatePanels(PanelDisplayStyle displayStyle)
{
clearPanels();
@ -160,7 +151,7 @@ namespace osu.Game.Overlays
loading.Hide();
getUsersRequest?.Cancel();
if (api?.IsLoggedIn != true)
if (API?.IsLoggedIn != true)
return;
switch (Header.Tabs.Current.Value)
@ -168,13 +159,13 @@ namespace osu.Game.Overlays
case SocialTab.Friends:
var friendRequest = new GetFriendsRequest(); // TODO filter arguments?
friendRequest.Success += updateUsers;
api.Queue(getUsersRequest = friendRequest);
API.Queue(getUsersRequest = friendRequest);
break;
default:
var userRequest = new GetUsersRequest(); // TODO filter arguments!
userRequest.Success += response => updateUsers(response.Select(r => r.User));
api.Queue(getUsersRequest = userRequest);
API.Queue(getUsersRequest = userRequest);
break;
}
@ -197,7 +188,7 @@ namespace osu.Game.Overlays
}
}
public void APIStateChanged(IAPIProvider api, APIState state)
public override void APIStateChanged(IAPIProvider api, APIState state)
{
switch (state)
{