From 2ee634d173647a97fa9e5ef40bfe1e262920162b Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 21 Jan 2021 18:42:53 +0900
Subject: [PATCH] Create subclass for "Error" notifications to allow them to
 have a unique pop-in sound

---
 .../TestSceneNotificationOverlay.cs           | 20 ++++++++++++++++++-
 osu.Game/OsuGame.cs                           |  2 +-
 .../Notifications/SimpleErrorNotification.cs  | 17 ++++++++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Overlays/Notifications/SimpleErrorNotification.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index 43ba23e6c6..d0f6f3fe47 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -105,6 +105,15 @@ namespace osu.Game.Tests.Visual.UserInterface
             checkDisplayedCount(3);
         }
 
+        [Test]
+        public void TestError()
+        {
+            setState(Visibility.Visible);
+            AddStep(@"error #1", sendErrorNotification);
+            AddAssert("Is visible", () => notificationOverlay.State.Value == Visibility.Visible);
+            checkDisplayedCount(1);
+        }
+
         [Test]
         public void TestSpam()
         {
@@ -179,7 +188,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private void sendBarrage()
         {
-            switch (RNG.Next(0, 4))
+            switch (RNG.Next(0, 5))
             {
                 case 0:
                     sendHelloNotification();
@@ -196,6 +205,10 @@ namespace osu.Game.Tests.Visual.UserInterface
                 case 3:
                     sendDownloadProgress();
                     break;
+
+                case 4:
+                    sendErrorNotification();
+                    break;
             }
         }
 
@@ -214,6 +227,11 @@ namespace osu.Game.Tests.Visual.UserInterface
             notificationOverlay.Post(new BackgroundNotification { Text = @"Welcome to osu!. Enjoy your stay!" });
         }
 
+        private void sendErrorNotification()
+        {
+            notificationOverlay.Post(new SimpleErrorNotification { Text = @"Rut roh!. Something went wrong!" });
+        }
+
         private void sendManyNotifications()
         {
             for (int i = 0; i < 10; i++)
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 1a1f7bd233..0dc63dcd4b 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -778,7 +778,7 @@ namespace osu.Game
 
                 if (recentLogCount < short_term_display_limit)
                 {
-                    Schedule(() => notifications.Post(new SimpleNotification
+                    Schedule(() => notifications.Post(new SimpleErrorNotification
                     {
                         Icon = entry.Level == LogLevel.Important ? FontAwesome.Solid.ExclamationCircle : FontAwesome.Solid.Bomb,
                         Text = entry.Message.Truncate(256) + (entry.Exception != null && IsDeployedBuild ? "\n\nThis error has been automatically reported to the devs." : string.Empty),
diff --git a/osu.Game/Overlays/Notifications/SimpleErrorNotification.cs b/osu.Game/Overlays/Notifications/SimpleErrorNotification.cs
new file mode 100644
index 0000000000..13c9c5a02d
--- /dev/null
+++ b/osu.Game/Overlays/Notifications/SimpleErrorNotification.cs
@@ -0,0 +1,17 @@
+// 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.Graphics.Sprites;
+
+namespace osu.Game.Overlays.Notifications
+{
+    public class SimpleErrorNotification : SimpleNotification
+    {
+        protected override string PopInSampleName => "UI/error-notification-pop-in";
+
+        public SimpleErrorNotification()
+        {
+            Icon = FontAwesome.Solid.Bomb;
+        }
+    }
+}