Merge branch 'master' into storyboard-clock-di

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img width="256" height="256" src="assets/lazer.png">
+  <img width="500px" src="assets/lazer.png">
 </p>
 
 # osu!
@@ -100,7 +100,7 @@ Before starting, please make sure you are familiar with the [development and tes
 
 Note that while we already have certain standards in place, nothing is set in stone. If you have an issue with the way code is structured; with any libraries we are using; with any processes involved with contributing, *please* bring it up. We welcome all feedback so we can make contributing to this project as pain-free as possible.
 
-For those interested, we love to reward quality contributions via bounties, paid out via paypal or osu! supporter tags. Don't hesitate to [request a bounty](https://docs.google.com/forms/d/e/1FAIpQLSet_8iFAgPMG526pBZ2Kic6HSh7XPM3fE8xPcnWNkMzINDdYg/viewform) for your work on this project.
+For those interested, we love to reward quality contributions via [bounties](https://docs.google.com/spreadsheets/d/1jNXfj_S3Pb5PErA-czDdC9DUu4IgUbe1Lt8E7CYUJuE/view?&rm=minimal#gid=523803337), paid out via paypal or osu! supporter tags. Don't hesitate to [request a bounty](https://docs.google.com/forms/d/e/1FAIpQLSet_8iFAgPMG526pBZ2Kic6HSh7XPM3fE8xPcnWNkMzINDdYg/viewform) for your work on this project.
 
 ## Licence
 

osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs

@@ -1,19 +1,88 @@
 // 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.Linq;
 using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Timing;
 using osu.Game.Screens.Play;
+using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestSceneSkipOverlay : OsuTestScene
+    public class TestSceneSkipOverlay : ManualInputManagerTestScene
     {
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
+        private SkipOverlay skip;
+        private int requestCount;
 
-            Add(new SkipOverlay(Clock.CurrentTime + 5000));
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            requestCount = 0;
+            Child = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Clock = new FramedOffsetClock(Clock)
+                {
+                    Offset = -Clock.CurrentTime,
+                },
+                Children = new Drawable[]
+                {
+                    skip = new SkipOverlay(6000)
+                    {
+                        RequestSeek = _ => requestCount++
+                    }
+                },
+            };
+        });
+
+        [Test]
+        public void TestFadeOnIdle()
+        {
+            AddStep("move mouse", () => InputManager.MoveMouseTo(Vector2.Zero));
+            AddUntilStep("fully visible", () => skip.Children.First().Alpha == 1);
+            AddUntilStep("wait for fade", () => skip.Children.First().Alpha < 1);
+
+            AddStep("move mouse", () => InputManager.MoveMouseTo(skip.ScreenSpaceDrawQuad.Centre));
+            AddUntilStep("fully visible", () => skip.Children.First().Alpha == 1);
+            AddUntilStep("wait for fade", () => skip.Children.First().Alpha < 1);
         }
+
+        [Test]
+        public void TestClickableAfterFade()
+        {
+            AddStep("move mouse", () => InputManager.MoveMouseTo(skip.ScreenSpaceDrawQuad.Centre));
+            AddUntilStep("wait for fade", () => skip.Children.First().Alpha == 0);
+            AddStep("click", () => InputManager.Click(MouseButton.Left));
+            checkRequestCount(1);
+        }
+
+        [Test]
+        public void TestClickOnlyActuatesOnce()
+        {
+            AddStep("move mouse", () => InputManager.MoveMouseTo(skip.ScreenSpaceDrawQuad.Centre));
+            AddStep("click", () => InputManager.Click(MouseButton.Left));
+            AddStep("click", () => InputManager.Click(MouseButton.Left));
+            AddStep("click", () => InputManager.Click(MouseButton.Left));
+            AddStep("click", () => InputManager.Click(MouseButton.Left));
+            checkRequestCount(1);
+        }
+
+        [Test]
+        public void TestDoesntFadeOnMouseDown()
+        {
+            AddStep("move mouse", () => InputManager.MoveMouseTo(skip.ScreenSpaceDrawQuad.Centre));
+            AddStep("button down", () => InputManager.PressButton(MouseButton.Left));
+            AddUntilStep("wait for overlay disapper", () => !skip.IsAlive);
+            AddAssert("ensure button didn't disappear", () => skip.Children.First().Alpha > 0);
+            AddStep("button up", () => InputManager.ReleaseButton(MouseButton.Left));
+            checkRequestCount(0);
+        }
+
+        private void checkRequestCount(int expected) =>
+            AddAssert($"request count is {expected}", () => requestCount == expected);
     }
 }

osu.Game/Screens/Play/SkipOverlay.cs

@@ -161,6 +161,8 @@ namespace osu.Game.Screens.Play
             private Visibility state;
             private ScheduledDelegate scheduledHide;
 
+            public override bool IsPresent => true;
+
             public Visibility State
             {
                 get => state;
@@ -201,14 +203,15 @@ namespace osu.Game.Screens.Play
 
             protected override bool OnMouseDown(MouseDownEvent e)
             {
+                Show();
                 scheduledHide?.Cancel();
-                return base.OnMouseDown(e);
+                return true;
             }
 
             protected override bool OnMouseUp(MouseUpEvent e)
             {
                 Show();
-                return base.OnMouseUp(e);
+                return true;
             }
 
             public override void Hide() => State = Visibility.Hidden;

osu.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,249 +1 @@
-{
-  "images": [
-    {
-      "filename": "Icon-App-20x20@2x.png",
-      "size": "20x20",
-      "scale": "2x",
-      "idiom": "iphone"
-    },
-    {
-      "filename": "Icon-App-20x20@3x.png",
-      "size": "20x20",
-      "scale": "3x",
-      "idiom": "iphone"
-    },
-    {
-      "filename": "Icon-App-29x29@2x.png",
-      "size": "29x29",
-      "scale": "2x",
-      "idiom": "iphone"
-    },
-    {
-      "filename": "Icon-App-29x29@3x.png",
-      "size": "29x29",
-      "scale": "3x",
-      "idiom": "iphone"
-    },
-    {
-      "filename": "Icon-App-40x40@2x.png",
-      "size": "40x40",
-      "scale": "2x",
-      "idiom": "iphone"
-    },
-    {
-      "filename": "Icon-App-40x40@3x.png",
-      "size": "40x40",
-      "scale": "3x",
-      "idiom": "iphone"
-    },
-    {
-      "filename": "Icon-App-60x60@2x.png",
-      "size": "60x60",
-      "scale": "2x",
-      "idiom": "iphone"
-    },
-    {
-      "filename": "Icon-App-60x60@3x.png",
-      "size": "60x60",
-      "scale": "3x",
-      "idiom": "iphone"
-    },
-    {
-      "filename": "Icon-App-20x20@1x.png",
-      "size": "20x20",
-      "scale": "1x",
-      "idiom": "ipad"
-    },
-    {
-      "filename": "Icon-App-20x20@2x.png",
-      "size": "20x20",
-      "scale": "2x",
-      "idiom": "ipad"
-    },
-    {
-      "filename": "Icon-App-29x29@1x.png",
-      "size": "29x29",
-      "scale": "1x",
-      "idiom": "ipad"
-    },
-    {
-      "filename": "Icon-App-29x29@2x.png",
-      "size": "29x29",
-      "scale": "2x",
-      "idiom": "ipad"
-    },
-    {
-      "filename": "Icon-App-40x40@1x.png",
-      "size": "40x40",
-      "scale": "1x",
-      "idiom": "ipad"
-    },
-    {
-      "filename": "Icon-App-40x40@2x.png",
-      "size": "40x40",
-      "scale": "2x",
-      "idiom": "ipad"
-    },
-    {
-      "filename": "Icon-App-83.5x83.5@2x.png",
-      "size": "83.5x83.5",
-      "scale": "2x",
-      "idiom": "ipad"
-    },
-    {
-      "filename": "Icon-App-76x76@1x.png",
-      "size": "76x76",
-      "scale": "1x",
-      "idiom": "ipad"
-    },
-    {
-      "filename": "Icon-App-76x76@2x.png",
-      "size": "76x76",
-      "scale": "2x",
-      "idiom": "ipad"
-    },
-    {
-      "filename": "ItunesArtwork@2x.png",
-      "size": "1024x1024",
-      "scale": "1x",
-      "idiom": "ios-marketing"
-    },
-    {
-      "size": "60x60",
-      "scale": "2x",
-      "idiom": "car"
-    },
-    {
-      "size": "60x60",
-      "scale": "3x",
-      "idiom": "car"
-    },
-    {
-      "role": "notificationCenter",
-      "size": "24x24",
-      "subtype": "38mm",
-      "scale": "2x",
-      "idiom": "watch"
-    },
-    {
-      "role": "notificationCenter",
-      "size": "27.5x27.5",
-      "subtype": "42mm",
-      "scale": "2x",
-      "idiom": "watch"
-    },
-    {
-      "role": "companionSettings",
-      "size": "29x29",
-      "scale": "2x",
-      "idiom": "watch"
-    },
-    {
-      "role": "companionSettings",
-      "size": "29x29",
-      "scale": "3x",
-      "idiom": "watch"
-    },
-    {
-      "role": "appLauncher",
-      "size": "40x40",
-      "subtype": "38mm",
-      "scale": "2x",
-      "idiom": "watch"
-    },
-    {
-      "role": "appLauncher",
-      "size": "44x44",
-      "subtype": "40mm",
-      "scale": "2x",
-      "idiom": "watch"
-    },
-    {
-      "role": "appLauncher",
-      "size": "50x50",
-      "subtype": "44mm",
-      "scale": "2x",
-      "idiom": "watch"
-    },
-    {
-      "role": "quickLook",
-      "size": "86x86",
-      "subtype": "38mm",
-      "scale": "2x",
-      "idiom": "watch"
-    },
-    {
-      "role": "quickLook",
-      "size": "98x98",
-      "subtype": "42mm",
-      "scale": "2x",
-      "idiom": "watch"
-    },
-    {
-      "role": "quickLook",
-      "size": "108x108",
-      "subtype": "44mm",
-      "scale": "2x",
-      "idiom": "watch"
-    },
-    {
-      "size": "1024x1024",
-      "scale": "1x",
-      "idiom": "watch-marketing"
-    },
-    {
-      "size": "16x16",
-      "scale": "1x",
-      "idiom": "mac"
-    },
-    {
-      "size": "16x16",
-      "scale": "2x",
-      "idiom": "mac"
-    },
-    {
-      "size": "32x32",
-      "scale": "1x",
-      "idiom": "mac"
-    },
-    {
-      "size": "32x32",
-      "scale": "2x",
-      "idiom": "mac"
-    },
-    {
-      "size": "128x128",
-      "scale": "1x",
-      "idiom": "mac"
-    },
-    {
-      "size": "128x128",
-      "scale": "2x",
-      "idiom": "mac"
-    },
-    {
-      "size": "256x256",
-      "scale": "1x",
-      "idiom": "mac"
-    },
-    {
-      "size": "256x256",
-      "scale": "2x",
-      "idiom": "mac"
-    },
-    {
-      "size": "512x512",
-      "scale": "1x",
-      "idiom": "mac"
-    },
-    {
-      "size": "512x512",
-      "scale": "2x",
-      "idiom": "mac"
-    }
-  ],
-  "info": {
-    "version": 1,
-    "author": "xcode"
-  }
-}
+{"images":[{"size":"20x20","idiom":"iphone","filename":"iPhoneNotification2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"iPhoneNotification3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"iPhoneSettings2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"iPhoneSettings3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"iPhoneSpotlight2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"iPhoneSpotlight3x.png","scale":"3x"},{"size":"60x60","idiom":"iphone","filename":"iPhoneApp2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"iPhoneApp3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"iPadNotification1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"iPadNotification2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"iPadSettings1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"iPadSettings2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"iPadSpotlight1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"iPadSpotlight2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"iPadApp1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"iPadApp2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"iPadProApp2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"iOSAppStore.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}

osu.iOS/osu.iOS.csproj

@@ -10,25 +10,6 @@
     <AssemblyName>osu.iOS</AssemblyName>
   </PropertyGroup>
   <Import Project="..\osu.iOS.props" />
-  <ItemGroup>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
-    <ImageAsset Include="Assets.xcassets\Contents.json" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-App-20x20%402x.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-App-20x20%403x.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-App-29x29%402x.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-App-29x29%403x.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-App-40x40%402x.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-App-40x40%403x.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-App-60x60%402x.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-App-60x60%403x.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-App-20x20%401x.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-App-29x29%401x.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-App-40x40%401x.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-App-76x76%401x.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-App-76x76%402x.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-App-83.5x83.5%402x.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\ItunesArtwork%402x.png" />
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\" />
   </ItemGroup>
@@ -79,6 +60,28 @@
     <ITunesArtwork Include="iTunesArtwork" />
     <ITunesArtwork Include="iTunesArtwork%402x" />
   </ItemGroup>
+  <ItemGroup>
+    <ImageAsset Include="Assets.xcassets\Contents.json" />
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\iOSAppStore.png" />
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\iPadApp1x.png" />
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\iPadApp2x.png" />
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\iPadNotification1x.png" />
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\iPadNotification2x.png" />
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\iPadProApp2x.png" />
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\iPadSettings1x.png" />
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\iPadSettings2x.png" />
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\iPadSpotlight1x.png" />
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\iPadSpotlight2x.png" />
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\iPhoneApp2x.png" />
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\iPhoneApp3x.png" />
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\iPhoneNotification2x.png" />
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\iPhoneNotification3x.png" />
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\iPhoneSettings2x.png" />
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\iPhoneSettings3x.png" />
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\iPhoneSpotlight2x.png" />
+    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\iPhoneSpotlight3x.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <Import Project="..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
 </Project>