Show listing graph; Slight refactor

This commit is contained in:
HoutarouOreki 2018-07-21 10:05:12 +02:00
parent ba0430752c
commit b5207d65f7
5 changed files with 21 additions and 6 deletions

View File

@ -31,7 +31,7 @@ namespace osu.Game.Graphics
if (!string.IsNullOrEmpty(name)) if (!string.IsNullOrEmpty(name))
if (colours.TryGetValue(name, out ColourInfo colour)) if (colours.TryGetValue(name, out ColourInfo colour))
return colour; return colour;
return new Color4(255, 255, 255, 255); return new Color4(0, 0, 0, 255);
} }
} }
} }

View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.API.Requests.Responses;
using System.Collections.Generic;
namespace osu.Game.Online.API.Requests namespace osu.Game.Online.API.Requests
{ {

View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using Newtonsoft.Json; using Newtonsoft.Json;
using osu.Framework.Lists;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

View File

@ -18,8 +18,8 @@ namespace osu.Game.Overlays.Changelog
// placeholder json file: https://api.myjson.com/bins/10ye8a // placeholder json file: https://api.myjson.com/bins/10ye8a
public class ChangelogChart : BufferedContainer public class ChangelogChart : BufferedContainer
{ {
private Box background; private readonly Box background;
private SpriteText text; private readonly SpriteText text;
private APIAccess api; private APIAccess api;
public ChangelogChart() public ChangelogChart()
@ -43,6 +43,14 @@ namespace osu.Game.Overlays.Changelog
}; };
} }
/// <summary>
/// Draw the graph with all builds
/// </summary>
public void ShowChart() => fetchAndShowChangelogChart();
/// <summary>
/// Draw the graph for a specific build
/// </summary>
public void ShowChart(APIChangelog releaseStream) => fetchAndShowChangelogChart(releaseStream); public void ShowChart(APIChangelog releaseStream) => fetchAndShowChangelogChart(releaseStream);
private bool isEmpty(APIChangelogChart changelogChart) private bool isEmpty(APIChangelogChart changelogChart)
@ -53,7 +61,7 @@ namespace osu.Game.Overlays.Changelog
return true; return true;
} }
private void showChart(APIChangelogChart chartInfo, string updateStreamName) private void showChart(APIChangelogChart chartInfo, string updateStreamName = null)
{ {
if (!isEmpty(chartInfo)) if (!isEmpty(chartInfo))
{ {
@ -79,5 +87,12 @@ namespace osu.Game.Overlays.Changelog
req.Success += res => showChart(res, build.UpdateStream.Name); req.Success += res => showChart(res, build.UpdateStream.Name);
api.Queue(req); api.Queue(req);
} }
private void fetchAndShowChangelogChart()
{
var req = new GetChangelogChartRequest();
req.Success += res => showChart(res);
api.Queue(req);
}
} }
} }

View File

@ -101,6 +101,7 @@ namespace osu.Game.Overlays
else else
foreach (StreamBadge item in Streams.BadgesContainer.Children) foreach (StreamBadge item in Streams.BadgesContainer.Children)
item.Deactivate(); item.Deactivate();
chart.ShowChart();
}; };
content.OnBuildChanged = () => content.OnBuildChanged = () =>
{ {
@ -155,6 +156,7 @@ namespace osu.Game.Overlays
Streams.BadgesContainer.Clear(); Streams.BadgesContainer.Clear();
foreach (APIChangelog item in res) foreach (APIChangelog item in res)
Streams.BadgesContainer.Add(new StreamBadge(item)); Streams.BadgesContainer.Add(new StreamBadge(item));
chart.ShowChart();
}; };
api.Queue(req); api.Queue(req);
} }