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

fixed filter text display, added visual tests

Browse Source
This commit is contained in:
JimmyC7834 2021-06-20 21:23:54 +08:00
parent e7aeba8d03
commit 996503eb2d
3 changed files with 103 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
View File

@ -72,45 +72,56 @@ namespace osu.Game.Tests.Visual.Online
[Test] [Test]
public void TestSupporterOnlyFiltersPlaceholderNoBeatmaps() public void TestSupporterOnlyFiltersPlaceholderNoBeatmaps()
{ {
AddStep("fetch for 0 beatmaps", () => fetchFor());
AddStep("set dummy as non-supporter", () => ((DummyAPIAccess)API).LocalUser.Value.IsSupporter = false); AddStep("set dummy as non-supporter", () => ((DummyAPIAccess)API).LocalUser.Value.IsSupporter = false);
// test non-supporter on Rank Achieved filter // test non-supporter on Rank Achieved filter
toggleRandomRankFilter(); toggleRandomRankFilter();
AddUntilStep("supporter-placeholder shown", () => overlay.ChildrenOfType<BeatmapListingOverlay.SupporterRequiredDrawable>().SingleOrDefault()?.IsPresent == true); expectedPlaceholderShown(true, false);
AddUntilStep("not-found-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().Any());
AddStep("Clear Rank Achieved filter", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Ranks.Clear()); AddStep("Clear Rank Achieved filter", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Ranks.Clear());
AddUntilStep("supporter-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.SupporterRequiredDrawable>().Any()); expectedPlaceholderShown(false, true);
AddUntilStep("not-found-placeholder shown", () => overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().SingleOrDefault()?.IsPresent == true);
// test non-supporter on Played filter // test non-supporter on Played filter
toggleRandomSupporterOnlyPlayedFilter(); toggleRandomSupporterOnlyPlayedFilter();
AddUntilStep("supporter-placeholder shown", () => overlay.ChildrenOfType<BeatmapListingOverlay.SupporterRequiredDrawable>().SingleOrDefault()?.IsPresent == true); expectedPlaceholderShown(true, false);
AddUntilStep("not-found-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().Any());
AddStep("Set Played filter to Any", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Played.Value = SearchPlayed.Any); AddStep("Set Played filter to Any", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Played.Value = SearchPlayed.Any);
AddUntilStep("supporter-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.SupporterRequiredDrawable>().Any()); expectedPlaceholderShown(false, true);
AddUntilStep("not-found-placeholder shown", () => overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().SingleOrDefault()?.IsPresent == true);
// test non-supporter on both Rank Achieved and Played filter
toggleRandomRankFilter();
toggleRandomSupporterOnlyPlayedFilter();
expectedPlaceholderShown(true, false);
AddStep("Clear Rank Achieved filter", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Ranks.Clear());
AddStep("Set Played filter to Any", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Played.Value = SearchPlayed.Any);
expectedPlaceholderShown(false, true);
AddStep("set dummy as supporter", () => ((DummyAPIAccess)API).LocalUser.Value.IsSupporter = true); AddStep("set dummy as supporter", () => ((DummyAPIAccess)API).LocalUser.Value.IsSupporter = true);
// test supporter on Rank Achieved filter // test supporter on Rank Achieved filter
toggleRandomRankFilter(); toggleRandomRankFilter();
AddUntilStep("supporter-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.SupporterRequiredDrawable>().Any()); expectedPlaceholderShown(false, true);
AddUntilStep("not-found-placeholder shown", () => overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().SingleOrDefault()?.IsPresent == true);
AddStep("Clear Rank Achieved filter", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Ranks.Clear()); AddStep("Clear Rank Achieved filter", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Ranks.Clear());
AddUntilStep("supporter-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.SupporterRequiredDrawable>().Any()); expectedPlaceholderShown(false, true);
AddUntilStep("not-found-placeholder shown", () => overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().SingleOrDefault()?.IsPresent == true);
// test supporter on Played filter // test supporter on Played filter
toggleRandomSupporterOnlyPlayedFilter(); toggleRandomSupporterOnlyPlayedFilter();
AddUntilStep("supporter-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.SupporterRequiredDrawable>().Any()); expectedPlaceholderShown(false, true);
AddUntilStep("not-found-placeholder shown", () => overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().SingleOrDefault()?.IsPresent == true);
AddStep("Set Played filter to Any", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Played.Value = SearchPlayed.Any); AddStep("Set Played filter to Any", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Played.Value = SearchPlayed.Any);
AddUntilStep("supporter-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.SupporterRequiredDrawable>().Any()); expectedPlaceholderShown(false, true);
AddUntilStep("not-found-placeholder shown", () => overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().SingleOrDefault()?.IsPresent == true);
// test supporter on both Rank Achieved and Played filter
toggleRandomRankFilter();
toggleRandomSupporterOnlyPlayedFilter();
expectedPlaceholderShown(false, true);
AddStep("Clear Rank Achieved filter", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Ranks.Clear());
AddStep("Set Played filter to Any", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Played.Value = SearchPlayed.Any);
expectedPlaceholderShown(false, true);
} }
[Test] [Test]
@ -121,41 +132,51 @@ namespace osu.Game.Tests.Visual.Online
// test non-supporter on Rank Achieved filter // test non-supporter on Rank Achieved filter
toggleRandomRankFilter(); toggleRandomRankFilter();
AddUntilStep("supporter-placeholder shown", () => overlay.ChildrenOfType<BeatmapListingOverlay.SupporterRequiredDrawable>().SingleOrDefault()?.IsPresent == true); expectedPlaceholderShown(true, false);
AddUntilStep("not-found-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().Any());
AddStep("Clear Rank Achieved filter", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Ranks.Clear()); AddStep("Clear Rank Achieved filter", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Ranks.Clear());
AddUntilStep("supporter-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.SupporterRequiredDrawable>().Any()); expectedPlaceholderShown(false, false);
AddUntilStep("not-found-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().Any());
// test non-supporter on Played filter // test non-supporter on Played filter
toggleRandomSupporterOnlyPlayedFilter(); toggleRandomSupporterOnlyPlayedFilter();
AddUntilStep("supporter-placeholder shown", () => overlay.ChildrenOfType<BeatmapListingOverlay.SupporterRequiredDrawable>().SingleOrDefault()?.IsPresent == true); expectedPlaceholderShown(true, false);
AddUntilStep("not-found-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().Any());
AddStep("Set Played filter to Any", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Played.Value = SearchPlayed.Any); AddStep("Set Played filter to Any", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Played.Value = SearchPlayed.Any);
AddUntilStep("supporter-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.SupporterRequiredDrawable>().Any()); expectedPlaceholderShown(false, false);
AddUntilStep("not-found-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().Any());
// test non-supporter on both Rank Achieved and Played filter
toggleRandomRankFilter();
toggleRandomSupporterOnlyPlayedFilter();
expectedPlaceholderShown(true, false);
AddStep("Clear Rank Achieved filter", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Ranks.Clear());
AddStep("Set Played filter to Any", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Played.Value = SearchPlayed.Any);
expectedPlaceholderShown(false, false);
AddStep("set dummy as supporter", () => ((DummyAPIAccess)API).LocalUser.Value.IsSupporter = true); AddStep("set dummy as supporter", () => ((DummyAPIAccess)API).LocalUser.Value.IsSupporter = true);
// test supporter on Rank Achieved filter // test supporter on Rank Achieved filter
toggleRandomRankFilter(); toggleRandomRankFilter();
AddUntilStep("supporter-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.SupporterRequiredDrawable>().Any()); expectedPlaceholderShown(false, false);
AddUntilStep("not-found-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().Any());
AddStep("Clear Rank Achieved filter", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Ranks.Clear()); AddStep("Clear Rank Achieved filter", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Ranks.Clear());
AddUntilStep("supporter-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.SupporterRequiredDrawable>().Any()); expectedPlaceholderShown(false, false);
AddUntilStep("not-found-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().Any());
// test supporter on Played filter // test supporter on Played filter
toggleRandomSupporterOnlyPlayedFilter(); toggleRandomSupporterOnlyPlayedFilter();
AddUntilStep("supporter-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.SupporterRequiredDrawable>().Any()); expectedPlaceholderShown(false, false);
AddUntilStep("not-found-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().Any());
AddStep("Set Played filter to Any", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Played.Value = SearchPlayed.Any); AddStep("Set Played filter to Any", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Played.Value = SearchPlayed.Any);
AddUntilStep("supporter-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.SupporterRequiredDrawable>().Any()); expectedPlaceholderShown(false, false);
AddUntilStep("not-found-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().Any());
// test supporter on both Rank Achieved and Played filter
toggleRandomRankFilter();
toggleRandomSupporterOnlyPlayedFilter();
expectedPlaceholderShown(false, false);
AddStep("Set Played filter to Any", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Played.Value = SearchPlayed.Any);
AddStep("Clear Rank Achieved filter", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Ranks.Clear());
expectedPlaceholderShown(false, false);
} }
@ -184,6 +205,27 @@ namespace osu.Game.Tests.Visual.Online
AddStep("toggle Random Played filter", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Played.Value = (SearchPlayed)(r % 2 + 1)); AddStep("toggle Random Played filter", () => overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Played.Value = (SearchPlayed)(r % 2 + 1));
} }
private void expectedPlaceholderShown(bool supporterRequiredShown, bool notFoundShown)
{
if (supporterRequiredShown)
{
AddUntilStep("supporter-placeholder shown", () => overlay.ChildrenOfType<BeatmapListingOverlay.SupporterRequiredDrawable>().SingleOrDefault()?.IsPresent == true);
}
else
{
AddUntilStep("supporter-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.SupporterRequiredDrawable>().Any());
}
if (notFoundShown)
{
AddUntilStep("not-found-placeholder shown", () => overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().SingleOrDefault()?.IsPresent == true);
}
else
{
AddUntilStep("not-found-placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().Any());
}
}
private class TestAPIBeatmapSet : APIBeatmapSet private class TestAPIBeatmapSet : APIBeatmapSet
{ {
private readonly BeatmapSetInfo beatmapSet; private readonly BeatmapSetInfo beatmapSet;

8
osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
View File

@ -24,9 +24,9 @@ namespace osu.Game.Overlays.BeatmapListing
{ {
/// <summary> /// <summary>
/// Fired when a search finishes. Contains only new items in the case of pagination. /// Fired when a search finishes. Contains only new items in the case of pagination.
/// Null when non-supporter user used supporter-only filters /// Fired with BeatmapListingSearchControl when non-supporter user used supporter-only filters.
/// </summary> /// </summary>
public Action<List<BeatmapSetInfo>> SearchFinished; public Action<List<BeatmapSetInfo>, BeatmapListingSearchControl> SearchFinished;
/// <summary> /// <summary>
/// Fired when search criteria change. /// Fired when search criteria change.
@ -216,11 +216,11 @@ namespace osu.Game.Overlays.BeatmapListing
// check if an non-supporter user used supporter-only filters // check if an non-supporter user used supporter-only filters
if (!api.LocalUser.Value.IsSupporter && (searchControl.Ranks.Any() || searchControl.Played.Value != SearchPlayed.Any)) if (!api.LocalUser.Value.IsSupporter && (searchControl.Ranks.Any() || searchControl.Played.Value != SearchPlayed.Any))
{ {
SearchFinished?.Invoke(null); SearchFinished?.Invoke(sets, searchControl);
} }
else else
{ {
SearchFinished?.Invoke(sets); SearchFinished?.Invoke(sets, null);
} }
}; };

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

@ -119,11 +119,17 @@ namespace osu.Game.Overlays
private Task panelLoadDelegate; private Task panelLoadDelegate;
private void onSearchFinished(List<BeatmapSetInfo> beatmaps) private void onSearchFinished(List<BeatmapSetInfo> beatmaps, BeatmapListingSearchControl searchControl)
{ {
// non-supporter user used supporter-only filters // non-supporter user used supporter-only filters
if (beatmaps == null) if (searchControl != null)
{ {
// compose filter string
List<string> filtersStrs = new List<string>();
if (searchControl.Ranks.Any()) filtersStrs.Add(BeatmapsStrings.ListingSearchFiltersRank.ToString());
if (searchControl.Played.Value != SearchPlayed.Any) filtersStrs.Add(BeatmapsStrings.ListingSearchFiltersPlayed.ToString());
supporterRequiredContent.UpdateSupportRequiredText(string.Join(" and ", filtersStrs));
LoadComponentAsync(supporterRequiredContent, addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token); LoadComponentAsync(supporterRequiredContent, addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token);
return; return;
} }
@ -258,11 +264,24 @@ namespace osu.Game.Overlays
public class SupporterRequiredDrawable : CompositeDrawable public class SupporterRequiredDrawable : CompositeDrawable
{ {
private LinkFlowContainer linkFlowContainer;
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]
@ -285,27 +304,15 @@ namespace osu.Game.Overlays
FillMode = FillMode.Fit, FillMode = FillMode.Fit,
Texture = textures.Get(@"Online/supporter-required"), Texture = textures.Get(@"Online/supporter-required"),
}, },
createSupportRequiredText(), linkFlowContainer,
} }
}); });
} }
private Drawable createSupportRequiredText() public void UpdateSupportRequiredText(string filtersStr) {
{ string[] text = BeatmapsStrings.ListingSearchSupporterFilterQuoteDefault(filtersStr, "{1}").ToString().Split("{1}");
LinkFlowContainer linkFlowContainer;
string[] text = BeatmapsStrings.ListingSearchSupporterFilterQuoteDefault(BeatmapsStrings.ListingSearchFiltersRank.ToString(), "{1}").ToString().Split("{1}");
linkFlowContainer = new LinkFlowContainer
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
AutoSizeAxes = Axes.Both,
Margin = new MarginPadding
{
Bottom = 10,
}
};
linkFlowContainer.Clear();
linkFlowContainer.AddText( linkFlowContainer.AddText(
text[0], text[0],
t => t =>
@ -333,8 +340,6 @@ namespace osu.Game.Overlays
t.Colour = Colour4.White; t.Colour = Colour4.White;
} }
); );
return linkFlowContainer;
} }
} }