sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-20 21:17:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

Refactor LevelBadge to use LevelInfo

Browse Source
This commit is contained in:
StanR 2023-01-16 23:24:09 +03:00
parent 4224907f08
commit 6207a96a29
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
View File

@ -6,6 +6,7 @@ using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Overlays.Profile.Header.Components; using osu.Game.Overlays.Profile.Header.Components;
using osuTK; using osuTK;
@ -15,6 +16,8 @@ namespace osu.Game.Overlays.Profile.Header
{ {
public readonly Bindable<UserProfileData?> User = new Bindable<UserProfileData?>(); public readonly Bindable<UserProfileData?> User = new Bindable<UserProfileData?>();
private LevelBadge levelBadge = null!;
public CentreHeaderContainer() public CentreHeaderContainer()
{ {
Height = 60; Height = 60;
@ -62,12 +65,11 @@ namespace osu.Game.Overlays.Profile.Header
Margin = new MarginPadding { Right = UserProfileOverlay.CONTENT_X_MARGIN }, Margin = new MarginPadding { Right = UserProfileOverlay.CONTENT_X_MARGIN },
Children = new Drawable[] Children = new Drawable[]
{ {
new LevelBadge levelBadge = new LevelBadge
{ {
Anchor = Anchor.CentreRight, Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight, Origin = Anchor.CentreRight,
Size = new Vector2(40), Size = new Vector2(40)
User = { BindTarget = User }
}, },
new Container new Container
{ {
@ -85,6 +87,13 @@ namespace osu.Game.Overlays.Profile.Header
} }
} }
}; };
User.BindValueChanged(user => updateDisplay(user.NewValue?.User));
}
private void updateDisplay(APIUser? user)
{
levelBadge.LevelInfo.Value = user?.Statistics?.Level;
} }
} }
} }

10
osu.Game/Overlays/Profile/Header/Components/LevelBadge.cs
View File

@ -11,14 +11,14 @@ using osu.Framework.Graphics.Textures;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Resources.Localisation.Web; using osu.Game.Resources.Localisation.Web;
using osu.Game.Users;
namespace osu.Game.Overlays.Profile.Header.Components namespace osu.Game.Overlays.Profile.Header.Components
{ {
public partial class LevelBadge : CompositeDrawable, IHasTooltip public partial class LevelBadge : CompositeDrawable, IHasTooltip
{ {
public readonly Bindable<UserProfileData?> User = new Bindable<UserProfileData?>(); public readonly Bindable<UserStatistics.LevelInfo?> LevelInfo = new Bindable<UserStatistics.LevelInfo?>();
public LocalisableString TooltipText { get; private set; } public LocalisableString TooltipText { get; private set; }
@ -48,12 +48,12 @@ namespace osu.Game.Overlays.Profile.Header.Components
} }
}; };
User.BindValueChanged(user => updateLevel(user.NewValue?.User)); LevelInfo.BindValueChanged(user => updateLevel(user.NewValue));
} }
private void updateLevel(APIUser? user) private void updateLevel(UserStatistics.LevelInfo? levelInfo)
{ {
string level = user?.Statistics?.Level.Current.ToString() ?? "0"; string level = levelInfo?.Current.ToString() ?? "0";
levelText.Text = level; levelText.Text = level;
TooltipText = UsersStrings.ShowStatsLevel(level); TooltipText = UsersStrings.ShowStatsLevel(level);
} }