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

fixed SupporterRequiredDrawable

Browse Source
This commit is contained in:
JimmyC7834
2021-06-21 14:25:20 +08:00
parent d0a8b74823
commit 0707642b76
1 changed files with 34 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
osu.Game/Overlays/BeatmapListingOverlay.cs
View File

@ -13,6 +13,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Textures;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Framework.Localisation;
using osu.Game.Audio; using osu.Game.Audio;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Graphics; using osu.Game.Graphics;
@ -121,25 +122,20 @@ namespace osu.Game.Overlays
private void onSearchFinished(List<BeatmapSetInfo> beatmaps, BeatmapListingSearchControl searchControl) private void onSearchFinished(List<BeatmapSetInfo> beatmaps, BeatmapListingSearchControl searchControl)
{ {
// non-supporter user used supporter-only filters
if (searchControl != null)
{
// compose filter string
List<string> filtersStrs = new List<string>();
if (searchControl.Played.Value != SearchPlayed.Any) filtersStrs.Add(BeatmapsStrings.ListingSearchFiltersPlayed.ToString());
if (searchControl.Ranks.Any()) filtersStrs.Add(BeatmapsStrings.ListingSearchFiltersRank.ToString());
supporterRequiredContent.UpdateSupportRequiredText(string.Join(" and ", filtersStrs));
LoadComponentAsync(supporterRequiredContent, addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token);
return;
}
var newPanels = beatmaps.Select<BeatmapSetInfo, BeatmapPanel>(b => new GridBeatmapPanel(b) var newPanels = beatmaps.Select<BeatmapSetInfo, BeatmapPanel>(b => new GridBeatmapPanel(b)
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
}); });
// non-supporter user used supporter-only filters
if (searchControl != null)
{
supporterRequiredContent.UpdateText(searchControl.Played.Value != SearchPlayed.Any, searchControl.Ranks.Any());
LoadComponentAsync(supporterRequiredContent, addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token);
return;
}
if (filterControl.CurrentPage == 0) if (filterControl.CurrentPage == 0)
{ {
//No matches case //No matches case
@ -262,26 +258,16 @@ namespace osu.Game.Overlays
} }
} }
// using string literals as there's no proper processing for LocalizeStrings yet
public class SupporterRequiredDrawable : CompositeDrawable public class SupporterRequiredDrawable : CompositeDrawable
{ {
private LinkFlowContainer linkFlowContainer; private OsuSpriteText supporterRequiredText;
public SupporterRequiredDrawable() public SupporterRequiredDrawable()
{ {
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
Height = 225; Height = 225;
Alpha = 0; Alpha = 0;
linkFlowContainer = linkFlowContainer = new LinkFlowContainer
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
AutoSizeAxes = Axes.Both,
Margin = new MarginPadding
{
Bottom = 10,
}
};
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -304,42 +290,35 @@ namespace osu.Game.Overlays
FillMode = FillMode.Fit, FillMode = FillMode.Fit,
Texture = textures.Get(@"Online/supporter-required"), Texture = textures.Get(@"Online/supporter-required"),
}, },
linkFlowContainer, supporterRequiredText = new OsuSpriteText
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Margin = new MarginPadding { Bottom = 10 },
},
createSupporterTagLink(),
} }
}); });
} }
public void UpdateSupportRequiredText(string filtersStr) { public void UpdateText(bool playedFilter, bool rankFilter) {
string[] text = BeatmapsStrings.ListingSearchSupporterFilterQuoteDefault(filtersStr, "{1}").ToString().Split("{1}"); List<string> filters = new List<string>();
if (playedFilter) filters.Add(BeatmapsStrings.ListingSearchFiltersPlayed.ToString());
linkFlowContainer.Clear(); if (rankFilter) filters.Add(BeatmapsStrings.ListingSearchFiltersRank.ToString());
linkFlowContainer.AddText( supporterRequiredText.Text = BeatmapsStrings.ListingSearchSupporterFilterQuoteDefault(string.Join(" and ", filters), "").ToString();
text[0],
t =>
{
t.Font = OsuFont.GetFont(size: 16);
t.Colour = Colour4.White;
} }
);
linkFlowContainer.AddLink( public Drawable createSupporterTagLink() {
BeatmapsStrings.ListingSearchSupporterFilterQuoteLinkText.ToString(), LinkFlowContainer supporterTagLink = new LinkFlowContainer
"https://osu.ppy.sh/store/products/supporter-tag",
t =>
{ {
t.Font = OsuFont.GetFont(size: 16); Anchor = Anchor.Centre,
t.Colour = Colour4.FromHex("#A6C8D9"); Origin = Anchor.Centre,
} AutoSizeAxes = Axes.Both,
); Margin = new MarginPadding { Bottom = 10 },
};
linkFlowContainer.AddText( supporterTagLink.AddLink(BeatmapsStrings.ListingSearchSupporterFilterQuoteLinkText.ToString(), Online.Chat.LinkAction.External, "https://osu.ppy.sh/store/products/supporter-tag");
text[1], return supporterTagLink;
t =>
{
t.Font = OsuFont.GetFont(size: 16);
t.Colour = Colour4.White;
}
);
} }
} }