mirror of
https://github.com/ppy/osu.git
synced 2025-02-06 02:23:21 +08:00
Move all the content to BeatmapSetHeaderContent drawable
This commit is contained in:
Andrei Zavatski
parent
94fee3800d
commit
2ca3ccad06
@ -231,8 +231,8 @@ namespace osu.Game.Tests.Visual.Online
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
AddAssert("shown beatmaps of current ruleset", () => overlay.Header.Picker.Difficulties.All(b => b.Beatmap.Ruleset.Equals(overlay.Header.RulesetSelector.Current.Value)));
|
AddAssert("shown beatmaps of current ruleset", () => overlay.Header.HeaderContent.Picker.Difficulties.All(b => b.Beatmap.Ruleset.Equals(overlay.Header.RulesetSelector.Current.Value)));
|
||||||
AddAssert("left-most beatmap selected", () => overlay.Header.Picker.Difficulties.First().State == BeatmapPicker.DifficultySelectorState.Selected);
|
AddAssert("left-most beatmap selected", () => overlay.Header.HeaderContent.Picker.Difficulties.First().State == BeatmapPicker.DifficultySelectorState.Selected);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
@ -310,7 +310,7 @@ namespace osu.Game.Tests.Visual.Online
|
|||||||
|
|
||||||
private void downloadAssert(bool shown)
|
private void downloadAssert(bool shown)
|
||||||
{
|
{
|
||||||
AddAssert($"is download button {(shown ? "shown" : "hidden")}", () => overlay.Header.DownloadButtonsVisible == shown);
|
AddAssert($"is download button {(shown ? "shown" : "hidden")}", () => overlay.Header.HeaderContent.DownloadButtonsVisible == shown);
|
||||||
}
|
}
|
||||||
|
|
||||||
private class TestBeatmapSetOverlay : BeatmapSetOverlay
|
private class TestBeatmapSetOverlay : BeatmapSetOverlay
|
||||||
|
|||||||
@ -1,24 +1,12 @@
|
|||||||
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
||||||
// 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 System.Linq;
|
|
||||||
using osu.Framework.Allocation;
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Bindables;
|
using osu.Framework.Bindables;
|
||||||
using osu.Framework.Extensions.Color4Extensions;
|
using osu.Framework.Extensions.Color4Extensions;
|
||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Framework.Graphics.Colour;
|
|
||||||
using osu.Framework.Graphics.Containers;
|
|
||||||
using osu.Framework.Graphics.Effects;
|
using osu.Framework.Graphics.Effects;
|
||||||
using osu.Framework.Graphics.Shapes;
|
|
||||||
using osu.Game.Beatmaps;
|
using osu.Game.Beatmaps;
|
||||||
using osu.Game.Beatmaps.Drawables;
|
|
||||||
using osu.Game.Graphics;
|
|
||||||
using osu.Game.Graphics.Sprites;
|
|
||||||
using osu.Game.Graphics.UserInterface;
|
|
||||||
using osu.Game.Online;
|
|
||||||
using osu.Game.Online.API;
|
|
||||||
using osu.Game.Overlays.BeatmapListing.Panels;
|
|
||||||
using osu.Game.Overlays.BeatmapSet.Buttons;
|
|
||||||
using osu.Game.Rulesets;
|
using osu.Game.Rulesets;
|
||||||
using osuTK;
|
using osuTK;
|
||||||
using osuTK.Graphics;
|
using osuTK.Graphics;
|
||||||
@ -27,41 +15,16 @@ namespace osu.Game.Overlays.BeatmapSet
|
|||||||
{
|
{
|
||||||
public class BeatmapSetHeader : OverlayHeader
|
public class BeatmapSetHeader : OverlayHeader
|
||||||
{
|
{
|
||||||
private const float transition_duration = 200;
|
|
||||||
private const float buttons_height = 45;
|
|
||||||
private const float buttons_spacing = 5;
|
|
||||||
|
|
||||||
public readonly Bindable<BeatmapSetInfo> BeatmapSet = new Bindable<BeatmapSetInfo>();
|
public readonly Bindable<BeatmapSetInfo> BeatmapSet = new Bindable<BeatmapSetInfo>();
|
||||||
|
|
||||||
public bool DownloadButtonsVisible => downloadButtonsContainer.Any();
|
public BeatmapSetHeaderContent HeaderContent { get; private set; }
|
||||||
|
|
||||||
public BeatmapPicker Picker { get; private set; }
|
|
||||||
|
|
||||||
|
[Cached]
|
||||||
public BeatmapRulesetSelector RulesetSelector { get; private set; }
|
public BeatmapRulesetSelector RulesetSelector { get; private set; }
|
||||||
|
|
||||||
private IBindable<DownloadState> state => downloadTracker.State;
|
|
||||||
|
|
||||||
[Cached(typeof(IBindable<RulesetInfo>))]
|
[Cached(typeof(IBindable<RulesetInfo>))]
|
||||||
private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
|
private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
|
||||||
|
|
||||||
[Resolved]
|
|
||||||
private IAPIProvider api { get; set; }
|
|
||||||
|
|
||||||
private readonly DownloadTracker downloadTracker;
|
|
||||||
private OsuSpriteText title, artist;
|
|
||||||
private AuthorInfo author;
|
|
||||||
private ExplicitContentBeatmapPill explicitContentPill;
|
|
||||||
private FillFlowContainer downloadButtonsContainer;
|
|
||||||
private BeatmapAvailability beatmapAvailability;
|
|
||||||
private BeatmapSetOnlineStatusPill onlineStatusPill;
|
|
||||||
private ExternalLinkButton externalLink;
|
|
||||||
private UpdateableBeatmapSetCover cover;
|
|
||||||
private Box coverGradient;
|
|
||||||
private FillFlowContainer fadeContent;
|
|
||||||
private FavouriteButton favouriteButton;
|
|
||||||
private LoadingSpinner loading;
|
|
||||||
private Details details;
|
|
||||||
|
|
||||||
public BeatmapSetHeader()
|
public BeatmapSetHeader()
|
||||||
{
|
{
|
||||||
Masking = true;
|
Masking = true;
|
||||||
@ -73,249 +36,20 @@ namespace osu.Game.Overlays.BeatmapSet
|
|||||||
Radius = 3,
|
Radius = 3,
|
||||||
Offset = new Vector2(0f, 1f),
|
Offset = new Vector2(0f, 1f),
|
||||||
};
|
};
|
||||||
|
|
||||||
AddInternal(downloadTracker = new DownloadTracker
|
|
||||||
{
|
|
||||||
BeatmapSet = { BindTarget = BeatmapSet }
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
protected override Drawable CreateContent() => HeaderContent = new BeatmapSetHeaderContent
|
||||||
private void load(OverlayColourProvider colourProvider)
|
|
||||||
{
|
{
|
||||||
Picker.Beatmap.ValueChanged += b =>
|
BeatmapSet = { BindTarget = BeatmapSet }
|
||||||
{
|
|
||||||
details.Beatmap = b.NewValue;
|
|
||||||
externalLink.Link = $@"{api.WebsiteRootUrl}/beatmapsets/{BeatmapSet.Value?.OnlineBeatmapSetID}#{b.NewValue?.Ruleset.ShortName}/{b.NewValue?.OnlineBeatmapID}";
|
|
||||||
};
|
|
||||||
|
|
||||||
coverGradient.Colour = ColourInfo.GradientVertical(colourProvider.Background6.Opacity(0.3f), colourProvider.Background6.Opacity(0.8f));
|
|
||||||
onlineStatusPill.BackgroundColour = colourProvider.Background6;
|
|
||||||
|
|
||||||
state.BindValueChanged(_ => updateDownloadButtons());
|
|
||||||
|
|
||||||
BeatmapSet.BindValueChanged(setInfo =>
|
|
||||||
{
|
|
||||||
Picker.BeatmapSet = RulesetSelector.BeatmapSet = author.BeatmapSet = beatmapAvailability.BeatmapSet = details.BeatmapSet = setInfo.NewValue;
|
|
||||||
cover.BeatmapSet = setInfo.NewValue;
|
|
||||||
|
|
||||||
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);
|
|
||||||
|
|
||||||
loading.Hide();
|
|
||||||
|
|
||||||
title.Text = setInfo.NewValue.Metadata.Title ?? string.Empty;
|
|
||||||
artist.Text = setInfo.NewValue.Metadata.Artist ?? string.Empty;
|
|
||||||
|
|
||||||
explicitContentPill.Alpha = setInfo.NewValue.OnlineInfo.HasExplicitContent ? 1 : 0;
|
|
||||||
|
|
||||||
onlineStatusPill.FadeIn(500, Easing.OutQuint);
|
|
||||||
onlineStatusPill.Status = setInfo.NewValue.OnlineInfo.Status;
|
|
||||||
|
|
||||||
downloadButtonsContainer.FadeIn(transition_duration);
|
|
||||||
favouriteButton.FadeIn(transition_duration);
|
|
||||||
|
|
||||||
updateDownloadButtons();
|
|
||||||
}
|
|
||||||
}, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override Drawable CreateContent() => new Container
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
AutoSizeAxes = Axes.Y,
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
new Container
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.Both,
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
cover = new UpdateableBeatmapSetCover
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.Both,
|
|
||||||
Masking = true,
|
|
||||||
},
|
|
||||||
coverGradient = new Box
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.Both
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
new Container
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
AutoSizeAxes = Axes.Y,
|
|
||||||
Padding = new MarginPadding
|
|
||||||
{
|
|
||||||
Vertical = BeatmapSetOverlay.Y_PADDING,
|
|
||||||
Left = BeatmapSetOverlay.X_PADDING,
|
|
||||||
Right = BeatmapSetOverlay.X_PADDING + BeatmapSetOverlay.RIGHT_WIDTH,
|
|
||||||
},
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
fadeContent = new FillFlowContainer
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
AutoSizeAxes = Axes.Y,
|
|
||||||
Direction = FillDirection.Vertical,
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
new Container
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
AutoSizeAxes = Axes.Y,
|
|
||||||
Child = Picker = new BeatmapPicker(),
|
|
||||||
},
|
|
||||||
new FillFlowContainer
|
|
||||||
{
|
|
||||||
Direction = FillDirection.Horizontal,
|
|
||||||
AutoSizeAxes = Axes.Both,
|
|
||||||
Margin = new MarginPadding { Top = 15 },
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
title = new OsuSpriteText
|
|
||||||
{
|
|
||||||
Font = OsuFont.GetFont(size: 30, weight: FontWeight.SemiBold, italics: true)
|
|
||||||
},
|
|
||||||
externalLink = new ExternalLinkButton
|
|
||||||
{
|
|
||||||
Anchor = Anchor.BottomLeft,
|
|
||||||
Origin = Anchor.BottomLeft,
|
|
||||||
Margin = new MarginPadding { Left = 5, Bottom = 4 }, // To better lineup with the font
|
|
||||||
},
|
|
||||||
explicitContentPill = new ExplicitContentBeatmapPill
|
|
||||||
{
|
|
||||||
Alpha = 0f,
|
|
||||||
Anchor = Anchor.BottomLeft,
|
|
||||||
Origin = Anchor.BottomLeft,
|
|
||||||
Margin = new MarginPadding { Left = 10, Bottom = 4 },
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
artist = new OsuSpriteText
|
|
||||||
{
|
|
||||||
Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium, italics: true),
|
|
||||||
Margin = new MarginPadding { Bottom = 20 }
|
|
||||||
},
|
|
||||||
new Container
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
AutoSizeAxes = Axes.Y,
|
|
||||||
Child = author = new AuthorInfo(),
|
|
||||||
},
|
|
||||||
beatmapAvailability = new BeatmapAvailability(),
|
|
||||||
new Container
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.X,
|
|
||||||
Height = buttons_height,
|
|
||||||
Margin = new MarginPadding { Top = 10 },
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
favouriteButton = new FavouriteButton
|
|
||||||
{
|
|
||||||
BeatmapSet = { BindTarget = BeatmapSet }
|
|
||||||
},
|
|
||||||
downloadButtonsContainer = new FillFlowContainer
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.Both,
|
|
||||||
Padding = new MarginPadding { Left = buttons_height + buttons_spacing },
|
|
||||||
Spacing = new Vector2(buttons_spacing),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
},
|
|
||||||
loading = new LoadingSpinner
|
|
||||||
{
|
|
||||||
Anchor = Anchor.Centre,
|
|
||||||
Origin = Anchor.Centre,
|
|
||||||
Scale = new Vector2(1.5f),
|
|
||||||
},
|
|
||||||
new FillFlowContainer
|
|
||||||
{
|
|
||||||
Anchor = Anchor.BottomRight,
|
|
||||||
Origin = Anchor.BottomRight,
|
|
||||||
AutoSizeAxes = Axes.Both,
|
|
||||||
Margin = new MarginPadding { Top = BeatmapSetOverlay.Y_PADDING, Right = BeatmapSetOverlay.X_PADDING },
|
|
||||||
Direction = FillDirection.Vertical,
|
|
||||||
Spacing = new Vector2(10),
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
onlineStatusPill = new BeatmapSetOnlineStatusPill
|
|
||||||
{
|
|
||||||
Anchor = Anchor.TopRight,
|
|
||||||
Origin = Anchor.TopRight,
|
|
||||||
TextSize = 14,
|
|
||||||
TextPadding = new MarginPadding { Horizontal = 35, Vertical = 10 }
|
|
||||||
},
|
|
||||||
details = new Details(),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
private void updateDownloadButtons()
|
|
||||||
{
|
|
||||||
if (BeatmapSet.Value == null) return;
|
|
||||||
|
|
||||||
if ((BeatmapSet.Value.OnlineInfo.Availability?.DownloadDisabled ?? false) && state.Value != DownloadState.LocallyAvailable)
|
|
||||||
{
|
|
||||||
downloadButtonsContainer.Clear();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (state.Value)
|
|
||||||
{
|
|
||||||
case DownloadState.LocallyAvailable:
|
|
||||||
// temporary for UX until new design is implemented.
|
|
||||||
downloadButtonsContainer.Child = new BeatmapPanelDownloadButton(BeatmapSet.Value)
|
|
||||||
{
|
|
||||||
Width = 50,
|
|
||||||
RelativeSizeAxes = Axes.Y,
|
|
||||||
SelectedBeatmap = { BindTarget = Picker.Beatmap }
|
|
||||||
};
|
|
||||||
break;
|
|
||||||
|
|
||||||
case DownloadState.Downloading:
|
|
||||||
case DownloadState.Importing:
|
|
||||||
// temporary to avoid showing two buttons for maps with novideo. will be fixed in new beatmap overlay design.
|
|
||||||
downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
|
|
||||||
if (BeatmapSet.Value.OnlineInfo.HasVideo)
|
|
||||||
downloadButtonsContainer.Add(new HeaderDownloadButton(BeatmapSet.Value, true));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private class DownloadTracker : BeatmapDownloadTrackingComposite
|
|
||||||
{
|
|
||||||
public new Bindable<DownloadState> State => base.State;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override OverlayTitle CreateTitle() => new BeatmapHeaderTitle();
|
|
||||||
|
|
||||||
protected override Drawable CreateTitleContent() => RulesetSelector = new BeatmapRulesetSelector
|
protected override Drawable CreateTitleContent() => RulesetSelector = new BeatmapRulesetSelector
|
||||||
{
|
{
|
||||||
Current = ruleset
|
Current = ruleset
|
||||||
};
|
};
|
||||||
|
|
||||||
|
protected override OverlayTitle CreateTitle() => new BeatmapHeaderTitle();
|
||||||
|
|
||||||
private class BeatmapHeaderTitle : OverlayTitle
|
private class BeatmapHeaderTitle : OverlayTitle
|
||||||
{
|
{
|
||||||
public BeatmapHeaderTitle()
|
public BeatmapHeaderTitle()
|
||||||
|
|||||||
283
osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
Normal file
283
osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
Normal file
@ -0,0 +1,283 @@
|
|||||||
|
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
||||||
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
|
using System.Linq;
|
||||||
|
using osu.Framework.Allocation;
|
||||||
|
using osu.Framework.Extensions.Color4Extensions;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Framework.Graphics.Colour;
|
||||||
|
using osu.Framework.Graphics.Containers;
|
||||||
|
using osu.Framework.Graphics.Shapes;
|
||||||
|
using osu.Game.Beatmaps.Drawables;
|
||||||
|
using osu.Game.Graphics;
|
||||||
|
using osu.Game.Graphics.Sprites;
|
||||||
|
using osu.Game.Graphics.UserInterface;
|
||||||
|
using osu.Game.Online;
|
||||||
|
using osu.Game.Online.API;
|
||||||
|
using osu.Game.Overlays.BeatmapListing.Panels;
|
||||||
|
using osu.Game.Overlays.BeatmapSet.Buttons;
|
||||||
|
using osuTK;
|
||||||
|
|
||||||
|
namespace osu.Game.Overlays.BeatmapSet
|
||||||
|
{
|
||||||
|
public class BeatmapSetHeaderContent : BeatmapDownloadTrackingComposite
|
||||||
|
{
|
||||||
|
private const float transition_duration = 200;
|
||||||
|
private const float buttons_height = 45;
|
||||||
|
private const float buttons_spacing = 5;
|
||||||
|
|
||||||
|
public bool DownloadButtonsVisible => downloadButtonsContainer.Any();
|
||||||
|
|
||||||
|
public readonly Details Details;
|
||||||
|
public readonly BeatmapPicker Picker;
|
||||||
|
|
||||||
|
private readonly UpdateableBeatmapSetCover cover;
|
||||||
|
private readonly Box coverGradient;
|
||||||
|
private readonly OsuSpriteText title, artist;
|
||||||
|
private readonly AuthorInfo author;
|
||||||
|
private readonly ExplicitContentBeatmapPill explicitContentPill;
|
||||||
|
private readonly FillFlowContainer downloadButtonsContainer;
|
||||||
|
private readonly BeatmapAvailability beatmapAvailability;
|
||||||
|
private readonly BeatmapSetOnlineStatusPill onlineStatusPill;
|
||||||
|
private readonly FavouriteButton favouriteButton;
|
||||||
|
private readonly FillFlowContainer fadeContent;
|
||||||
|
private readonly LoadingSpinner loading;
|
||||||
|
|
||||||
|
[Resolved]
|
||||||
|
private IAPIProvider api { get; set; }
|
||||||
|
|
||||||
|
[Resolved]
|
||||||
|
private BeatmapRulesetSelector rulesetSelector { get; set; }
|
||||||
|
|
||||||
|
public BeatmapSetHeaderContent()
|
||||||
|
{
|
||||||
|
ExternalLinkButton externalLink;
|
||||||
|
|
||||||
|
RelativeSizeAxes = Axes.X;
|
||||||
|
AutoSizeAxes = Axes.Y;
|
||||||
|
InternalChild = new Container
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.X,
|
||||||
|
AutoSizeAxes = Axes.Y,
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
new Container
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
cover = new UpdateableBeatmapSetCover
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Masking = true,
|
||||||
|
},
|
||||||
|
coverGradient = new Box
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
new Container
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.X,
|
||||||
|
AutoSizeAxes = Axes.Y,
|
||||||
|
Padding = new MarginPadding
|
||||||
|
{
|
||||||
|
Vertical = BeatmapSetOverlay.Y_PADDING,
|
||||||
|
Left = BeatmapSetOverlay.X_PADDING,
|
||||||
|
Right = BeatmapSetOverlay.X_PADDING + BeatmapSetOverlay.RIGHT_WIDTH,
|
||||||
|
},
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
fadeContent = new FillFlowContainer
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.X,
|
||||||
|
AutoSizeAxes = Axes.Y,
|
||||||
|
Direction = FillDirection.Vertical,
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
new Container
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.X,
|
||||||
|
AutoSizeAxes = Axes.Y,
|
||||||
|
Child = Picker = new BeatmapPicker(),
|
||||||
|
},
|
||||||
|
new FillFlowContainer
|
||||||
|
{
|
||||||
|
Direction = FillDirection.Horizontal,
|
||||||
|
AutoSizeAxes = Axes.Both,
|
||||||
|
Margin = new MarginPadding { Top = 15 },
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
title = new OsuSpriteText
|
||||||
|
{
|
||||||
|
Font = OsuFont.GetFont(size: 30, weight: FontWeight.SemiBold, italics: true)
|
||||||
|
},
|
||||||
|
externalLink = new ExternalLinkButton
|
||||||
|
{
|
||||||
|
Anchor = Anchor.BottomLeft,
|
||||||
|
Origin = Anchor.BottomLeft,
|
||||||
|
Margin = new MarginPadding { Left = 5, Bottom = 4 }, // To better lineup with the font
|
||||||
|
},
|
||||||
|
explicitContentPill = new ExplicitContentBeatmapPill
|
||||||
|
{
|
||||||
|
Alpha = 0f,
|
||||||
|
Anchor = Anchor.BottomLeft,
|
||||||
|
Origin = Anchor.BottomLeft,
|
||||||
|
Margin = new MarginPadding { Left = 10, Bottom = 4 },
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
artist = new OsuSpriteText
|
||||||
|
{
|
||||||
|
Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium, italics: true),
|
||||||
|
Margin = new MarginPadding { Bottom = 20 }
|
||||||
|
},
|
||||||
|
new Container
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.X,
|
||||||
|
AutoSizeAxes = Axes.Y,
|
||||||
|
Child = author = new AuthorInfo(),
|
||||||
|
},
|
||||||
|
beatmapAvailability = new BeatmapAvailability(),
|
||||||
|
new Container
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.X,
|
||||||
|
Height = buttons_height,
|
||||||
|
Margin = new MarginPadding { Top = 10 },
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
favouriteButton = new FavouriteButton
|
||||||
|
{
|
||||||
|
BeatmapSet = { BindTarget = BeatmapSet }
|
||||||
|
},
|
||||||
|
downloadButtonsContainer = new FillFlowContainer
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Padding = new MarginPadding { Left = buttons_height + buttons_spacing },
|
||||||
|
Spacing = new Vector2(buttons_spacing),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
},
|
||||||
|
loading = new LoadingSpinner
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
Scale = new Vector2(1.5f),
|
||||||
|
},
|
||||||
|
new FillFlowContainer
|
||||||
|
{
|
||||||
|
Anchor = Anchor.BottomRight,
|
||||||
|
Origin = Anchor.BottomRight,
|
||||||
|
AutoSizeAxes = Axes.Both,
|
||||||
|
Margin = new MarginPadding { Top = BeatmapSetOverlay.Y_PADDING, Right = BeatmapSetOverlay.X_PADDING },
|
||||||
|
Direction = FillDirection.Vertical,
|
||||||
|
Spacing = new Vector2(10),
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
onlineStatusPill = new BeatmapSetOnlineStatusPill
|
||||||
|
{
|
||||||
|
Anchor = Anchor.TopRight,
|
||||||
|
Origin = Anchor.TopRight,
|
||||||
|
TextSize = 14,
|
||||||
|
TextPadding = new MarginPadding { Horizontal = 35, Vertical = 10 }
|
||||||
|
},
|
||||||
|
Details = new Details(),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
Picker.Beatmap.ValueChanged += b =>
|
||||||
|
{
|
||||||
|
Details.Beatmap = b.NewValue;
|
||||||
|
externalLink.Link = $@"{api.WebsiteRootUrl}/beatmapsets/{BeatmapSet.Value?.OnlineBeatmapSetID}#{b.NewValue?.Ruleset.ShortName}/{b.NewValue?.OnlineBeatmapID}";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
[BackgroundDependencyLoader]
|
||||||
|
private void load(OverlayColourProvider colourProvider)
|
||||||
|
{
|
||||||
|
coverGradient.Colour = ColourInfo.GradientVertical(colourProvider.Background6.Opacity(0.3f), colourProvider.Background6.Opacity(0.8f));
|
||||||
|
onlineStatusPill.BackgroundColour = colourProvider.Background6;
|
||||||
|
|
||||||
|
State.BindValueChanged(_ => updateDownloadButtons());
|
||||||
|
|
||||||
|
BeatmapSet.BindValueChanged(setInfo =>
|
||||||
|
{
|
||||||
|
Picker.BeatmapSet = rulesetSelector.BeatmapSet = author.BeatmapSet = beatmapAvailability.BeatmapSet = Details.BeatmapSet = setInfo.NewValue;
|
||||||
|
cover.BeatmapSet = setInfo.NewValue;
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
||||||
|
loading.Hide();
|
||||||
|
|
||||||
|
title.Text = setInfo.NewValue.Metadata.Title ?? string.Empty;
|
||||||
|
artist.Text = setInfo.NewValue.Metadata.Artist ?? string.Empty;
|
||||||
|
|
||||||
|
explicitContentPill.Alpha = setInfo.NewValue.OnlineInfo.HasExplicitContent ? 1 : 0;
|
||||||
|
|
||||||
|
onlineStatusPill.FadeIn(500, Easing.OutQuint);
|
||||||
|
onlineStatusPill.Status = setInfo.NewValue.OnlineInfo.Status;
|
||||||
|
|
||||||
|
downloadButtonsContainer.FadeIn(transition_duration);
|
||||||
|
favouriteButton.FadeIn(transition_duration);
|
||||||
|
|
||||||
|
updateDownloadButtons();
|
||||||
|
}
|
||||||
|
}, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updateDownloadButtons()
|
||||||
|
{
|
||||||
|
if (BeatmapSet.Value == null) return;
|
||||||
|
|
||||||
|
if ((BeatmapSet.Value.OnlineInfo.Availability?.DownloadDisabled ?? false) && State.Value != DownloadState.LocallyAvailable)
|
||||||
|
{
|
||||||
|
downloadButtonsContainer.Clear();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (State.Value)
|
||||||
|
{
|
||||||
|
case DownloadState.LocallyAvailable:
|
||||||
|
// temporary for UX until new design is implemented.
|
||||||
|
downloadButtonsContainer.Child = new BeatmapPanelDownloadButton(BeatmapSet.Value)
|
||||||
|
{
|
||||||
|
Width = 50,
|
||||||
|
RelativeSizeAxes = Axes.Y,
|
||||||
|
SelectedBeatmap = { BindTarget = Picker.Beatmap }
|
||||||
|
};
|
||||||
|
break;
|
||||||
|
|
||||||
|
case DownloadState.Downloading:
|
||||||
|
case DownloadState.Importing:
|
||||||
|
// temporary to avoid showing two buttons for maps with novideo. will be fixed in new beatmap overlay design.
|
||||||
|
downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
|
||||||
|
if (BeatmapSet.Value.OnlineInfo.HasVideo)
|
||||||
|
downloadButtonsContainer.Add(new HeaderDownloadButton(BeatmapSet.Value, true));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -76,7 +76,7 @@ namespace osu.Game.Overlays
|
|||||||
},
|
},
|
||||||
new ScoresContainer
|
new ScoresContainer
|
||||||
{
|
{
|
||||||
Beatmap = { BindTarget = Header.Picker.Beatmap }
|
Beatmap = { BindTarget = Header.HeaderContent.Picker.Beatmap }
|
||||||
},
|
},
|
||||||
comments = new CommentsSection()
|
comments = new CommentsSection()
|
||||||
},
|
},
|
||||||
@ -88,7 +88,7 @@ namespace osu.Game.Overlays
|
|||||||
info.BeatmapSet.BindTo(beatmapSet);
|
info.BeatmapSet.BindTo(beatmapSet);
|
||||||
comments.BeatmapSet.BindTo(beatmapSet);
|
comments.BeatmapSet.BindTo(beatmapSet);
|
||||||
|
|
||||||
Header.Picker.Beatmap.ValueChanged += b =>
|
Header.HeaderContent.Picker.Beatmap.ValueChanged += b =>
|
||||||
{
|
{
|
||||||
info.Beatmap = b.NewValue;
|
info.Beatmap = b.NewValue;
|
||||||
|
|
||||||
@ -122,7 +122,7 @@ namespace osu.Game.Overlays
|
|||||||
req.Success += res =>
|
req.Success += res =>
|
||||||
{
|
{
|
||||||
beatmapSet.Value = res.ToBeatmapSet(rulesets);
|
beatmapSet.Value = res.ToBeatmapSet(rulesets);
|
||||||
Header.Picker.Beatmap.Value = Header.BeatmapSet.Value.Beatmaps.First(b => b.OnlineBeatmapID == beatmapId);
|
Header.HeaderContent.Picker.Beatmap.Value = Header.BeatmapSet.Value.Beatmaps.First(b => b.OnlineBeatmapID == beatmapId);
|
||||||
};
|
};
|
||||||
API.Queue(req);
|
API.Queue(req);
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user