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

Remove online stuff out of the selector

Browse Source
This commit is contained in:
Andrei Zavatski
2020-01-14 07:07:21 +03:00
parent b1c432179b
commit 90e4def4bd
2 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
View File

@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Overlays.Rankings;
namespace osu.Game.Tests.Visual.Online
@ -14,15 +15,26 @@ namespace osu.Game.Tests.Visual.Online
typeof(SpotlightSelector),
};
protected override bool UseOnlineAPI => true;
public TestSceneRankingsSpotlightSelector()
{
SpotlightSelector selector;
Add(selector = new SpotlightSelector());
AddStep("Fetch spotlights", selector.FetchSpotlights);
var spotlights = new APISpotlight[]
{
new APISpotlight { Name = "Spotlight 1" },
new APISpotlight { Name = "Spotlight 2" },
new APISpotlight { Name = "Spotlight 3" },
};
AddStep("Load spotlights", () => selector.Spotlights = spotlights);
AddStep("Load info", () => selector.UpdateInfo(new APISpotlight
{
StartDate = DateTimeOffset.Now,
EndDate = DateTimeOffset.Now,
ParticipantCount = 15155151,
}, 18));
}
}
}

45
osu.Game/Overlays/Rankings/SpotlightSelector.cs
View File

@ -9,11 +9,10 @@ using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests;
using osu.Game.Online.API.Requests.Responses;
using osuTK;
using System;
using System.Collections.Generic;
namespace osu.Game.Overlays.Rankings
{
@ -21,15 +20,19 @@ namespace osu.Game.Overlays.Rankings
{
private readonly Box background;
private readonly SpotlightsDropdown dropdown;
private readonly DimmedLoadingLayer loading;
[Resolved]
private IAPIProvider api { get; set; }
public readonly Bindable<APISpotlight> SelectedSpotlight = new Bindable<APISpotlight>();
public IEnumerable<APISpotlight> Spotlights
{
get => dropdown.Items;
set => dropdown.Items = value;
}
private readonly InfoColumn startDateColumn;
private readonly InfoColumn endDateColumn;
private readonly InfoColumn mapCountColumn;
private readonly InfoColumn participants;
public SpotlightSelector()
{
@ -66,11 +69,12 @@ namespace osu.Game.Overlays.Rankings
{
startDateColumn = new InfoColumn(@"Start Date"),
endDateColumn = new InfoColumn(@"End Date"),
mapCountColumn = new InfoColumn(@"Map Count"),
participants = new InfoColumn(@"Participants"),
}
}
}
},
loading = new DimmedLoadingLayer(),
};
}
@ -80,29 +84,12 @@ namespace osu.Game.Overlays.Rankings
background.Colour = colours.GreySeafoam;
}
protected override void LoadComplete()
public void UpdateInfo(APISpotlight spotlight, int mapCount)
{
base.LoadComplete();
SelectedSpotlight.BindValueChanged(onSelectionChanged);
}
public void FetchSpotlights()
{
loading.Show();
var request = new GetSpotlightsRequest();
request.Success += response =>
{
dropdown.Items = response.Spotlights;
loading.Hide();
};
api.Queue(request);
}
private void onSelectionChanged(ValueChangedEvent<APISpotlight> spotlight)
{
startDateColumn.Value = dateToString(spotlight.NewValue.StartDate);
endDateColumn.Value = dateToString(spotlight.NewValue.EndDate);
startDateColumn.Value = dateToString(spotlight.StartDate);
endDateColumn.Value = dateToString(spotlight.EndDate);
mapCountColumn.Value = mapCount.ToString();
participants.Value = spotlight.ParticipantCount?.ToString("N0");
}
private string dateToString(DateTimeOffset date) => date.ToString("yyyy-MM-dd");