h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 03:22:54 +08:00
Code Issues Releases Wiki Activity

Implement basic appearance of download button

Browse Source
This commit is contained in:
Bartłomiej Dach 2021-10-23 15:27:04 +02:00
parent c65e7a4436
commit a60cceeda6
No known key found for this signature in database
GPG Key ID: BCECCD4FA41F6497
2 changed files with 58 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapCardDownloadButton.cs
View File

@ -6,12 +6,14 @@ using NUnit.Framework;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Testing;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Drawables.Cards.Buttons; using osu.Game.Beatmaps.Drawables.Cards.Buttons;
using osu.Game.Online; using osu.Game.Online;
using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.API.Requests.Responses;
using osu.Game.Overlays; using osu.Game.Overlays;
using osu.Game.Rulesets.Osu; using osu.Game.Rulesets.Osu;
using osu.Game.Screens.Ranking.Expanded.Accuracy;
using osu.Game.Tests.Resources; using osu.Game.Tests.Resources;
using osuTK; using osuTK;
@ -31,13 +33,25 @@ namespace osu.Game.Tests.Visual.Beatmaps
public void TestDownloadableBeatmap() public void TestDownloadableBeatmap()
{ {
createButton(true); createButton(true);
assertDownloadVisible(true);
assertDownloadEnabled(true); assertDownloadEnabled(true);
assertProgressVisible(false);
assertPlayVisible(false);
AddStep("set downloading state", () => downloadButton.State.Value = DownloadState.Downloading); AddStep("set downloading state", () => downloadButton.State.Value = DownloadState.Downloading);
assertDownloadVisible(false);
assertProgressVisible(true);
assertPlayVisible(false);
AddStep("set progress to 30%", () => downloadButton.Progress.Value = 0.3f); AddStep("set progress to 30%", () => downloadButton.Progress.Value = 0.3f);
AddStep("set progress to 100%", () => downloadButton.Progress.Value = 1f); AddStep("set progress to 100%", () => downloadButton.Progress.Value = 1f);
AddStep("set importing state", () => downloadButton.State.Value = DownloadState.Importing); AddStep("set importing state", () => downloadButton.State.Value = DownloadState.Importing);
AddStep("set locally available state", () => downloadButton.State.Value = DownloadState.LocallyAvailable); AddStep("set locally available state", () => downloadButton.State.Value = DownloadState.LocallyAvailable);
assertDownloadVisible(false);
assertProgressVisible(false);
assertPlayVisible(true);
} }
[Test] [Test]
@ -75,14 +89,14 @@ namespace osu.Game.Tests.Visual.Beatmaps
}); });
} }
private void assertDownloadEnabled(bool enabled) private void assertDownloadVisible(bool visible) => AddUntilStep($"download {(visible ? "visible" : "not visible")}", () => downloadButton.Download.IsPresent == visible);
{ private void assertDownloadEnabled(bool enabled) => AddAssert($"download {(enabled ? "enabled" : "disabled")}", () => downloadButton.Download.Enabled.Value == enabled);
AddAssert($"button {(enabled ? "enabled" : "disabled")}", () => downloadButton.Download.IsPresent && downloadButton.Download.Enabled.Value == enabled);
}
private APIBeatmapSet createSoleily() private void assertProgressVisible(bool visible) => AddUntilStep($"progress {(visible ? "visible" : "not visible")}", () => downloadButton.ChildrenOfType<SmoothCircularProgress>().Single().IsPresent == visible);
{
return new APIBeatmapSet private void assertPlayVisible(bool visible) => AddUntilStep($"play {(visible ? "visible" : "not visible")}", () => downloadButton.Play.IsPresent == visible);
private static APIBeatmapSet createSoleily() => new APIBeatmapSet
{ {
OnlineID = 241526, OnlineID = 241526,
Availability = new BeatmapSetOnlineAvailability Availability = new BeatmapSetOnlineAvailability
@ -91,7 +105,6 @@ namespace osu.Game.Tests.Visual.Beatmaps
ExternalLink = string.Empty, ExternalLink = string.Empty,
}, },
}; };
}
private void createButtonWithBeatmap(APIBeatmapSet beatmap) private void createButtonWithBeatmap(APIBeatmapSet beatmap)
{ {

44
osu.Game/Beatmaps/Drawables/Cards/Buttons/DownloadButton.cs
View File

@ -2,14 +2,14 @@
// 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 osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.API.Requests.Responses;
using osu.Framework.Graphics.UserInterface; using osu.Game.Graphics;
using osu.Game.Online; using osu.Game.Online;
using osu.Game.Overlays; using osu.Game.Overlays;
using osu.Game.Screens.Ranking.Expanded.Accuracy;
using osuTK; using osuTK;
namespace osu.Game.Beatmaps.Drawables.Cards.Buttons namespace osu.Game.Beatmaps.Drawables.Cards.Buttons
@ -20,36 +20,54 @@ namespace osu.Game.Beatmaps.Drawables.Cards.Buttons
protected readonly PlayIcon Play; protected readonly PlayIcon Play;
protected readonly BeatmapDownloadTracker Tracker; protected readonly BeatmapDownloadTracker Tracker;
private readonly CircularProgress downloadProgress; private readonly SmoothCircularProgress downloadProgress;
[Resolved]
private OsuColour colours { get; set; }
[Resolved]
private OverlayColourProvider colourProvider { get; set; }
public DownloadButton(APIBeatmapSet beatmapSet) public DownloadButton(APIBeatmapSet beatmapSet)
{ {
Anchor = Anchor.Centre; Anchor = Anchor.Centre;
Origin = Anchor.Centre; Origin = Anchor.Centre;
AutoSizeAxes = Axes.Both;
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
Tracker = new BeatmapDownloadTracker(beatmapSet), Tracker = new BeatmapDownloadTracker(beatmapSet),
Download = new DownloadIcon(), Download = new DownloadIcon(),
downloadProgress = new CircularProgress downloadProgress = new SmoothCircularProgress
{ {
Size = new Vector2(16), Size = new Vector2(12),
InnerRadius = 0.1f, Anchor = Anchor.Centre,
Origin = Anchor.Centre,
InnerRadius = 0.4f,
}, },
Play = new PlayIcon() Play = new PlayIcon()
}; };
} }
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider)
{
downloadProgress.Colour = colourProvider.Highlight1;
}
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
((IBindable<double>)downloadProgress.Current).BindTo(Tracker.Progress);
Tracker.Progress.BindValueChanged(_ => updateState());
Tracker.State.BindValueChanged(_ => updateState(), true);
FinishTransforms(true);
}
private void updateState()
{
Download.FadeTo(Tracker.State.Value == DownloadState.NotDownloaded ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
downloadProgress.FadeTo(Tracker.State.Value == DownloadState.Downloading || Tracker.State.Value == DownloadState.Importing ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
downloadProgress.FadeColour(Tracker.State.Value == DownloadState.Importing ? colours.Yellow : colourProvider.Highlight1, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
if (Tracker.State.Value == DownloadState.Downloading)
downloadProgress.FillTo(Tracker.Progress.Value, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
Play.FadeTo(Tracker.State.Value == DownloadState.LocallyAvailable ? 1 : 0, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
} }
protected class DownloadIcon : BeatmapCardIconButton protected class DownloadIcon : BeatmapCardIconButton