Merge UpdateableAvatar.cs and Avatar.cs + Rename Avatar to DrawableAvatar

osu.Game/Online/Leaderboards/LeaderboardScore.cs

@@ -17,7 +17,6 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
-using osu.Game.Users;
 using osu.Game.Users.Drawables;
 using osuTK;
 using osuTK.Graphics;
@@ -66,7 +65,7 @@ namespace osu.Game.Online.Leaderboards
 
             statisticsLabels = GetStatistics(score).Select(s => new ScoreComponentLabel(s)).ToList();
 
-            Avatar innerAvatar;
+            DrawableAvatar innerAvatar;
 
             Children = new Drawable[]
             {
@@ -113,7 +112,7 @@ namespace osu.Game.Online.Leaderboards
                             Children = new[]
                             {
                                 avatar = new DelayedLoadWrapper(
-                                    innerAvatar = new Avatar(user)
+                                    innerAvatar = new DrawableAvatar(user)
                                     {
                                         RelativeSizeAxes = Axes.Both,
                                         CornerRadius = corner_radius,

osu.Game/Overlays/BeatmapSet/AuthorInfo.cs

@@ -6,7 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Users;
+using osu.Game.Users.Drawables;
 using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Graphics.Effects;

osu.Game/Overlays/Chat/Tabs/PrivateChannelTabItem.cs

@@ -10,7 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Online.Chat;
-using osu.Game.Users;
+using osu.Game.Users.Drawables;
 using osuTK;
 
 namespace osu.Game.Overlays.Chat.Tabs
@@ -25,7 +25,7 @@ namespace osu.Game.Overlays.Chat.Tabs
             if (value.Type != ChannelType.PM)
                 throw new ArgumentException("Argument value needs to have the targettype user!");
 
-            Avatar avatar;
+            DrawableAvatar avatar;
 
             AddRange(new Drawable[]
             {
@@ -48,7 +48,7 @@ namespace osu.Game.Overlays.Chat.Tabs
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                             Masking = true,
-                            Child = new DelayedLoadWrapper(avatar = new Avatar(value.Users.First())
+                            Child = new DelayedLoadWrapper(avatar = new DrawableAvatar(value.Users.First())
                             {
                                 RelativeSizeAxes = Axes.Both,
                                 OpenOnClick = { Value = false },

osu.Game/Overlays/Toolbar/ToolbarUserButton.cs

@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Effects;
 using osu.Game.Graphics;
 using osu.Game.Online.API;
 using osu.Game.Users;
+using osu.Game.Users.Drawables;
 using osuTK;
 using osuTK.Graphics;
 

osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs

@@ -19,6 +19,7 @@ using osu.Game.Online.API.Requests;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Users;
+using osu.Game.Users.Drawables;
 using osuTK;
 using osuTK.Graphics;
 

osu.Game/Screens/Multi/Match/Components/HostInfo.cs

@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Users;
+using osu.Game.Users.Drawables;
 using osuTK;
 
 namespace osu.Game.Screens.Multi.Match.Components

osu.Game/Users/Drawables/DrawableAvatar.cs

@@ -6,14 +6,71 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.Containers;
 
-namespace osu.Game.Users
+namespace osu.Game.Users.Drawables
 {
-    public class Avatar : Container
+    /// <summary>
+    /// An avatar which can update to a new user when needed.
+    /// </summary>
+    public class UpdateableAvatar : ModelBackedDrawable<User>
+    {
+        public User User
+        {
+            get => Model;
+            set => Model = value;
+        }
+
+        public new bool Masking
+        {
+            get => base.Masking;
+            set => base.Masking = value;
+        }
+
+        public new float CornerRadius
+        {
+            get => base.CornerRadius;
+            set => base.CornerRadius = value;
+        }
+
+        public new EdgeEffectParameters EdgeEffect
+        {
+            get => base.EdgeEffect;
+            set => base.EdgeEffect = value;
+        }
+
+        /// <summary>
+        /// Whether to show a default guest representation on null user (as opposed to nothing).
+        /// </summary>
+        public bool ShowGuestOnNull = true;
+
+        /// <summary>
+        /// Whether to open the user's profile when clicked.
+        /// </summary>
+        public readonly BindableBool OpenOnClick = new BindableBool(true);
+
+        protected override Drawable CreateDrawable(User user)
+        {
+            if (user == null && !ShowGuestOnNull)
+                return null;
+
+            var avatar = new DrawableAvatar(user)
+            {
+                RelativeSizeAxes = Axes.Both,
+            };
+
+            avatar.OnLoadComplete += d => d.FadeInFromZero(300, Easing.OutQuint);
+            avatar.OpenOnClick.BindTo(OpenOnClick);
+
+            return avatar;
+        }
+    }
+
+    public class DrawableAvatar : Container
     {
         /// <summary>
         /// Whether to open the user's profile when clicked.
@@ -29,7 +86,7 @@ namespace osu.Game.Users
         /// An avatar for specified user.
         /// </summary>
         /// <param name="user">The user. A null value will get a placeholder avatar.</param>
-        public Avatar(User user = null)
+        public DrawableAvatar(User user = null)
         {
             this.user = user;
         }

osu.Game/Users/UpdateableAvatar.cs

@@ -1,49 +0,0 @@
-// 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 osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-
-namespace osu.Game.Users
-{
-    /// <summary>
-    /// An avatar which can update to a new user when needed.
-    /// </summary>
-    public class UpdateableAvatar : ModelBackedDrawable<User>
-    {
-        /// <summary>
-        /// Whether to show a default guest representation on null user (as opposed to nothing).
-        /// </summary>
-        public bool ShowGuestOnNull = true;
-
-        public User User
-        {
-            get => Model;
-            set => Model = value;
-        }
-
-        /// <summary>
-        /// Whether to open the user's profile when clicked.
-        /// </summary>
-        public readonly BindableBool OpenOnClick = new BindableBool(true);
-
-        protected override Drawable CreateDrawable(User user)
-        {
-            if (user != null || ShowGuestOnNull)
-            {
-                var avatar = new Avatar(user)
-                {
-                    RelativeSizeAxes = Axes.Both,
-                };
-
-                avatar.OnLoadComplete += d => d.FadeInFromZero(300, Easing.OutQuint);
-                avatar.OpenOnClick.BindTo(OpenOnClick);
-
-                return avatar;
-            }
-
-            return null;
-        }
-    }
-}