Merge remote-tracking branch 'FreezyLemon/master' into fix-taiko-stronghit

osu.Game.Tests/Visual/TestCaseUserProfile.cs

@@ -13,6 +13,8 @@ namespace osu.Game.Tests.Visual
 {
     public class TestCaseUserProfile : OsuTestCase
     {
+        private readonly TestUserProfileOverlay profile;
+
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(ProfileHeader),
@@ -23,8 +25,12 @@ namespace osu.Game.Tests.Visual
 
         public TestCaseUserProfile()
         {
-            var profile = new UserProfileOverlay();
+            Add(profile = new TestUserProfileOverlay());
-            Add(profile);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
 
             AddStep("Show offline dummy", () => profile.ShowUser(new User
             {
@@ -48,6 +54,9 @@ namespace osu.Game.Tests.Visual
                     Data = Enumerable.Range(2345, 45).Concat(Enumerable.Range(2109, 40)).ToArray()
                 }
             }, false));
+
+            checkSupporterTag(false);
+
             AddStep("Show ppy", () => profile.ShowUser(new User
             {
                 Username = @"peppy",
@@ -55,6 +64,9 @@ namespace osu.Game.Tests.Visual
                 Country = new Country { FullName = @"Australia", FlagName = @"AU" },
                 CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg"
             }));
+
+            checkSupporterTag(true);
+
             AddStep("Show flyte", () => profile.ShowUser(new User
             {
                 Username = @"flyte",
@@ -62,8 +74,23 @@ namespace osu.Game.Tests.Visual
                 Country = new Country { FullName = @"Japan", FlagName = @"JP" },
                 CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
             }));
+
             AddStep("Hide", profile.Hide);
             AddStep("Show without reload", profile.Show);
         }
+
+        private void checkSupporterTag(bool isSupporter)
+        {
+            AddUntilStep(() => profile.Header.User != null, "wait for load");
+            if (isSupporter)
+                AddAssert("is supporter", () => profile.Header.SupporterTag.Alpha == 1);
+            else
+                AddAssert("no supporter", () => profile.Header.SupporterTag.Alpha == 0);
+        }
+
+        private class TestUserProfileOverlay : UserProfileOverlay
+        {
+            public new ProfileHeader Header => base.Header;
+        }
     }
 }

osu.Game/OsuGame.cs

@@ -272,7 +272,7 @@ namespace osu.Game
                 };
             }
 
-            Action<Visibility> stateChanged = delegate
+            void updateScreenOffset()
             {
                 float offset = 0;
 
@@ -281,11 +281,11 @@ namespace osu.Game
                 if (notifications.State == Visibility.Visible)
                     offset -= ToolbarButton.WIDTH / 2;
 
-                intro.MoveToX(offset, SettingsOverlay.TRANSITION_LENGTH, Easing.OutQuint);
+                screenStack.MoveToX(offset, SettingsOverlay.TRANSITION_LENGTH, Easing.OutQuint);
-            };
+            }
 
-            settings.StateChanged += stateChanged;
+            settings.StateChanged += _ => updateScreenOffset();
-            notifications.StateChanged += stateChanged;
+            notifications.StateChanged += _ => updateScreenOffset();
 
             Cursor.State = Visibility.Hidden;
         }

osu.Game/Overlays/Profile/ProfileHeader.cs

@@ -29,7 +29,8 @@ namespace osu.Game.Overlays.Profile
         private readonly FillFlowContainer<SpriteText> scoreText, scoreNumberText;
         private readonly RankGraph rankGraph;
 
-        private readonly Container coverContainer, supporterTag;
+        public readonly SupporterIcon SupporterTag;
+        private readonly Container coverContainer;
         private readonly Sprite levelBadge;
         private readonly SpriteText levelText;
         private readonly GradeBadge gradeSSPlus, gradeSS, gradeSPlus, gradeS, gradeA;
@@ -94,32 +95,13 @@ namespace osu.Game.Overlays.Profile
                                     AutoSizeAxes = Axes.Both,
                                     Children = new Drawable[]
                                     {
-                                        supporterTag = new CircularContainer
+                                        SupporterTag = new SupporterIcon
                                         {
+                                            Alpha = 0,
                                             Anchor = Anchor.BottomLeft,
                                             Origin = Anchor.BottomLeft,
                                             Y = -75,
-                                            Size = new Vector2(25, 25),
+                                            Size = new Vector2(25, 25)
-                                            Masking = true,
-                                            BorderThickness = 3,
-                                            BorderColour = Color4.White,
-                                            Alpha = 0,
-                                            Children = new Drawable[]
-                                            {
-                                                new Box
-                                                {
-                                                    RelativeSizeAxes = Axes.Both,
-                                                    Alpha = 0,
-                                                    AlwaysPresent = true
-                                                },
-                                                new SpriteIcon
-                                                {
-                                                    Icon = FontAwesome.fa_heart,
-                                                    Anchor = Anchor.Centre,
-                                                    Origin = Anchor.Centre,
-                                                    Size = new Vector2(12),
-                                                }
-                                            }
                                         },
                                         new LinkFlowContainer.ProfileLink(user)
                                         {
@@ -328,7 +310,8 @@ namespace osu.Game.Overlays.Profile
                 Depth = float.MaxValue,
             }, coverContainer.Add);
 
-            if (user.IsSupporter) supporterTag.Show();
+            if (user.IsSupporter)
+                SupporterTag.Show();
 
             if (!string.IsNullOrEmpty(user.Colour))
             {

osu.Game/Overlays/Profile/SupporterIcon.cs

@@ -0,0 +1,61 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Backgrounds;
+
+namespace osu.Game.Overlays.Profile
+{
+    public class SupporterIcon : CircularContainer
+    {
+        private readonly Box background;
+
+        public SupporterIcon()
+        {
+            Masking = true;
+            Children = new Drawable[]
+            {
+                    new Box { RelativeSizeAxes = Axes.Both },
+                    new CircularContainer
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
+                        Scale = new Vector2(0.8f),
+                        Masking = true,
+                        Children = new Drawable[]
+                        {
+                            background = new Box { RelativeSizeAxes = Axes.Both },
+                            new Triangles
+                            {
+                                TriangleScale = 0.2f,
+                                ColourLight = OsuColour.FromHex(@"ff7db7"),
+                                ColourDark = OsuColour.FromHex(@"de5b95"),
+                                RelativeSizeAxes = Axes.Both,
+                                Velocity = 0.3f,
+                            },
+                        }
+                    },
+                    new SpriteIcon
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
+                        Icon = FontAwesome.fa_heart,
+                        Scale = new Vector2(0.45f),
+                    }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            background.Colour = colours.Pink;
+        }
+    }
+}

osu.Game/Overlays/UserProfileOverlay.cs

@@ -28,7 +28,7 @@ namespace osu.Game.Overlays
         private ProfileSection[] sections;
         private GetUserRequest userReq;
         private APIAccess api;
-        private ProfileHeader header;
+        protected ProfileHeader Header;
         private SectionsContainer<ProfileSection> sectionsContainer;
         private ProfileTabControl tabs;
 
@@ -113,12 +113,12 @@ namespace osu.Game.Overlays
                 Colour = OsuColour.Gray(0.2f)
             });
 
-            header = new ProfileHeader(user);
+            Header = new ProfileHeader(user);
 
             Add(sectionsContainer = new SectionsContainer<ProfileSection>
             {
                 RelativeSizeAxes = Axes.Both,
-                ExpandableHeader = header,
+                ExpandableHeader = Header,
                 FixedHeader = tabs,
                 HeaderBackground = new Box
                 {
@@ -169,7 +169,7 @@ namespace osu.Game.Overlays
 
         private void userLoadComplete(User user)
         {
-            header.User = user;
+            Header.User = user;
 
             foreach (string id in user.ProfileOrder)
             {

osu.Game/Users/UserPanel.cs

@@ -16,8 +16,8 @@ using osu.Game.Overlays;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Graphics.Cursor;
-using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Containers;
+using osu.Game.Overlays.Profile;
 
 namespace osu.Game.Users
 {
@@ -220,53 +220,5 @@ namespace osu.Game.Users
         {
             new OsuMenuItem("View Profile", MenuItemType.Highlighted, ViewProfile),
         };
-
-        private class SupporterIcon : CircularContainer
-        {
-            private readonly Box background;
-
-            public SupporterIcon()
-            {
-                Masking = true;
-                Children = new Drawable[]
-                {
-                    new Box { RelativeSizeAxes = Axes.Both },
-                    new CircularContainer
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        RelativeSizeAxes = Axes.Both,
-                        Scale = new Vector2(0.8f),
-                        Masking = true,
-                        Children = new Drawable[]
-                        {
-                            background = new Box { RelativeSizeAxes = Axes.Both },
-                            new Triangles
-                            {
-                                TriangleScale = 0.2f,
-                                ColourLight = OsuColour.FromHex(@"ff7db7"),
-                                ColourDark = OsuColour.FromHex(@"de5b95"),
-                                RelativeSizeAxes = Axes.Both,
-                                Velocity = 0.3f,
-                            },
-                        }
-                    },
-                    new SpriteIcon
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        RelativeSizeAxes = Axes.Both,
-                        Icon = FontAwesome.fa_heart,
-                        Scale = new Vector2(0.45f),
-                    }
-                };
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                background.Colour = colours.Pink;
-            }
-        }
     }
 }

osu.Game/osu.Game.csproj

@@ -267,6 +267,7 @@
     <Compile Include="Beatmaps\Formats\LegacyStoryboardDecoder.cs" />
     <Compile Include="Database\DatabaseContextFactory.cs" />
     <Compile Include="Database\IHasPrimaryKey.cs" />
+    <Compile Include="Overlays\Profile\SupporterIcon.cs" />
     <Compile Include="Overlays\Settings\DangerousSettingsButton.cs" />
     <Compile Include="Graphics\UserInterface\HoverClickSounds.cs" />
     <Compile Include="Graphics\UserInterface\HoverSounds.cs" />