From 1fc240f6c594ad7f1469f4276a0778034c59bb2e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Dec 2017 01:50:05 +0900
Subject: [PATCH] Expose unread notification count

---
 .../Visual/TestCaseNotificationOverlay.cs     |  7 ++++
 osu.Game/Overlays/NotificationOverlay.cs      | 42 ++++++++++++-------
 .../Notifications/NotificationSection.cs      |  4 +-
 3 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/TestCaseNotificationOverlay.cs b/osu.Game.Tests/Visual/TestCaseNotificationOverlay.cs
index b93c2d812f..233914767d 100644
--- a/osu.Game.Tests/Visual/TestCaseNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/TestCaseNotificationOverlay.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.MathUtils;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
@@ -25,6 +26,12 @@ namespace osu.Game.Tests.Visual
                 Origin = Anchor.TopRight
             });
 
+            SpriteText displayedCount = new SpriteText();
+
+            Content.Add(displayedCount);
+
+            manager.UnreadCount.ValueChanged += count => { displayedCount.Text = $"displayed count: {count}"; };
+
             AddStep(@"toggle", manager.ToggleVisibility);
             AddStep(@"simple #1", sendHelloNotification);
             AddStep(@"simple #2", sendAmazingNotification);
diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index a4b5486596..2f1c3285ef 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -11,6 +11,7 @@ using OpenTK.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.Containers;
 using System;
+using osu.Framework.Configuration;
 
 namespace osu.Game.Overlays
 {
@@ -75,34 +76,38 @@ namespace osu.Game.Overlays
             };
         }
 
+        private int totalCount => sections.Select(c => c.DisplayedCount).Sum();
+        private int unreadCount => sections.Select(c => c.UnreadCount).Sum();
+
+        public readonly BindableInt UnreadCount = new BindableInt();
+
         private int runningDepth;
 
         private void notificationClosed()
         {
             // hide ourselves if all notifications have been dismissed.
-            if (sections.Select(c => c.DisplayedCount).Sum() == 0)
+            if (totalCount == 0)
                 State = Visibility.Hidden;
+
+            updateCounts();
         }
 
-        public void Post(Notification notification)
+        public void Post(Notification notification) => Schedule(() =>
         {
-            Schedule(() =>
-            {
-                State = Visibility.Visible;
+            ++runningDepth;
+            notification.Depth = notification.DisplayOnTop ? runningDepth : -runningDepth;
 
-                ++runningDepth;
-                notification.Depth = notification.DisplayOnTop ? runningDepth : -runningDepth;
+            notification.Closed += notificationClosed;
 
-                notification.Closed += notificationClosed;
+            var hasCompletionTarget = notification as IHasCompletionTarget;
+            if (hasCompletionTarget != null)
+                hasCompletionTarget.CompletionTarget = Post;
 
-                var hasCompletionTarget = notification as IHasCompletionTarget;
-                if (hasCompletionTarget != null)
-                    hasCompletionTarget.CompletionTarget = Post;
+            var ourType = notification.GetType();
+            sections.Children.FirstOrDefault(s => s.AcceptTypes.Any(accept => accept.IsAssignableFrom(ourType)))?.Add(notification);
 
-                var ourType = notification.GetType();
-                sections.Children.FirstOrDefault(s => s.AcceptTypes.Any(accept => accept.IsAssignableFrom(ourType)))?.Add(notification);
-            });
-        }
+            updateCounts();
+        });
 
         protected override void PopIn()
         {
@@ -122,9 +127,16 @@ namespace osu.Game.Overlays
             this.FadeTo(0, TRANSITION_LENGTH, Easing.OutQuint);
         }
 
+        private void updateCounts()
+        {
+            UnreadCount.Value = unreadCount;
+        }
+
         private void markAllRead()
         {
             sections.Children.ForEach(s => s.MarkAllRead());
+
+            updateCounts();
         }
 
         protected override void UpdateAfterChildren()
diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index 09768ba0ea..2bd0321d12 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Overlays.Notifications
 
         public int DisplayedCount => notifications.Count(n => !n.WasClosed);
 
+        public int UnreadCount => notifications.Count(n => !n.WasClosed && !n.Read);
+
         public void Add(Notification notification) => notifications.Add(notification);
 
         public IEnumerable<Type> AcceptTypes;
@@ -157,4 +159,4 @@ namespace osu.Game.Overlays.Notifications
             notifications?.Children.ForEach(n => n.Read = true);
         }
     }
-}
\ No newline at end of file
+}