diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index 96f3b85272..e8eff5a3a9 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -88,7 +88,12 @@ namespace osu.Game.Online.API
if (checkAndScheduleFailure())
return;
- API.Schedule(delegate { Success?.Invoke(); });
+ API.Schedule(delegate
+ {
+ if (cancelled) return;
+
+ Success?.Invoke();
+ });
}
public void Cancel() => Fail(new OperationCanceledException(@"Request cancelled"));
diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index fb6c50d867..bc006f1375 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Effects;
using osu.Framework.Graphics.Shapes;
-using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Drawables;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
@@ -40,6 +39,10 @@ namespace osu.Game.Overlays.BeatmapSet
private readonly FavouriteButton favouriteButton;
+ private readonly FillFlowContainer fadeContent;
+
+ private readonly LoadingAnimation loading;
+
public Header()
{
ExternalLinkButton externalLink;
@@ -96,8 +99,7 @@ namespace osu.Game.Overlays.BeatmapSet
},
new Container
{
- RelativeSizeAxes = Axes.X,
- AutoSizeAxes = Axes.Y,
+ RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding
{
Top = 20,
@@ -105,63 +107,71 @@ namespace osu.Game.Overlays.BeatmapSet
Left = BeatmapSetOverlay.X_PADDING,
Right = BeatmapSetOverlay.X_PADDING + BeatmapSetOverlay.RIGHT_WIDTH,
},
- Child = new FillFlowContainer
+ Children = new Drawable[]
{
- RelativeSizeAxes = Axes.X,
- AutoSizeAxes = Axes.Y,
- Direction = FillDirection.Vertical,
- Children = new Drawable[]
+ fadeContent = new FillFlowContainer
{
- new Container
+ RelativeSizeAxes = Axes.X,
+ AutoSizeAxes = Axes.Y,
+ Direction = FillDirection.Vertical,
+ Children = new Drawable[]
{
- RelativeSizeAxes = Axes.X,
- AutoSizeAxes = Axes.Y,
- Child = Picker = new BeatmapPicker(),
- },
- new FillFlowContainer
- {
- Direction = FillDirection.Horizontal,
- AutoSizeAxes = Axes.Both,
- Children = new Drawable[]
+ new Container
{
- title = new OsuSpriteText
- {
- Font = OsuFont.GetFont(size: 37, weight: FontWeight.Bold, italics: true)
- },
- externalLink = new ExternalLinkButton
- {
- Anchor = Anchor.BottomLeft,
- Origin = Anchor.BottomLeft,
- Margin = new MarginPadding { Left = 3, Bottom = 4 }, //To better lineup with the font
- },
- }
- },
- artist = new OsuSpriteText { Font = OsuFont.GetFont(size: 25, weight: FontWeight.SemiBold, italics: true) },
- new Container
- {
- RelativeSizeAxes = Axes.X,
- AutoSizeAxes = Axes.Y,
- Margin = new MarginPadding { Top = 20 },
- Child = author = new AuthorInfo(),
- },
- new Container
- {
- RelativeSizeAxes = Axes.X,
- Height = buttons_height,
- Margin = new MarginPadding { Top = 10 },
- Children = new Drawable[]
+ RelativeSizeAxes = Axes.X,
+ AutoSizeAxes = Axes.Y,
+ Child = Picker = new BeatmapPicker(),
+ },
+ new FillFlowContainer
{
- favouriteButton = new FavouriteButton(),
- downloadButtonsContainer = new FillFlowContainer
+ Direction = FillDirection.Horizontal,
+ AutoSizeAxes = Axes.Both,
+ Children = new Drawable[]
{
- RelativeSizeAxes = Axes.Both,
- Padding = new MarginPadding { Left = buttons_height + buttons_spacing },
- Spacing = new Vector2(buttons_spacing),
+ title = new OsuSpriteText
+ {
+ Font = OsuFont.GetFont(size: 37, weight: FontWeight.Bold, italics: true)
+ },
+ externalLink = new ExternalLinkButton
+ {
+ Anchor = Anchor.BottomLeft,
+ Origin = Anchor.BottomLeft,
+ Margin = new MarginPadding { Left = 3, Bottom = 4 }, //To better lineup with the font
+ },
+ }
+ },
+ artist = new OsuSpriteText { Font = OsuFont.GetFont(size: 25, weight: FontWeight.SemiBold, italics: true) },
+ new Container
+ {
+ RelativeSizeAxes = Axes.X,
+ AutoSizeAxes = Axes.Y,
+ Margin = new MarginPadding { Top = 20 },
+ Child = author = new AuthorInfo(),
+ },
+ new Container
+ {
+ RelativeSizeAxes = Axes.X,
+ Height = buttons_height,
+ Margin = new MarginPadding { Top = 10 },
+ Children = new Drawable[]
+ {
+ favouriteButton = new FavouriteButton(),
+ downloadButtonsContainer = new FillFlowContainer
+ {
+ RelativeSizeAxes = Axes.Both,
+ Padding = new MarginPadding { Left = buttons_height + buttons_spacing },
+ Spacing = new Vector2(buttons_spacing),
+ },
},
},
},
},
- },
+ loading = new LoadingAnimation
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ }
+ }
},
new FillFlowContainer
{
@@ -187,8 +197,11 @@ namespace osu.Game.Overlays.BeatmapSet
},
};
- Picker.Beatmap.ValueChanged += b => Details.Beatmap = b.NewValue;
- Picker.Beatmap.ValueChanged += b => externalLink.Link = $@"https://osu.ppy.sh/beatmapsets/{BeatmapSet.Value?.OnlineBeatmapSetID}#{b.NewValue?.Ruleset.ShortName}/{b.NewValue?.OnlineBeatmapID}";
+ Picker.Beatmap.ValueChanged += b =>
+ {
+ Details.Beatmap = b.NewValue;
+ externalLink.Link = $@"https://osu.ppy.sh/beatmapsets/{BeatmapSet.Value?.OnlineBeatmapSetID}#{b.NewValue?.Ruleset.ShortName}/{b.NewValue?.OnlineBeatmapID}";
+ };
}
[BackgroundDependencyLoader]
@@ -201,24 +214,35 @@ namespace osu.Game.Overlays.BeatmapSet
BeatmapSet.BindValueChanged(setInfo =>
{
Picker.BeatmapSet = author.BeatmapSet = Details.BeatmapSet = setInfo.NewValue;
-
- title.Text = setInfo.NewValue?.Metadata.Title ?? string.Empty;
- artist.Text = setInfo.NewValue?.Metadata.Artist ?? string.Empty;
- onlineStatusPill.Status = setInfo.NewValue?.OnlineInfo.Status ?? BeatmapSetOnlineStatus.None;
cover.BeatmapSet = setInfo.NewValue;
- if (setInfo.NewValue != null)
- {
- downloadButtonsContainer.FadeIn(transition_duration);
- favouriteButton.FadeIn(transition_duration);
- }
- else
+ if (setInfo.NewValue == null)
{
+ onlineStatusPill.FadeTo(0.5f, 500, Easing.OutQuint);
+ fadeContent.Hide();
+
+ loading.Show();
+
downloadButtonsContainer.FadeOut(transition_duration);
favouriteButton.FadeOut(transition_duration);
}
+ else
+ {
+ fadeContent.FadeIn(500, Easing.OutQuint);
- updateDownloadButtons();
+ loading.Hide();
+
+ title.Text = setInfo.NewValue.Metadata.Title ?? string.Empty;
+ artist.Text = setInfo.NewValue.Metadata.Artist ?? string.Empty;
+
+ onlineStatusPill.FadeIn(500, Easing.OutQuint);
+ onlineStatusPill.Status = setInfo.NewValue.OnlineInfo.Status;
+
+ downloadButtonsContainer.FadeIn(transition_duration);
+ favouriteButton.FadeIn(transition_duration);
+
+ updateDownloadButtons();
+ }
}, true);
}
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 9de9f5cec8..681ce701d0 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -247,6 +247,7 @@ namespace osu.Game.Screens.Play
public override void OnSuspending(IScreen next)
{
+ BackgroundBrightnessReduction = false;
base.OnSuspending(next);
cancelLoad();
}
@@ -258,6 +259,7 @@ namespace osu.Game.Screens.Play
cancelLoad();
Background.EnableUserDim.Value = false;
+ BackgroundBrightnessReduction = false;
return base.OnExiting(next);
}
@@ -273,6 +275,22 @@ namespace osu.Game.Screens.Play
}
}
+ private bool backgroundBrightnessReduction;
+
+ protected bool BackgroundBrightnessReduction
+ {
+ get => backgroundBrightnessReduction;
+ set
+ {
+ if (value == backgroundBrightnessReduction)
+ return;
+
+ backgroundBrightnessReduction = value;
+
+ Background.FadeColour(OsuColour.Gray(backgroundBrightnessReduction ? 0.8f : 1), 200);
+ }
+ }
+
protected override void Update()
{
base.Update();
@@ -287,12 +305,16 @@ namespace osu.Game.Screens.Play
// Preview user-defined background dim and blur when hovered on the visual settings panel.
Background.EnableUserDim.Value = true;
Background.BlurAmount.Value = 0;
+
+ BackgroundBrightnessReduction = false;
}
else
{
// Returns background dim and blur to the values specified by PlayerLoader.
Background.EnableUserDim.Value = false;
Background.BlurAmount.Value = BACKGROUND_BLUR;
+
+ BackgroundBrightnessReduction = true;
}
}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 563e90cec9..b4af007447 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/osu.iOS.props b/osu.iOS.props
index a36638cf84..9f21af05a1 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -105,8 +105,8 @@
-
-
+
+