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

Merge pull request #22123 from stanriders/group-badges

Browse Source 
Implement user group badges
This commit is contained in:
Dean Herbert 2023-01-11 18:42:50 +09:00 committed by GitHub
commit 08ca62205a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 170 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs
View File

@ -59,6 +59,7 @@ namespace osu.Game.Tests.Visual.Online
{
Id = 2001,
Username = "RankedUser",
Groups = new[] { new APIUserGroup { Colour = "#EB47D0", ShortName = "DEV", Name = "Developers" } },
Statistics = new UserStatistics
{
IsRanked = true,

5
osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
View File

@ -62,6 +62,11 @@ namespace osu.Game.Tests.Visual.Online
JoinDate = DateTimeOffset.Now.AddDays(-1),
LastVisit = DateTimeOffset.Now,
ProfileOrder = new[] { "me" },
Groups = new[]
{
new APIUserGroup { Colour = "#EB47D0", ShortName = "DEV", Name = "Developers" },
new APIUserGroup { Colour = "#A347EB", ShortName = "BN", Name = "Beatmap Nominators", Playmodes = new[] { "osu", "taiko" } }
},
Statistics = new UserStatistics
{
IsRanked = true,

3
osu.Game/Online/API/Requests/Responses/APIUser.cs
View File

@ -255,6 +255,9 @@ namespace osu.Game.Online.API.Requests.Responses
[CanBeNull]
public Dictionary<string, UserStatistics> RulesetsStatistics { get; set; }
[JsonProperty("groups")]
public APIUserGroup[] Groups;
public override string ToString() => Username;
/// <summary>

37
osu.Game/Online/API/Requests/Responses/APIUserGroup.cs Normal file
View File

@ -0,0 +1,37 @@
// 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 Newtonsoft.Json;
namespace osu.Game.Online.API.Requests.Responses
{
public class APIUserGroup
{
[JsonProperty(@"colour")]
public string Colour { get; set; } = null!;
[JsonProperty(@"has_listing")]
public bool HasListings { get; set; }
[JsonProperty(@"has_playmodes")]
public bool HasPlaymodes { get; set; }
[JsonProperty(@"id")]
public int Id { get; set; }
[JsonProperty(@"identifier")]
public string Identifier { get; set; } = null!;
[JsonProperty(@"is_probationary")]
public bool IsProbationary { get; set; }
[JsonProperty(@"name")]
public string Name { get; set; } = null!;
[JsonProperty(@"short_name")]
public string ShortName { get; set; } = null!;
[JsonProperty(@"playmodes")]
public string[]? Playmodes { get; set; }
}
}

84
osu.Game/Overlays/Profile/Header/Components/GroupBadge.cs Normal file
View File

@ -0,0 +1,84 @@
// 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.Containers;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Localisation;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Rulesets;
using osuTK;
namespace osu.Game.Overlays.Profile.Header.Components
{
public partial class GroupBadge : Container, IHasTooltip
{
public LocalisableString TooltipText { get; }
public int TextSize { get; set; } = 12;
private readonly APIUserGroup group;
public GroupBadge(APIUserGroup group)
{
this.group = group;
AutoSizeAxes = Axes.Both;
Masking = true;
CornerRadius = 8;
TooltipText = group.Name;
}
[BackgroundDependencyLoader]
private void load(OverlayColourProvider? colourProvider, RulesetStore rulesets)
{
FillFlowContainer innerContainer;
AddRangeInternal(new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = colourProvider?.Background6 ?? Colour4.Black
},
innerContainer = new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
Padding = new MarginPadding { Vertical = 2, Horizontal = 10 },
Direction = FillDirection.Horizontal,
Spacing = new Vector2(5),
Children = new[]
{
new OsuSpriteText
{
Text = group.ShortName,
Colour = Color4Extensions.FromHex(group.Colour),
Shadow = false,
Font = OsuFont.GetFont(size: TextSize, weight: FontWeight.Bold, italics: true)
}
}
}
});
if (group.Playmodes?.Length > 0)
{
innerContainer.AddRange(group.Playmodes.Select(p =>
(rulesets.GetRuleset(p)?.CreateInstance().CreateIcon() ?? new SpriteIcon { Icon = FontAwesome.Regular.QuestionCircle }).With(icon =>
{
icon.Size = new Vector2(TextSize - 1);
})).ToList()
);
}
}
}
}

32
osu.Game/Overlays/Profile/Header/Components/GroupBadgeFlow.cs Normal file
View File

@ -0,0 +1,32 @@
// 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.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Online.API.Requests.Responses;
using osuTK;
namespace osu.Game.Overlays.Profile.Header.Components
{
public partial class GroupBadgeFlow : FillFlowContainer
{
public readonly Bindable<APIUser?> User = new Bindable<APIUser?>();
public GroupBadgeFlow()
{
AutoSizeAxes = Axes.Both;
Direction = FillDirection.Horizontal;
Spacing = new Vector2(2);
User.BindValueChanged(user =>
{
Clear(true);
if (user.NewValue?.Groups != null)
AddRange(user.NewValue.Groups.Select(g => new GroupBadge(g)));
});
}
}
}

9
osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
View File

@ -39,6 +39,7 @@ namespace osu.Game.Overlays.Profile.Header
private UpdateableFlag userFlag = null!;
private OsuSpriteText userCountryText = null!;
private FillFlowContainer userStats = null!;
private GroupBadgeFlow groupBadgeFlow = null!;
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider)
@ -89,6 +90,7 @@ namespace osu.Game.Overlays.Profile.Header
{
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(5),
Children = new Drawable[]
{
usernameText = new OsuSpriteText
@ -97,10 +99,14 @@ namespace osu.Game.Overlays.Profile.Header
},
openUserExternally = new ExternalLinkButton
{
Margin = new MarginPadding { Left = 5 },
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
},
groupBadgeFlow = new GroupBadgeFlow
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
}
}
},
titleText = new OsuSpriteText
@ -185,6 +191,7 @@ namespace osu.Game.Overlays.Profile.Header
supporterTag.SupportLevel = user?.SupportLevel ?? 0;
titleText.Text = user?.Title ?? string.Empty;
titleText.Colour = Color4Extensions.FromHex(user?.Colour ?? "fff");
groupBadgeFlow.User.Value = user;
userStats.Clear();