Merge remote-tracking branch 'upstream/master' into fix-footer-button-hover-sounds

.travis.yml

@@ -1,2 +0,0 @@
-language: csharp
-solution: osu.sln

osu.Game.Tests/Visual/Online/TestSceneRankGraph.cs

@@ -69,28 +69,22 @@ namespace osu.Game.Tests.Visual.Online
                 }
             });
 
-            AddStep("null user", () => graph.User.Value = null);
+            AddStep("null user", () => graph.Statistics.Value = null);
             AddStep("rank only", () =>
             {
-                graph.User.Value = new User
+                graph.Statistics.Value = new UserStatistics
                 {
-                    Statistics = new UserStatistics
+                    Ranks = new UserStatistics.UserRanks { Global = 123456 },
-                    {
+                    PP = 12345,
-                        Ranks = new UserStatistics.UserRanks { Global = 123456 },
-                        PP = 12345,
-                    }
                 };
             });
 
             AddStep("with rank history", () =>
             {
-                graph.User.Value = new User
+                graph.Statistics.Value = new UserStatistics
                 {
-                    Statistics = new UserStatistics
+                    Ranks = new UserStatistics.UserRanks { Global = 89000 },
-                    {
+                    PP = 12345,
-                        Ranks = new UserStatistics.UserRanks { Global = 89000 },
-                        PP = 12345,
-                    },
                     RankHistory = new User.RankHistoryData
                     {
                         Data = data,
@@ -100,13 +94,10 @@ namespace osu.Game.Tests.Visual.Online
 
             AddStep("with zero values", () =>
             {
-                graph.User.Value = new User
+                graph.Statistics.Value = new UserStatistics
                 {
-                    Statistics = new UserStatistics
+                    Ranks = new UserStatistics.UserRanks { Global = 89000 },
-                    {
+                    PP = 12345,
-                        Ranks = new UserStatistics.UserRanks { Global = 89000 },
-                        PP = 12345,
-                    },
                     RankHistory = new User.RankHistoryData
                     {
                         Data = dataWithZeros,
@@ -116,13 +107,10 @@ namespace osu.Game.Tests.Visual.Online
 
             AddStep("small amount of data", () =>
             {
-                graph.User.Value = new User
+                graph.Statistics.Value = new UserStatistics
                 {
-                    Statistics = new UserStatistics
+                    Ranks = new UserStatistics.UserRanks { Global = 12000 },
-                    {
+                    PP = 12345,
-                        Ranks = new UserStatistics.UserRanks { Global = 12000 },
-                        PP = 12345,
-                    },
                     RankHistory = new User.RankHistoryData
                     {
                         Data = smallData,
@@ -132,13 +120,10 @@ namespace osu.Game.Tests.Visual.Online
 
             AddStep("graph with edges", () =>
             {
-                graph.User.Value = new User
+                graph.Statistics.Value = new UserStatistics
                 {
-                    Statistics = new UserStatistics
+                    Ranks = new UserStatistics.UserRanks { Global = 12000 },
-                    {
+                    PP = 12345,
-                        Ranks = new UserStatistics.UserRanks { Global = 12000 },
-                        PP = 12345,
-                    },
                     RankHistory = new User.RankHistoryData
                     {
                         Data = edgyData,

osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs

@@ -50,12 +50,12 @@ namespace osu.Game.Tests.Visual.Online
                 {
                     Current = 727,
                     Progress = 69,
-                }
+                },
-            },
+                RankHistory = new User.RankHistoryData
-            RankHistory = new User.RankHistoryData
+                {
-            {
+                    Mode = @"osu",
-                Mode = @"osu",
+                    Data = Enumerable.Range(2345, 45).Concat(Enumerable.Range(2109, 40)).ToArray()
-                Data = Enumerable.Range(2345, 45).Concat(Enumerable.Range(2109, 40)).ToArray()
+                },
             },
             Badges = new[]
             {

osu.Game/Overlays/ChatOverlay.cs

@@ -256,6 +256,9 @@ namespace osu.Game.Overlays
                 loadedChannels.Add(loaded);
                 LoadComponentAsync(loaded, l =>
                 {
+                    if (currentChannel.Value != e.NewValue)
+                        return;
+
                     loading.Hide();
 
                     currentChannelContainer.Clear(false);
@@ -381,7 +384,18 @@ namespace osu.Game.Overlays
             foreach (Channel channel in channels)
             {
                 ChannelTabControl.RemoveChannel(channel);
-                loadedChannels.Remove(loadedChannels.Find(c => c.Channel == channel));
+
+                var loaded = loadedChannels.Find(c => c.Channel == channel);
+
+                if (loaded != null)
+                {
+                    loadedChannels.Remove(loaded);
+
+                    // Because the container is only cleared in the async load callback of a new channel, it is forcefully cleared
+                    // to ensure that the previous channel doesn't get updated after it's disposed
+                    currentChannelContainer.Remove(loaded);
+                    loaded.Dispose();
+                }
             }
         }
 

osu.Game/Overlays/Profile/Header/Components/RankGraph.cs

@@ -31,7 +31,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
         private KeyValuePair<int, int>[] ranks;
         private int dayIndex;
-        public Bindable<User> User = new Bindable<User>();
+        public readonly Bindable<UserStatistics> Statistics = new Bindable<UserStatistics>();
 
         public RankGraph()
         {
@@ -56,8 +56,6 @@ namespace osu.Game.Overlays.Profile.Header.Components
             };
 
             graph.OnBallMove += i => dayIndex = i;
-
-            User.ValueChanged += userChanged;
         }
 
         [BackgroundDependencyLoader]
@@ -66,18 +64,25 @@ namespace osu.Game.Overlays.Profile.Header.Components
             graph.LineColour = colours.Yellow;
         }
 
-        private void userChanged(ValueChangedEvent<User> e)
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Statistics.BindValueChanged(statistics => updateStatistics(statistics.NewValue), true);
+        }
+
+        private void updateStatistics(UserStatistics statistics)
         {
             placeholder.FadeIn(fade_duration, Easing.Out);
 
-            if (e.NewValue?.Statistics?.Ranks.Global == null)
+            if (statistics?.Ranks.Global == null)
             {
                 graph.FadeOut(fade_duration, Easing.Out);
                 ranks = null;
                 return;
             }
 
-            int[] userRanks = e.NewValue.RankHistory?.Data ?? new[] { e.NewValue.Statistics.Ranks.Global.Value };
+            int[] userRanks = statistics.RankHistory?.Data ?? new[] { statistics.Ranks.Global.Value };
             ranks = userRanks.Select((x, index) => new KeyValuePair<int, int>(index, x)).Where(x => x.Value != 0).ToArray();
 
             if (ranks.Length > 1)
@@ -191,7 +196,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
             }
         }
 
-        public string TooltipText => User.Value?.Statistics?.Ranks.Global == null ? "" : $"#{ranks[dayIndex].Value:#,##0}|{ranked_days - ranks[dayIndex].Key + 1}";
+        public string TooltipText => Statistics.Value?.Ranks.Global == null ? "" : $"#{ranks[dayIndex].Value:#,##0}|{ranked_days - ranks[dayIndex].Key + 1}";
 
         public ITooltip GetCustomTooltip() => new RankGraphTooltip();
 

osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs

@@ -179,7 +179,7 @@ namespace osu.Game.Overlays.Profile.Header
             detailGlobalRank.Content = user?.Statistics?.Ranks.Global?.ToString("\\##,##0") ?? "-";
             detailCountryRank.Content = user?.Statistics?.Ranks.Country?.ToString("\\##,##0") ?? "-";
 
-            rankGraph.User.Value = user;
+            rankGraph.Statistics.Value = user?.Statistics;
         }
 
         private class ScoreRankInfo : CompositeDrawable

osu.Game/Screens/Play/Player.cs

@@ -255,7 +255,7 @@ namespace osu.Game.Screens.Play
         private void performImmediateExit()
         {
             // if a restart has been requested, cancel any pending completion (user has shown intent to restart).
-            onCompletionEvent = null;
+            completionProgressDelegate?.Cancel();
 
             ValidForResume = false;
 
@@ -275,20 +275,16 @@ namespace osu.Game.Screens.Play
 
             sampleRestart?.Play();
 
-            // if a restart has been requested, cancel any pending completion (user has shown intent to restart).
-            onCompletionEvent = null;
-
-            ValidForResume = false;
             RestartRequested?.Invoke();
-            this.Exit();
+            performImmediateExit();
         }
 
-        private ScheduledDelegate onCompletionEvent;
+        private ScheduledDelegate completionProgressDelegate;
 
         private void onCompletion()
         {
             // Only show the completion screen if the player hasn't failed
-            if (ScoreProcessor.HasFailed || onCompletionEvent != null)
+            if (ScoreProcessor.HasFailed || completionProgressDelegate != null)
                 return;
 
             ValidForResume = false;
@@ -297,7 +293,7 @@ namespace osu.Game.Screens.Play
 
             using (BeginDelayedSequence(1000))
             {
-                onCompletionEvent = Schedule(delegate
+                completionProgressDelegate = Schedule(delegate
                 {
                     if (!this.IsCurrentScreen()) return;
 
@@ -306,8 +302,6 @@ namespace osu.Game.Screens.Play
                         scoreManager.Import(score).Wait();
 
                     this.Push(CreateResults(score));
-
-                    onCompletionEvent = null;
                 });
             }
         }
@@ -471,10 +465,10 @@ namespace osu.Game.Screens.Play
 
         public override bool OnExiting(IScreen next)
         {
-            if (onCompletionEvent != null)
+            if (completionProgressDelegate != null && !completionProgressDelegate.Cancelled && !completionProgressDelegate.Completed)
             {
-                // Proceed to result screen if beatmap already finished playing
+                // proceed to result screen if beatmap already finished playing
-                onCompletionEvent.RunTask();
+                completionProgressDelegate.RunTask();
                 return true;
             }
 

osu.Game/Users/User.cs

@@ -159,7 +159,10 @@ namespace osu.Game.Users
         }
 
         [JsonProperty(@"rankHistory")]
-        public RankHistoryData RankHistory;
+        private RankHistoryData rankHistory
+        {
+            set => Statistics.RankHistory = value;
+        }
 
         [JsonProperty("badges")]
         public Badge[] Badges;

osu.Game/Users/UserStatistics.cs

@@ -4,6 +4,7 @@
 using System;
 using Newtonsoft.Json;
 using osu.Game.Scoring;
+using static osu.Game.Users.User;
 
 namespace osu.Game.Users
 {
@@ -113,5 +114,7 @@ namespace osu.Game.Users
             [JsonProperty(@"country")]
             public int? Country;
         }
+
+        public RankHistoryData RankHistory;
     }
 }