From 83dad93b6d499555d8c015049599dc3df153dff6 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 3 Mar 2020 18:08:51 +0300
Subject: [PATCH] Make Populate() accept list of users

---
 .../TestSceneFriendsOnlineStatusControl.cs    | 23 +++++++++++++++----
 .../Friends/FriendsOnlineStatusControl.cs     | 16 +++++++++++++
 osu.Game/Overlays/OverlayUpdateStreamItem.cs  |  2 +-
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
index bb64593088..87e7d848a8 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
@@ -3,11 +3,13 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Home.Friends;
+using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -41,12 +43,25 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void Populate()
         {
-            AddStep(@"Populate", () => control.Populate(new List<FriendsBundle>
+            AddStep("Populate", () => control.Populate(new List<User>
             {
-                new FriendsBundle(FriendsOnlineStatus.All, 100),
-                new FriendsBundle(FriendsOnlineStatus.Online, 50),
-                new FriendsBundle(FriendsOnlineStatus.Offline, 50),
+                new User
+                {
+                    IsOnline = true
+                },
+                new User
+                {
+                    IsOnline = false
+                },
+                new User
+                {
+                    IsOnline = false
+                }
             }));
+
+            AddAssert("3 users", () => control.Items.FirstOrDefault(item => item.Status == FriendsOnlineStatus.All)?.Amount == 3);
+            AddAssert("1 online user", () => control.Items.FirstOrDefault(item => item.Status == FriendsOnlineStatus.Online)?.Amount == 1);
+            AddAssert("2 offline users", () => control.Items.FirstOrDefault(item => item.Status == FriendsOnlineStatus.Offline)?.Amount == 2);
         }
     }
 }
diff --git a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs
index abcd04bb0e..a92de9dbeb 100644
--- a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs
+++ b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs
@@ -1,10 +1,26 @@
 // 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 System.Collections.Generic;
+using System.Linq;
+using osu.Game.Users;
+
 namespace osu.Game.Overlays.Home.Friends
 {
     public class FriendsOnlineStatusControl : OverlayUpdateStreamControl<FriendsBundle>
     {
         protected override OverlayUpdateStreamItem<FriendsBundle> CreateStreamItem(FriendsBundle value) => new FriendsOnlineStatusItem(value);
+
+        public void Populate(List<User> users)
+        {
+            var userCount = users.Count;
+            var onlineUsersCount = users.Count(user => user.IsOnline);
+
+            AddItem(new FriendsBundle(FriendsOnlineStatus.All, userCount));
+            AddItem(new FriendsBundle(FriendsOnlineStatus.Online, onlineUsersCount));
+            AddItem(new FriendsBundle(FriendsOnlineStatus.Offline, userCount - onlineUsersCount));
+
+            Current.Value = Items.FirstOrDefault();
+        }
     }
 }
diff --git a/osu.Game/Overlays/OverlayUpdateStreamItem.cs b/osu.Game/Overlays/OverlayUpdateStreamItem.cs
index 5014aac5b0..bf8e6ac3b9 100644
--- a/osu.Game/Overlays/OverlayUpdateStreamItem.cs
+++ b/osu.Game/Overlays/OverlayUpdateStreamItem.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Overlays
         private FillFlowContainer<SpriteText> text;
         private ExpandingBar expandingBar;
 
-        public OverlayUpdateStreamItem(T value)
+        protected OverlayUpdateStreamItem(T value)
             : base(value)
         {
         }