RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply NRT to `ClickableAvatar` and `UpdateableAvatar`

This commit is contained in:
Dean Herbert 2023-02-10 16:25:14 +09:00
parent 5866b67a5b
commit 199fb0fd85
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Users/Drawables/ClickableAvatar.cs
View File

@ -1,8 +1,6 @@
// 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.
#nullable disable
using System;
using osu.Framework.Allocation;
using osu.Framework.Input.Events;
@ -34,16 +32,16 @@ public override LocalisableString TooltipText
/// </summary>
public bool ShowUsernameTooltip { get; set; }
private readonly APIUser user;
private readonly APIUser? user;
[Resolved(CanBeNull = true)]
private OsuGame game { get; set; }
[Resolved]
private OsuGame? game { get; set; }
/// <summary>
/// A clickable avatar for the specified user, with UI sounds included.
/// </summary>
/// <param name="user">The user. A null value will get a placeholder avatar.</param>
public ClickableAvatar(APIUser user = null)
public ClickableAvatar(APIUser? user = null)
{
this.user = user;

10
osu.Game/Users/Drawables/UpdateableAvatar.cs
View File

@ -1,8 +1,6 @@
// 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.
#nullable disable
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Effects;
@ -13,9 +11,9 @@ namespace osu.Game.Users.Drawables
/// <summary>
/// An avatar which can update to a new user when needed.
/// </summary>
public partial class UpdateableAvatar : ModelBackedDrawable<APIUser>
public partial class UpdateableAvatar : ModelBackedDrawable<APIUser?>
{
public APIUser User
public APIUser? User
{
get => Model;
set => Model = value;
@ -58,7 +56,7 @@ public APIUser User
/// <param name="isInteractive">If set to true, hover/click sounds will play and clicking the avatar will open the user's profile.</param>
/// <param name="showUsernameTooltip">Whether to show the username rather than "view profile" on the tooltip. (note: this only applies if <paramref name="isInteractive"/> is also true)</param>
/// <param name="showGuestOnNull">Whether to show a default guest representation on null user (as opposed to nothing).</param>
public UpdateableAvatar(APIUser user = null, bool isInteractive = true, bool showUsernameTooltip = false, bool showGuestOnNull = true)
public UpdateableAvatar(APIUser? user = null, bool isInteractive = true, bool showUsernameTooltip = false, bool showGuestOnNull = true)
{
this.isInteractive = isInteractive;
this.showUsernameTooltip = showUsernameTooltip;
@ -67,7 +65,7 @@ public UpdateableAvatar(APIUser user = null, bool isInteractive = true, bool sho
User = user;
}
protected override Drawable CreateDrawable(APIUser user)
protected override Drawable? CreateDrawable(APIUser? user)
{
if (user == null && !showGuestOnNull)
return null;