Merge pull request #4114 from peppy/fix-replay-multiplier-text

Fix replay playback speed not being displayed initially

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "osu-resources"]
-	path = osu-resources
-	url = https://github.com/ppy/osu-resources

README.md

@@ -31,18 +31,14 @@ If your platform is not listed above, there is still a chance you can manually b
 Clone the repository **including submodules**:
 
 ```shell
-git clone --recurse-submodules https://github.com/ppy/osu
+git clone https://github.com/ppy/osu
 cd osu
 ```
 
-> If you forgot the `--recurse-submodules` option, run this command inside the `osu` directory:
->
-> `git submodule update --init --recursive`
-
 To update the source code to the latest commit, run the following command inside the `osu` directory:
 
 ```shell
-git pull --recurse-submodules
+git pull
 ```
 
 ## Building
@@ -73,6 +69,10 @@ For example, you can run osu! with the following command:
 LD_LIBRARY_PATH="$(pwd)/osu.Desktop/bin/Debug/netcoreapp2.2" dotnet run --project osu.Desktop
 ```
 
+## Testing with resource/framework modifications
+
+Sometimes it may be necessary to cross-test changes in [osu-resources](https://github.com/ppy/osu-resources) or [osu-framework](https://github.com/ppy/osu-framework). This can be achieved by running some commands as documented on the [osu-resources](https://github.com/ppy/osu-resources/wiki/Testing-local-resources-checkout-with-other-projects) and [osu-framework](https://github.com/ppy/osu-framework/wiki/Testing-local-framework-checkout-with-other-projects) wiki pages.
+
 ## Code analysis
 
 Code analysis can be run with `powershell ./build.ps1` or `build.sh`. This is currently only supported under windows due to [resharper cli shortcomings](https://youtrack.jetbrains.com/issue/RSRP-410004). Alternative, you can install resharper or use rider to get inline support in your IDE of choice.

osu.Desktop/OsuGameDesktop.cs

@@ -16,7 +16,6 @@ using osu.Desktop.Updater;
 using osu.Framework;
 using osu.Framework.Platform.Windows;
 using osu.Framework.Screens;
-using osu.Game.Screens;
 using osu.Game.Screens.Menu;
 
 namespace osu.Desktop
@@ -63,9 +62,10 @@ namespace osu.Desktop
             }
         }
 
-        protected override void ScreenChanged(OsuScreen current, Screen newScreen)
+        protected override void ScreenChanged(IScreen lastScreen, IScreen newScreen)
         {
-            base.ScreenChanged(current, newScreen);
+            base.ScreenChanged(lastScreen, newScreen);
+
             switch (newScreen)
             {
                 case Intro _:

osu.Desktop/osu.Desktop.csproj

@@ -22,7 +22,6 @@
     <ProjectReference Include="..\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj" />
     <ProjectReference Include="..\osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj" />
     <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
-    <ProjectReference Include="..\osu-resources\osu.Game.Resources\osu.Game.Resources.csproj" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup Label="Package References">

osu.Game.Rulesets.Catch.Tests.iOS/AppDelegate.cs

@@ -0,0 +1,15 @@
+// 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 Foundation;
+using osu.Framework.iOS;
+using osu.Game.Tests;
+
+namespace osu.Game.Rulesets.Catch.Tests.iOS
+{
+    [Register("AppDelegate")]
+    public class AppDelegate : GameAppDelegate
+    {
+        protected override Framework.Game CreateGame() => new OsuTestBrowser();
+    }
+}

osu.Game.Rulesets.Catch.Tests.iOS/Application.cs

@@ -0,0 +1,15 @@
+// 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 UIKit;
+
+namespace osu.Game.Rulesets.Catch.Tests.iOS
+{
+    public class Application
+    {
+        public static void Main(string[] args)
+        {
+            UIApplication.Main(args, null, "AppDelegate");
+        }
+    }
+}

osu.Game.Rulesets.Catch.Tests.iOS/Entitlements.plist

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+</dict>
+</plist>

osu.Game.Rulesets.Catch.Tests.iOS/Info.plist

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleName</key>
+	<string>osu.Game.Rulesets.Catch.Tests.iOS</string>
+	<key>CFBundleIdentifier</key>
+	<string>ppy.osu-Game-Rulesets-Catch-Tests-iOS</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>MinimumOSVersion</key>
+	<string>10.0</string>
+	<key>UIDeviceFamily</key>
+	<array>
+		<integer>1</integer>
+		<integer>2</integer>
+	</array>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>XSAppIconAssets</key>
+	<string>Assets.xcassets/AppIcon.appiconset</string>
+</dict>
+</plist>

osu.Game.Rulesets.Catch.Tests.iOS/osu.Game.Rulesets.Catch.Tests.iOS.csproj

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
+    <ProjectGuid>{4004C7B7-1A62-43F1-9DF2-52450FA67E70}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>osu.Game.Rulesets.Catch.Tests</RootNamespace>
+    <AssemblyName>osu.Game.Rulesets.Catch.Tests.iOS</AssemblyName>
+  </PropertyGroup>
+  <Import Project="..\osu.iOS.props" />
+  <ItemGroup>
+    <None Include="Info.plist" />
+    <None Include="Entitlements.plist" />
+    <None Include="..\osu.iOS\libbass.a">
+      <Link>libbass.a</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="..\osu.iOS\libbass_fx.a">
+      <Link>libbass_fx.a</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <LinkDescription Include="..\osu.iOS\Linker.xml">
+      <Link>Linker.xml</Link>
+    </LinkDescription>
+    <Compile Include="Application.cs" />
+    <Compile Include="AppDelegate.cs" />
+    <Compile Include="..\osu.Game.Rulesets.Catch.Tests\**\*.cs" Exclude="**\obj\**">
+      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\osu.Game\osu.Game.csproj">
+      <Project>{2A66DD92-ADB1-4994-89E2-C94E04ACDA0D}</Project>
+      <Name>osu.Game</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj">
+      <Project>{58F6C80C-1253-4A0E-A465-B8C85EBEADF3}</Project>
+      <Name>osu.Game.Rulesets.Catch</Name>
+    </ProjectReference>
+  </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>

osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs

@@ -21,6 +21,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         [TestCase("basic")]
         [TestCase("spinner")]
         [TestCase("spinner-and-circles")]
+        [TestCase("slider")]
         public new void Test(string name)
         {
             base.Test(name);

osu.Game.Rulesets.Catch/Objects/JuiceStream.cs

@@ -55,6 +55,13 @@ namespace osu.Game.Rulesets.Catch.Objects
 
             var minDistanceFromEnd = Velocity * 0.01;
 
+            var tickSamples = Samples.Select(s => new SampleInfo
+            {
+                Bank = s.Bank,
+                Name = @"slidertick",
+                Volume = s.Volume
+            }).ToList();
+
             AddNested(new Fruit
             {
                 Samples = Samples,
@@ -62,15 +69,22 @@ namespace osu.Game.Rulesets.Catch.Objects
                 X = X
             });
 
-            double lastDropletTime = StartTime;
+            double lastTickTime = StartTime;
 
             for (int span = 0; span < this.SpanCount(); span++)
             {
                 var spanStartTime = StartTime + span * spanDuration;
                 var reversed = span % 2 == 1;
 
-                for (double d = 0; d <= length; d += tickDistance)
+                for (double d = tickDistance;; d += tickDistance)
                 {
+                    bool isLastTick = false;
+                    if (d + minDistanceFromEnd >= length)
+                    {
+                        d = length;
+                        isLastTick = true;
+                    }
+
                     var timeProgress = d / length;
                     var distanceProgress = reversed ? 1 - timeProgress : timeProgress;
 
@@ -79,47 +93,42 @@ namespace osu.Game.Rulesets.Catch.Objects
                     if (LegacyLastTickOffset != null)
                     {
                         // If we're the last tick, apply the legacy offset
-                        if (span == this.SpanCount() - 1 && d + tickDistance > length)
+                        if (span == this.SpanCount() - 1 && isLastTick)
                             time = Math.Max(StartTime + Duration / 2, time - LegacyLastTickOffset.Value);
                     }
 
-                    double tinyTickInterval = time - lastDropletTime;
-                    while (tinyTickInterval > 100)
-                        tinyTickInterval /= 2;
-
-                    for (double t = lastDropletTime + tinyTickInterval; t < time; t += tinyTickInterval)
+                    int tinyTickCount = 1;
+                    double tinyTickInterval = time - lastTickTime;
+                    while (tinyTickInterval > 100 && tinyTickCount < 10000)
                     {
+                        tinyTickInterval /= 2;
+                        tinyTickCount *= 2;
+                    }
+
+                    for (int tinyTickIndex = 0; tinyTickIndex < tinyTickCount - 1; tinyTickIndex++)
+                    {
+                        var t = lastTickTime + (tinyTickIndex + 1) * tinyTickInterval;
                         double progress = reversed ? 1 - (t - spanStartTime) / spanDuration : (t - spanStartTime) / spanDuration;
 
                         AddNested(new TinyDroplet
                         {
                             StartTime = t,
                             X = X + Path.PositionAt(progress).X / CatchPlayfield.BASE_WIDTH,
-                            Samples = new List<SampleInfo>(Samples.Select(s => new SampleInfo
-                            {
-                                Bank = s.Bank,
-                                Name = @"slidertick",
-                                Volume = s.Volume
-                            }))
+                            Samples = tickSamples
                         });
                     }
 
-                    if (d > minDistanceFromEnd && Math.Abs(d - length) > minDistanceFromEnd)
+                    lastTickTime = time;
+
+                    if (isLastTick)
+                        break;
+
+                    AddNested(new Droplet
                     {
-                        AddNested(new Droplet
-                        {
-                            StartTime = time,
-                            X = X + Path.PositionAt(distanceProgress).X / CatchPlayfield.BASE_WIDTH,
-                            Samples = new List<SampleInfo>(Samples.Select(s => new SampleInfo
-                            {
-                                Bank = s.Bank,
-                                Name = @"slidertick",
-                                Volume = s.Volume
-                            }))
-                        });
-                    }
-
-                    lastDropletTime = time;
+                        StartTime = time,
+                        X = X + Path.PositionAt(distanceProgress).X / CatchPlayfield.BASE_WIDTH,
+                        Samples = tickSamples
+                    });
                 }
 
                 AddNested(new Fruit

osu.Game.Rulesets.Catch/Properties/AssemblyInfo.cs

@@ -9,3 +9,4 @@ using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("osu.Game.Rulesets.Catch.Tests")]
 [assembly: InternalsVisibleTo("osu.Game.Rulesets.Catch.Tests.Dynamic")]
+[assembly: InternalsVisibleTo("osu.Game.Rulesets.Catch.Tests.iOS")]

osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/slider-expected-conversion.json

@@ -0,0 +1 @@
+{"Mappings":[{"StartTime":19184.0,"Objects":[{"StartTime":19184.0,"Position":320.0},{"StartTime":19263.0,"Position":311.730255},{"StartTime":19343.0,"Position":324.6205},{"StartTime":19423.0,"Position":343.0907},{"StartTime":19503.0,"Position":372.2917},{"StartTime":19582.0,"Position":385.194733},{"StartTime":19662.0,"Position":379.0426},{"StartTime":19742.0,"Position":385.1066},{"StartTime":19822.0,"Position":391.624664},{"StartTime":19919.0,"Position":386.27832},{"StartTime":20016.0,"Position":380.117035},{"StartTime":20113.0,"Position":381.664154},{"StartTime":20247.0,"Position":370.872864}]}]}

osu.Game.Rulesets.Catch/Resources/Testing/Beatmaps/slider.osu

@@ -0,0 +1,18 @@
+osu file format v14
+
+[General]
+Mode: 2
+
+[Difficulty]
+HPDrainRate:3
+CircleSize:2
+OverallDifficulty:4
+ApproachRate:4
+SliderMultiplier:0.9
+SliderTickRate:1
+
+[TimingPoints]
+35.4473684210527,638.298947368422,4,2,1,60,1,0
+
+[HitObjects]
+320,176,19184,2,8,P|384:168|368:232,1,150

osu.Game.Rulesets.Mania.Tests.iOS/AppDelegate.cs

@@ -0,0 +1,15 @@
+// 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 Foundation;
+using osu.Framework.iOS;
+using osu.Game.Tests;
+
+namespace osu.Game.Rulesets.Mania.Tests.iOS
+{
+    [Register("AppDelegate")]
+    public class AppDelegate : GameAppDelegate
+    {
+        protected override Framework.Game CreateGame() => new OsuTestBrowser();
+    }
+}

osu.Game.Rulesets.Mania.Tests.iOS/Application.cs

@@ -0,0 +1,15 @@
+// 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 UIKit;
+
+namespace osu.Game.Rulesets.Mania.Tests.iOS
+{
+    public class Application
+    {
+        public static void Main(string[] args)
+        {
+            UIApplication.Main(args, null, "AppDelegate");
+        }
+    }
+}

osu.Game.Rulesets.Mania.Tests.iOS/Entitlements.plist

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+</dict>
+</plist>

osu.Game.Rulesets.Mania.Tests.iOS/Info.plist

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleName</key>
+	<string>osu.Game.Rulesets.Mania.Tests.iOS</string>
+	<key>CFBundleIdentifier</key>
+	<string>ppy.osu-Game-Rulesets-Mania-Tests-iOS</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>MinimumOSVersion</key>
+	<string>10.0</string>
+	<key>UIDeviceFamily</key>
+	<array>
+		<integer>1</integer>
+		<integer>2</integer>
+	</array>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>XSAppIconAssets</key>
+	<string>Assets.xcassets/AppIcon.appiconset</string>
+</dict>
+</plist>

osu.Game.Rulesets.Mania.Tests.iOS/osu.Game.Rulesets.Mania.Tests.iOS.csproj

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
+    <ProjectGuid>{39FD990E-B6CE-4B2A-999F-BC008CF2C64C}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>osu.Game.Rulesets.Mania.Tests</RootNamespace>
+    <AssemblyName>osu.Game.Rulesets.Mania.Tests.iOS</AssemblyName>
+  </PropertyGroup>
+  <Import Project="..\osu.iOS.props" />
+  <ItemGroup>
+    <None Include="Info.plist" />
+    <None Include="Entitlements.plist" />
+    <None Include="..\osu.iOS\libbass.a">
+      <Link>libbass.a</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="..\osu.iOS\libbass_fx.a">
+      <Link>libbass_fx.a</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <LinkDescription Include="..\osu.iOS\Linker.xml">
+      <Link>Linker.xml</Link>
+    </LinkDescription>
+    <Compile Include="Application.cs" />
+    <Compile Include="AppDelegate.cs" />
+    <Compile Include="..\osu.Game.Rulesets.Mania.Tests\**\*.cs" Exclude="**\obj\**">
+      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\osu.Game\osu.Game.csproj">
+      <Project>{2A66DD92-ADB1-4994-89E2-C94E04ACDA0D}</Project>
+      <Name>osu.Game</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj">
+      <Project>{48F4582B-7687-4621-9CBE-5C24197CB536}</Project>
+      <Name>osu.Game.Rulesets.Mania</Name>
+    </ProjectReference>
+  </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>

osu.Game.Rulesets.Mania/Properties/AssemblyInfo.cs

@@ -9,3 +9,4 @@ using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("osu.Game.Rulesets.Mania.Tests")]
 [assembly: InternalsVisibleTo("osu.Game.Rulesets.Mania.Tests.Dynamic")]
+[assembly: InternalsVisibleTo("osu.Game.Rulesets.Mania.Tests.iOS")]

osu.Game.Rulesets.Osu.Tests.iOS/AppDelegate.cs

@@ -0,0 +1,15 @@
+// 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 Foundation;
+using osu.Framework.iOS;
+using osu.Game.Tests;
+
+namespace osu.Game.Rulesets.Osu.Tests.iOS
+{
+    [Register("AppDelegate")]
+    public class AppDelegate : GameAppDelegate
+    {
+        protected override Framework.Game CreateGame() => new OsuTestBrowser();
+    }
+}

osu.Game.Rulesets.Osu.Tests.iOS/Application.cs

@@ -0,0 +1,15 @@
+// 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 UIKit;
+
+namespace osu.Game.Rulesets.Osu.Tests.iOS
+{
+    public class Application
+    {
+        public static void Main(string[] args)
+        {
+            UIApplication.Main(args, null, "AppDelegate");
+        }
+    }
+}

osu.Game.Rulesets.Osu.Tests.iOS/Entitlements.plist

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+</dict>
+</plist>

osu.Game.Rulesets.Osu.Tests.iOS/Info.plist

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleName</key>
+	<string>osu.Game.Rulesets.Osu.Tests.iOS</string>
+	<key>CFBundleIdentifier</key>
+	<string>ppy.osu-Game-Rulesets-Osu-Tests-iOS</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>MinimumOSVersion</key>
+	<string>10.0</string>
+	<key>UIDeviceFamily</key>
+	<array>
+		<integer>1</integer>
+		<integer>2</integer>
+	</array>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>XSAppIconAssets</key>
+	<string>Assets.xcassets/AppIcon.appiconset</string>
+</dict>
+</plist>

osu.Game.Rulesets.Osu.Tests.iOS/osu.Game.Rulesets.Osu.Tests.iOS.csproj

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
+    <ProjectGuid>{6653CA6F-DB06-4604-A3FD-762E25C2AF96}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>osu.Game.Rulesets.Osu.Tests</RootNamespace>
+    <AssemblyName>osu.Game.Rulesets.Osu.Tests.iOS</AssemblyName>
+  </PropertyGroup>
+  <Import Project="..\osu.iOS.props" />
+  <ItemGroup>
+    <None Include="Info.plist" />
+    <None Include="Entitlements.plist" />
+    <None Include="..\osu.iOS\libbass.a">
+      <Link>libbass.a</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="..\osu.iOS\libbass_fx.a">
+      <Link>libbass_fx.a</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <LinkDescription Include="..\osu.iOS\Linker.xml">
+      <Link>Linker.xml</Link>
+    </LinkDescription>
+    <Compile Include="Application.cs" />
+    <Compile Include="AppDelegate.cs" />
+    <Compile Include="..\osu.Game.Rulesets.Osu.Tests\**\*.cs" Exclude="**\obj\**">
+      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\osu.Game\osu.Game.csproj">
+      <Project>{2A66DD92-ADB1-4994-89E2-C94E04ACDA0D}</Project>
+      <Name>osu.Game</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj">
+      <Project>{C92A607B-1FDD-4954-9F92-03FF547D9080}</Project>
+      <Name>osu.Game.Rulesets.Osu</Name>
+    </ProjectReference>
+  </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>

osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs

@@ -88,7 +88,12 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
         private double computeAimValue()
         {
-            double aimValue = Math.Pow(5.0f * Math.Max(1.0f, Attributes.AimStrain / 0.0675f) - 4.0f, 3.0f) / 100000.0f;
+            double rawAim = Attributes.AimStrain;
+
+            if (mods.Any(m => m is OsuModTouchDevice))
+                rawAim = Math.Pow(rawAim, 0.8);
+
+            double aimValue = Math.Pow(5.0f * Math.Max(1.0f, rawAim / 0.0675f) - 4.0f, 3.0f) / 100000.0f;
 
             // Longer maps are worth more
             double lengthBonus = 0.95f + 0.4f * Math.Min(1.0f, totalHits / 2000.0f) +

osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyBeatmap.cs

@@ -38,7 +38,13 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
             // The first jump is formed by the first two hitobjects of the map.
             // If the map has less than two OsuHitObjects, the enumerator will not return anything.
             for (int i = 1; i < objects.Count; i++)
-                yield return new OsuDifficultyHitObject(objects[i], objects[i - 1], timeRate);
+            {
+                var lastLast = i > 1 ? objects[i - 2] : null;
+                var last = objects[i - 1];
+                var current = objects[i];
+
+                yield return new OsuDifficultyHitObject(lastLast, last, current, timeRate);
+            }
         }
     }
 }

osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs

@@ -40,14 +40,22 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
         /// </summary>
         public double StrainTime { get; private set; }
 
+        /// <summary>
+        /// Angle the player has to take to hit this <see cref="OsuDifficultyHitObject"/>.
+        /// Calculated as the angle between the circles (current-2, current-1, current).
+        /// </summary>
+        public double? Angle { get; private set; }
+
+        private readonly OsuHitObject lastLastObject;
         private readonly OsuHitObject lastObject;
         private readonly double timeRate;
 
         /// <summary>
         /// Initializes the object calculating extra data required for difficulty calculation.
         /// </summary>
-        public OsuDifficultyHitObject(OsuHitObject currentObject, OsuHitObject lastObject, double timeRate)
+        public OsuDifficultyHitObject(OsuHitObject lastLastObject, OsuHitObject lastObject, OsuHitObject currentObject, double timeRate)
         {
+            this.lastLastObject = lastLastObject;
             this.lastObject = lastObject;
             this.timeRate = timeRate;
 
@@ -68,20 +76,30 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
                 scalingFactor *= 1 + smallCircleBonus;
             }
 
-            Vector2 lastCursorPosition = lastObject.StackedPosition;
-
-            var lastSlider = lastObject as Slider;
-            if (lastSlider != null)
+            if (lastObject is Slider lastSlider)
             {
                 computeSliderCursorPosition(lastSlider);
-                lastCursorPosition = lastSlider.LazyEndPosition ?? lastCursorPosition;
-
                 TravelDistance = lastSlider.LazyTravelDistance * scalingFactor;
             }
 
+            Vector2 lastCursorPosition = getEndCursorPosition(lastObject);
+
             // Don't need to jump to reach spinners
             if (!(BaseObject is Spinner))
                 JumpDistance = (BaseObject.StackedPosition * scalingFactor - lastCursorPosition * scalingFactor).Length;
+
+            if (lastLastObject != null)
+            {
+                Vector2 lastLastCursorPosition = getEndCursorPosition(lastLastObject);
+
+                Vector2 v1 = lastLastCursorPosition - lastObject.StackedPosition;
+                Vector2 v2 = BaseObject.StackedPosition - lastCursorPosition;
+
+                float dot = Vector2.Dot(v1, v2);
+                float det = v1.X * v2.Y - v1.Y * v2.X;
+
+                Angle = Math.Abs(Math.Atan2(det, dot));
+            }
         }
 
         private void setTimingValues()
@@ -127,5 +145,19 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
                 computeVertex(time);
             computeVertex(slider.EndTime);
         }
+
+        private Vector2 getEndCursorPosition(OsuHitObject hitObject)
+        {
+            Vector2 pos = hitObject.StackedPosition;
+
+            var slider = hitObject as Slider;
+            if (slider != null)
+            {
+                computeSliderCursorPosition(slider);
+                pos = slider.LazyEndPosition ?? pos;
+            }
+
+            return pos;
+        }
     }
 }

osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs

@@ -11,10 +11,39 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
     /// </summary>
     public class Aim : Skill
     {
+        private const double angle_bonus_begin = Math.PI / 3;
+        private const double timing_threshold = 107;
+
         protected override double SkillMultiplier => 26.25;
         protected override double StrainDecayBase => 0.15;
 
         protected override double StrainValueOf(OsuDifficultyHitObject current)
-            => (Math.Pow(current.TravelDistance, 0.99) + Math.Pow(current.JumpDistance, 0.99)) / current.StrainTime;
+        {
+            double result = 0;
+
+            const double scale = 90;
+
+            double applyDiminishingExp(double val) => Math.Pow(val, 0.99);
+
+            if (Previous.Count > 0)
+            {
+                if (current.Angle != null && current.Angle.Value > angle_bonus_begin)
+                {
+                    var angleBonus = Math.Sqrt(
+                        Math.Max(Previous[0].JumpDistance - scale, 0)
+                        * Math.Pow(Math.Sin(current.Angle.Value - angle_bonus_begin), 2)
+                        * Math.Max(current.JumpDistance - scale, 0));
+                    result = 1.5 * applyDiminishingExp(Math.Max(0, angleBonus)) / Math.Max(timing_threshold, Previous[0].StrainTime);
+                }
+            }
+
+            double jumpDistanceExp = applyDiminishingExp(current.JumpDistance);
+            double travelDistanceExp = applyDiminishingExp(current.TravelDistance);
+
+            return Math.Max(
+                result + (jumpDistanceExp + travelDistanceExp + Math.Sqrt(travelDistanceExp * jumpDistanceExp)) / Math.Max(current.StrainTime, timing_threshold),
+                (Math.Sqrt(travelDistanceExp * jumpDistanceExp) + jumpDistanceExp + travelDistanceExp) / current.StrainTime
+            );
+        }
     }
 }

osu.Game.Rulesets.Osu/Difficulty/Skills/Skill.cs

@@ -15,6 +15,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
     /// </summary>
     public abstract class Skill
     {
+        protected const double SINGLE_SPACING_THRESHOLD = 125;
+        protected const double STREAM_SPACING_THRESHOLD = 110;
+
         /// <summary>
         /// Strain values are multiplied by this number for the given skill. Used to balance the value of different skills between each other.
         /// </summary>

osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs

@@ -1,6 +1,7 @@
 // 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;
 using osu.Game.Rulesets.Osu.Difficulty.Preprocessing;
 
 namespace osu.Game.Rulesets.Osu.Difficulty.Skills
@@ -10,30 +11,41 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
     /// </summary>
     public class Speed : Skill
     {
+        private const double angle_bonus_begin = 5 * Math.PI / 6;
+        private const double pi_over_4 = Math.PI / 4;
+        private const double pi_over_2 = Math.PI / 2;
+
         protected override double SkillMultiplier => 1400;
         protected override double StrainDecayBase => 0.3;
 
-        private const double single_spacing_threshold = 125;
-        private const double stream_spacing_threshold = 110;
-        private const double almost_diameter = 90;
+        private const double min_speed_bonus = 75; // ~200BPM
+        private const double max_speed_bonus = 45; // ~330BPM
+        private const double speed_balancing_factor = 40;
 
         protected override double StrainValueOf(OsuDifficultyHitObject current)
         {
-            double distance = current.TravelDistance + current.JumpDistance;
+            double distance = Math.Min(SINGLE_SPACING_THRESHOLD, current.TravelDistance + current.JumpDistance);
+            double deltaTime = Math.Max(max_speed_bonus, current.DeltaTime);
 
-            double speedValue;
-            if (distance > single_spacing_threshold)
-                speedValue = 2.5;
-            else if (distance > stream_spacing_threshold)
-                speedValue = 1.6 + 0.9 * (distance - stream_spacing_threshold) / (single_spacing_threshold - stream_spacing_threshold);
-            else if (distance > almost_diameter)
-                speedValue = 1.2 + 0.4 * (distance - almost_diameter) / (stream_spacing_threshold - almost_diameter);
-            else if (distance > almost_diameter / 2)
-                speedValue = 0.95 + 0.25 * (distance - almost_diameter / 2) / (almost_diameter / 2);
-            else
-                speedValue = 0.95;
+            double speedBonus = 1.0;
+            if (deltaTime < min_speed_bonus)
+                speedBonus = 1 + Math.Pow((min_speed_bonus - deltaTime) / speed_balancing_factor, 2);
 
-            return speedValue / current.StrainTime;
+            double angleBonus = 1.0;
+            if (current.Angle != null && current.Angle.Value < angle_bonus_begin)
+            {
+                angleBonus = 1 + Math.Pow(Math.Sin(1.5 * (angle_bonus_begin - current.Angle.Value)), 2) / 3.57;
+                if (current.Angle.Value < pi_over_2)
+                {
+                    angleBonus = 1.28;
+                    if (distance < 90 && current.Angle.Value < pi_over_4)
+                        angleBonus += (1 - angleBonus) * Math.Min((90 - distance) / 10, 1);
+                    else if (distance < 90)
+                        angleBonus += (1 - angleBonus) * Math.Min((90 - distance) / 10, 1) * Math.Sin((pi_over_2 - current.Angle.Value) / pi_over_4);
+                }
+            }
+
+            return (1 + (speedBonus - 1) * 0.75) * angleBonus * (0.95 + speedBonus * Math.Pow(distance / SINGLE_SPACING_THRESHOLD, 3.5)) / current.StrainTime;
         }
     }
 }

osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs

@@ -5,6 +5,7 @@ using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
 using osu.Game.Rulesets.Osu.Objects;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
 {
@@ -22,8 +23,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
         {
             base.LoadComplete();
 
-            // Fixes a 1-frame position discrpancy due to the first mouse move event happening in the next frame
-            HitObject.Position = GetContainingInputManager().CurrentState.Mouse.Position;
+            // Fixes a 1-frame position discrepancy due to the first mouse move event happening in the next frame
+            HitObject.Position = Parent?.ToLocalSpace(GetContainingInputManager().CurrentState.Mouse.Position) ?? Vector2.Zero;
         }
 
         protected override bool OnClick(ClickEvent e)

osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs

@@ -47,6 +47,14 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             setState(PlacementState.Initial);
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            // Fixes a 1-frame position discrepancy due to the first mouse move event happening in the next frame
+            HitObject.Position = Parent?.ToLocalSpace(GetContainingInputManager().CurrentState.Mouse.Position) ?? Vector2.Zero;
+        }
+
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
             switch (state)

osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs

@@ -0,0 +1,16 @@
+// 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.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModTouchDevice : Mod
+    {
+        public override string Name => "Touch Device";
+        public override string Acronym => "TD";
+        public override double ScoreMultiplier => 1;
+
+        public override bool Ranked => true;
+    }
+}

osu.Game.Rulesets.Osu/OsuRuleset.cs

@@ -82,6 +82,9 @@ namespace osu.Game.Rulesets.Osu
 
             if (mods.HasFlag(LegacyMods.Target))
                 yield return new OsuModTarget();
+
+            if (mods.HasFlag(LegacyMods.TouchDevice))
+                yield return new OsuModTouchDevice();
         }
 
         public override IEnumerable<Mod> GetModsFor(ModType type)

osu.Game.Rulesets.Osu/Properties/AssemblyInfo.cs

@@ -9,3 +9,4 @@ using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("osu.Game.Rulesets.Osu.Tests")]
 [assembly: InternalsVisibleTo("osu.Game.Rulesets.Osu.Tests.Dynamic")]
+[assembly: InternalsVisibleTo("osu.Game.Rulesets.Osu.Tests.iOS")]

osu.Game.Rulesets.Taiko.Tests.iOS/AppDelegate.cs

@@ -0,0 +1,15 @@
+// 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 Foundation;
+using osu.Framework.iOS;
+using osu.Game.Tests;
+
+namespace osu.Game.Rulesets.Taiko.Tests.iOS
+{
+    [Register("AppDelegate")]
+    public class AppDelegate : GameAppDelegate
+    {
+        protected override Framework.Game CreateGame() => new OsuTestBrowser();
+    }
+}

osu.Game.Rulesets.Taiko.Tests.iOS/Application.cs

@@ -0,0 +1,15 @@
+// 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 UIKit;
+
+namespace osu.Game.Rulesets.Taiko.Tests.iOS
+{
+    public class Application
+    {
+        public static void Main(string[] args)
+        {
+            UIApplication.Main(args, null, "AppDelegate");
+        }
+    }
+}

osu.Game.Rulesets.Taiko.Tests.iOS/Entitlements.plist

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+</dict>
+</plist>

osu.Game.Rulesets.Taiko.Tests.iOS/Info.plist

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleName</key>
+	<string>osu.Game.Rulesets.Taiko.Tests.iOS</string>
+	<key>CFBundleIdentifier</key>
+	<string>ppy.osu-Game-Rulesets-Taiko-Tests-iOS</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>MinimumOSVersion</key>
+	<string>10.0</string>
+	<key>UIDeviceFamily</key>
+	<array>
+		<integer>1</integer>
+		<integer>2</integer>
+	</array>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>XSAppIconAssets</key>
+	<string>Assets.xcassets/AppIcon.appiconset</string>
+</dict>
+</plist>

osu.Game.Rulesets.Taiko.Tests.iOS/osu.Game.Rulesets.Taiko.Tests.iOS.csproj

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
+    <ProjectGuid>{7E408809-66AC-49D1-AF4D-98834F9B979A}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>osu.Game.Rulesets.Taiko.Tests</RootNamespace>
+    <AssemblyName>osu.Game.Rulesets.Taiko.Tests.iOS</AssemblyName>
+  </PropertyGroup>
+  <Import Project="..\osu.iOS.props" />
+  <ItemGroup>
+    <None Include="Info.plist" />
+    <None Include="Entitlements.plist" />
+    <None Include="..\osu.iOS\libbass.a">
+      <Link>libbass.a</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="..\osu.iOS\libbass_fx.a">
+      <Link>libbass_fx.a</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <LinkDescription Include="..\osu.iOS\Linker.xml">
+      <Link>Linker.xml</Link>
+    </LinkDescription>
+    <Compile Include="Application.cs" />
+    <Compile Include="AppDelegate.cs" />
+    <Compile Include="..\osu.Game.Rulesets.Taiko.Tests\**\*.cs" Exclude="**\obj\**">
+      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\osu.Game\osu.Game.csproj">
+      <Project>{2A66DD92-ADB1-4994-89E2-C94E04ACDA0D}</Project>
+      <Name>osu.Game</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj">
+      <Project>{F167E17A-7DE6-4AF5-B920-A5112296C695}</Project>
+      <Name>osu.Game.Rulesets.Taiko</Name>
+    </ProjectReference>
+  </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>

osu.Game.Rulesets.Taiko/Properties/AssemblyInfo.cs

@@ -9,3 +9,4 @@ using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("osu.Game.Rulesets.Taiko.Tests")]
 [assembly: InternalsVisibleTo("osu.Game.Rulesets.Taiko.Tests.Dynamic")]
+[assembly: InternalsVisibleTo("osu.Game.Rulesets.Taiko.Tests.iOS")]

osu.Game.Tests.iOS/AppDelegate.cs

@@ -0,0 +1,14 @@
+// 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 Foundation;
+using osu.Framework.iOS;
+
+namespace osu.Game.Tests.iOS
+{
+    [Register("AppDelegate")]
+    public class AppDelegate : GameAppDelegate
+    {
+        protected override Framework.Game CreateGame() => new OsuTestBrowser();
+    }
+}

osu.Game.Tests.iOS/Application.cs

@@ -0,0 +1,15 @@
+// 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 UIKit;
+
+namespace osu.Game.Tests.iOS
+{
+    public class Application
+    {
+        public static void Main(string[] args)
+        {
+            UIApplication.Main(args, null, "AppDelegate");
+        }
+    }
+}

osu.Game.Tests.iOS/Entitlements.plist

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+</dict>
+</plist>

osu.Game.Tests.iOS/Info.plist

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleName</key>
+	<string>osu.Game.Tests.iOS</string>
+	<key>CFBundleIdentifier</key>
+	<string>ppy.osu-Game-Tests-iOS</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>MinimumOSVersion</key>
+	<string>10.0</string>
+	<key>UIDeviceFamily</key>
+	<array>
+		<integer>1</integer>
+		<integer>2</integer>
+	</array>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>XSAppIconAssets</key>
+	<string>Assets.xcassets/AppIcon.appiconset</string>
+</dict>
+</plist>

osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
+    <OutputType>Exe</OutputType>
+    <ProjectGuid>{65FF8E19-6934-469B-B690-23C6D6E56A17}</ProjectGuid>
+    <RootNamespace>osu.Game.Tests</RootNamespace>
+    <AssemblyName>osu.Game.Tests.iOS</AssemblyName>
+  </PropertyGroup>
+  <Import Project="..\osu.iOS.props" />
+  <ItemGroup>
+    <None Include="Info.plist" />
+    <None Include="Entitlements.plist" />
+    <None Include="..\osu.iOS\libbass.a">
+      <Link>libbass.a</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="..\osu.iOS\libbass_fx.a">
+      <Link>libbass_fx.a</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <LinkDescription Include="..\osu.iOS\Linker.xml">
+      <Link>Linker.xml</Link>
+    </LinkDescription>
+    <Compile Include="Application.cs" />
+    <Compile Include="AppDelegate.cs" />
+    <Compile Include="..\osu.Game.Tests\**\*.cs" Exclude="**\obj\**">
+      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\osu.Game\osu.Game.csproj">
+      <Project>{2A66DD92-ADB1-4994-89E2-C94E04ACDA0D}</Project>
+      <Name>osu.Game</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj">
+      <Project>{C92A607B-1FDD-4954-9F92-03FF547D9080}</Project>
+      <Name>osu.Game.Rulesets.Osu</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj">
+      <Project>{58F6C80C-1253-4A0E-A465-B8C85EBEADF3}</Project>
+      <Name>osu.Game.Rulesets.Catch</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj">
+      <Project>{48F4582B-7687-4621-9CBE-5C24197CB536}</Project>
+      <Name>osu.Game.Rulesets.Mania</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj">
+      <Project>{F167E17A-7DE6-4AF5-B920-A5112296C695}</Project>
+      <Name>osu.Game.Rulesets.Taiko</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup Label="Package References">
+    <PackageReference Include="DeepEqual" Version="2.0.0" />
+  </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>

osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs

@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         [Test]
         public void TestDecodeBeatmapVersion()
         {
-            using (var resStream = Resource.OpenResource("beatmap-version.osu"))
+            using (var resStream = TestResources.OpenResource("beatmap-version.osu"))
             using (var stream = new StreamReader(resStream))
             {
                 var decoder = Decoder.GetDecoder<Beatmap>(stream);
@@ -47,7 +47,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         public void TestDecodeBeatmapGeneral()
         {
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
-            using (var resStream = Resource.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
+            using (var resStream = TestResources.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
             using (var stream = new StreamReader(resStream))
             {
                 var beatmap = decoder.Decode(stream);
@@ -70,7 +70,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         public void TestDecodeBeatmapEditor()
         {
             var decoder = new LegacyBeatmapDecoder();
-            using (var resStream = Resource.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
+            using (var resStream = TestResources.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
             using (var stream = new StreamReader(resStream))
             {
                 var beatmapInfo = decoder.Decode(stream).BeatmapInfo;
@@ -95,7 +95,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         public void TestDecodeBeatmapMetadata()
         {
             var decoder = new LegacyBeatmapDecoder();
-            using (var resStream = Resource.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
+            using (var resStream = TestResources.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
             using (var stream = new StreamReader(resStream))
             {
                 var beatmap = decoder.Decode(stream);
@@ -119,7 +119,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         public void TestDecodeBeatmapDifficulty()
         {
             var decoder = new LegacyBeatmapDecoder();
-            using (var resStream = Resource.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
+            using (var resStream = TestResources.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
             using (var stream = new StreamReader(resStream))
             {
                 var difficulty = decoder.Decode(stream).BeatmapInfo.BaseDifficulty;
@@ -137,7 +137,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         public void TestDecodeBeatmapEvents()
         {
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
-            using (var resStream = Resource.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
+            using (var resStream = TestResources.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
             using (var stream = new StreamReader(resStream))
             {
                 var beatmap = decoder.Decode(stream);
@@ -155,7 +155,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         public void TestDecodeBeatmapTimingPoints()
         {
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
-            using (var resStream = Resource.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
+            using (var resStream = TestResources.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
             using (var stream = new StreamReader(resStream))
             {
                 var beatmap = decoder.Decode(stream);
@@ -190,7 +190,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         public void TestDecodeBeatmapColours()
         {
             var decoder = new LegacySkinDecoder();
-            using (var resStream = Resource.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
+            using (var resStream = TestResources.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
             using (var stream = new StreamReader(resStream))
             {
                 var comboColors = decoder.Decode(stream).ComboColours;
@@ -215,7 +215,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         public void TestDecodeBeatmapComboOffsetsOsu()
         {
             var decoder = new LegacyBeatmapDecoder();
-            using (var resStream = Resource.OpenResource("hitobject-combo-offset.osu"))
+            using (var resStream = TestResources.OpenResource("hitobject-combo-offset.osu"))
             using (var stream = new StreamReader(resStream))
             {
                 var beatmap = decoder.Decode(stream);
@@ -237,7 +237,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         public void TestDecodeBeatmapComboOffsetsCatch()
         {
             var decoder = new LegacyBeatmapDecoder();
-            using (var resStream = Resource.OpenResource("hitobject-combo-offset.osu"))
+            using (var resStream = TestResources.OpenResource("hitobject-combo-offset.osu"))
             using (var stream = new StreamReader(resStream))
             {
                 var beatmap = decoder.Decode(stream);
@@ -259,7 +259,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         public void TestDecodeBeatmapHitObjects()
         {
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
-            using (var resStream = Resource.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
+            using (var resStream = TestResources.OpenResource("Soleily - Renatus (Gamu) [Insane].osu"))
             using (var stream = new StreamReader(resStream))
             {
                 var hitObjects = decoder.Decode(stream).HitObjects;
@@ -286,7 +286,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         public void TestDecodeControlPointCustomSampleBank()
         {
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
-            using (var resStream = Resource.OpenResource("controlpoint-custom-samplebank.osu"))
+            using (var resStream = TestResources.OpenResource("controlpoint-custom-samplebank.osu"))
             using (var stream = new StreamReader(resStream))
             {
                 var hitObjects = decoder.Decode(stream).HitObjects;
@@ -307,7 +307,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         public void TestDecodeHitObjectCustomSampleBank()
         {
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
-            using (var resStream = Resource.OpenResource("hitobject-custom-samplebank.osu"))
+            using (var resStream = TestResources.OpenResource("hitobject-custom-samplebank.osu"))
             using (var stream = new StreamReader(resStream))
             {
                 var hitObjects = decoder.Decode(stream).HitObjects;
@@ -324,7 +324,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         public void TestDecodeHitObjectFileSamples()
         {
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
-            using (var resStream = Resource.OpenResource("hitobject-file-samples.osu"))
+            using (var resStream = TestResources.OpenResource("hitobject-file-samples.osu"))
             using (var stream = new StreamReader(resStream))
             {
                 var hitObjects = decoder.Decode(stream).HitObjects;
@@ -342,7 +342,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         public void TestDecodeSliderSamples()
         {
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
-            using (var resStream = Resource.OpenResource("slider-samples.osu"))
+            using (var resStream = TestResources.OpenResource("slider-samples.osu"))
             using (var stream = new StreamReader(resStream))
             {
                 var hitObjects = decoder.Decode(stream).HitObjects;
@@ -385,7 +385,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         public void TestDecodeHitObjectNullAdditionBank()
         {
             var decoder = new LegacyBeatmapDecoder { ApplyOffsets = false };
-            using (var resStream = Resource.OpenResource("hitobject-no-addition-bank.osu"))
+            using (var resStream = TestResources.OpenResource("hitobject-no-addition-bank.osu"))
             using (var stream = new StreamReader(resStream))
             {
                 var hitObjects = decoder.Decode(stream).HitObjects;

osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs

@@ -19,7 +19,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         public void TestDecodeStoryboardEvents()
         {
             var decoder = new LegacyStoryboardDecoder();
-            using (var resStream = Resource.OpenResource("Himeringo - Yotsuya-san ni Yoroshiku (RLC) [Winber1's Extreme].osu"))
+            using (var resStream = TestResources.OpenResource("Himeringo - Yotsuya-san ni Yoroshiku (RLC) [Winber1's Extreme].osu"))
             using (var stream = new StreamReader(resStream))
             {
                 var storyboard = decoder.Decode(stream);
@@ -91,7 +91,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         public void TestDecodeVariableWithSuffix()
         {
             var decoder = new LegacyStoryboardDecoder();
-            using (var resStream = Resource.OpenResource("variable-with-suffix.osb"))
+            using (var resStream = TestResources.OpenResource("variable-with-suffix.osb"))
             using (var stream = new StreamReader(resStream))
             {
                 var storyboard = decoder.Decode(stream);

osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs

@@ -146,7 +146,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
         /// <returns>The <see cref="Beatmap"/> after being decoded by an <see cref="LegacyBeatmapDecoder"/>.</returns>
         private Beatmap decode(string filename, out Beatmap jsonDecoded)
         {
-            using (var stream = Resource.OpenResource(filename))
+            using (var stream = TestResources.OpenResource(filename))
             using (var sr = new StreamReader(stream))
             {
                 var legacyDecoded = new LegacyBeatmapDecoder { ApplyOffsets = false }.Decode(sr);

osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs

@@ -12,6 +12,7 @@ using osu.Framework.Platform;
 using osu.Game.IPC;
 using osu.Framework.Allocation;
 using osu.Game.Beatmaps;
+using osu.Game.Tests.Resources;
 using SharpCompress.Archives.Zip;
 
 namespace osu.Game.Tests.Beatmaps.IO
@@ -19,8 +20,6 @@ namespace osu.Game.Tests.Beatmaps.IO
     [TestFixture]
     public class ImportBeatmapTest
     {
-        public const string TEST_OSZ_PATH = @"../../../../osu-resources/osu.Game.Resources/Beatmaps/241526 Soleily - Renatus.osz";
-
         [Test]
         public void TestImportWhenClosed()
         {
@@ -114,7 +113,7 @@ namespace osu.Game.Tests.Beatmaps.IO
 
                     Assert.AreEqual(0, fireCount -= 2);
 
-                    var breakTemp = createTemporaryBeatmap();
+                    var breakTemp = TestResources.GetTestBeatmapForImport();
 
                     MemoryStream brokenOsu = new MemoryStream(new byte[] { 1, 3, 3, 7 });
                     MemoryStream brokenOsz = new MemoryStream(File.ReadAllBytes(breakTemp));
@@ -223,7 +222,7 @@ namespace osu.Game.Tests.Beatmaps.IO
 
                     var osu = loadOsu(host);
 
-                    var temp = createTemporaryBeatmap();
+                    var temp = TestResources.GetTestBeatmapForImport();
 
                     var importer = new ArchiveImportIPCChannel(client);
                     if (!importer.ImportAsync(temp).Wait(10000))
@@ -248,7 +247,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                 try
                 {
                     var osu = loadOsu(host);
-                    var temp = createTemporaryBeatmap();
+                    var temp = TestResources.GetTestBeatmapForImport();
                     using (File.OpenRead(temp))
                         osu.Dependencies.Get<BeatmapManager>().Import(temp);
                     ensureLoaded(osu);
@@ -262,17 +261,9 @@ namespace osu.Game.Tests.Beatmaps.IO
             }
         }
 
-        private static string createTemporaryBeatmap()
-        {
-            var temp = Path.GetTempFileName() + ".osz";
-            File.Copy(TEST_OSZ_PATH, temp, true);
-            Assert.IsTrue(File.Exists(temp));
-            return temp;
-        }
-
         public static BeatmapSetInfo LoadOszIntoOsu(OsuGameBase osu, string path = null)
         {
-            var temp = path ?? createTemporaryBeatmap();
+            var temp = path ?? TestResources.GetTestBeatmapForImport();
 
             var manager = osu.Dependencies.Get<BeatmapManager>();
 

osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs

@@ -17,7 +17,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public void TestReadBeatmaps()
         {
-            using (var osz = Resource.OpenResource("Beatmaps.241526 Soleily - Renatus.osz"))
+            using (var osz = TestResources.GetTestBeatmapStream())
             {
                 var reader = new ZipArchiveReader(osz);
                 string[] expected =
@@ -44,7 +44,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public void TestReadMetadata()
         {
-            using (var osz = Resource.OpenResource("Beatmaps.241526 Soleily - Renatus.osz"))
+            using (var osz = TestResources.GetTestBeatmapStream())
             {
                 var reader = new ZipArchiveReader(osz);
 
@@ -72,7 +72,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public void TestReadFile()
         {
-            using (var osz = Resource.OpenResource("Beatmaps.241526 Soleily - Renatus.osz"))
+            using (var osz = TestResources.GetTestBeatmapStream())
             {
                 var reader = new ZipArchiveReader(osz);
                 using (var stream = new StreamReader(

osu.Game.Tests/Resources/Resource.cs

@@ -1,20 +0,0 @@
-// 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;
-using System.IO;
-using System.Reflection;
-
-namespace osu.Game.Tests.Resources
-{
-    public static class Resource
-    {
-        public static Stream OpenResource(string name)
-        {
-            var localPath = Path.GetDirectoryName(Uri.UnescapeDataString(new UriBuilder(Assembly.GetExecutingAssembly().CodeBase).Path));
-
-            return Assembly.GetExecutingAssembly().GetManifestResourceStream($@"osu.Game.Tests.Resources.{name}") ??
-                Assembly.LoadFrom(Path.Combine(localPath, @"osu.Game.Resources.dll")).GetManifestResourceStream($@"osu.Game.Resources.{name}");
-        }
-    }
-}

osu.Game.Tests/Resources/TestResources.cs

@@ -0,0 +1,28 @@
+// 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.IO;
+using NUnit.Framework;
+using osu.Framework.IO.Stores;
+
+namespace osu.Game.Tests.Resources
+{
+    public static class TestResources
+    {
+        public static Stream OpenResource(string name) => new DllResourceStore("osu.Game.Tests.dll").GetStream($"Resources/{name}");
+
+        public static Stream GetTestBeatmapStream() => new DllResourceStore("osu.Game.Resources.dll").GetStream("Beatmaps/241526 Soleily - Renatus.osz");
+
+        public static string GetTestBeatmapForImport()
+        {
+            var temp = Path.GetTempFileName() + ".osz";
+
+            using (var stream = GetTestBeatmapStream())
+            using (var newFile = File.Create(temp))
+                stream.CopyTo(newFile);
+
+            Assert.IsTrue(File.Exists(temp));
+            return temp;
+        }
+    }
+}

osu.Game.Tests/Scores/IO/ImportScoreTest.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -16,14 +15,13 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
+using osu.Game.Tests.Resources;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Scores.IO
 {
     public class ImportScoreTest
     {
-        public const string TEST_OSZ_PATH = @"../../../../osu-resources/osu.Game.Resources/Beatmaps/241526 Soleily - Renatus.osz";
-
         [Test]
         public void TestBasicImport()
         {
@@ -132,21 +130,13 @@ namespace osu.Game.Tests.Scores.IO
             return scoreManager.GetAllUsableScores().First();
         }
 
-        private string createTemporaryBeatmap()
-        {
-            var temp = Path.GetTempFileName() + ".osz";
-            File.Copy(TEST_OSZ_PATH, temp, true);
-            Assert.IsTrue(File.Exists(temp));
-            return temp;
-        }
-
         private OsuGameBase loadOsu(GameHost host)
         {
             var osu = new OsuGameBase();
             Task.Run(() => host.Run(osu));
             waitForOrAssert(() => osu.IsLoaded, @"osu! failed to start in a reasonable amount of time");
 
-            var beatmapFile = createTemporaryBeatmap();
+            var beatmapFile = TestResources.GetTestBeatmapForImport();
             var beatmapManager = osu.Dependencies.Get<BeatmapManager>();
             beatmapManager.Import(beatmapFile);
 

osu.Game.Tests/Visual/TestCaseLoaderAnimation.cs

@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Screens;
 using osu.Game.Screens;
 using osu.Game.Screens.Menu;
 using osuTK.Graphics;
@@ -57,7 +58,7 @@ namespace osu.Game.Tests.Visual
             public OsuLogo Logo;
             private TestScreen screen;
 
-            public bool ScreenLoaded => screen.IsCurrentScreen;
+            public bool ScreenLoaded => screen.IsCurrentScreen();
 
             public TestLoader(double delay)
             {
@@ -96,7 +97,7 @@ namespace osu.Game.Tests.Visual
             {
                 public TestScreen()
                 {
-                    Child = new Box
+                    InternalChild = new Box
                     {
                         RelativeSizeAxes = Axes.Both,
                         Colour = Color4.DarkSlateGray,
@@ -107,7 +108,7 @@ namespace osu.Game.Tests.Visual
                 protected override void LogoArriving(OsuLogo logo, bool resuming)
                 {
                     base.LogoArriving(logo, resuming);
-                    Child.FadeInFromZero(200);
+                    InternalChild.FadeInFromZero(200);
                 }
             }
         }

osu.Game.Tests/Visual/TestCaseMultiHeader.cs

@@ -3,6 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Framework.Screens;
 using osu.Game.Screens;
 using osu.Game.Screens.Multi;
 
@@ -15,15 +16,15 @@ namespace osu.Game.Tests.Visual
         {
             int index = 0;
 
-            OsuScreen currentScreen = new TestMultiplayerSubScreen(index);
+            ScreenStack screenStack = new ScreenStack(new TestMultiplayerSubScreen(index)) { RelativeSizeAxes = Axes.Both };
 
             Children = new Drawable[]
             {
-                currentScreen,
-                new Header(currentScreen)
+                screenStack,
+                new Header(screenStack)
             };
 
-            AddStep("push multi screen", () => currentScreen.Push(currentScreen = new TestMultiplayerSubScreen(++index)));
+            AddStep("push multi screen", () => screenStack.CurrentScreen.Push(new TestMultiplayerSubScreen(++index)));
         }
 
         private class TestMultiplayerSubScreen : OsuScreen, IMultiplayerSubScreen

osu.Game.Tests/Visual/TestCaseMultiScreen.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
+using osu.Framework.Screens;
 using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;

osu.Game.Tests/Visual/TestCasePlaySongSelect.cs

@@ -11,6 +11,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Extensions;
 using osu.Framework.MathUtils;
+using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Rulesets;
@@ -81,7 +82,7 @@ namespace osu.Game.Tests.Visual
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(GameHost host)
         {
             factory = new DatabaseContextFactory(LocalStorage);
             factory.ResetDatabase();
@@ -95,7 +96,7 @@ namespace osu.Game.Tests.Visual
                 usage.Migrate();
 
             Dependencies.Cache(rulesets = new RulesetStore(factory));
-            Dependencies.Cache(manager = new BeatmapManager(LocalStorage, factory, rulesets, null, null, null, defaultBeatmap = Beatmap.Default));
+            Dependencies.Cache(manager = new BeatmapManager(LocalStorage, factory, rulesets, null, null, host, defaultBeatmap = Beatmap.Default));
 
             Beatmap.SetDefault();
         }

osu.Game.Tests/Visual/TestCasePlayerLoader.cs

@@ -3,6 +3,7 @@
 
 using System.Threading;
 using osu.Framework.Allocation;
+using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Screens.Play;
 
@@ -26,7 +27,7 @@ namespace osu.Game.Tests.Visual
 
             AddStep("mouse in centre", () => InputManager.MoveMouseTo(loader.ScreenSpaceDrawQuad.Centre));
 
-            AddUntilStep(() => !loader.IsCurrentScreen, "wait for no longer current");
+            AddUntilStep(() => !loader.IsCurrentScreen(), "wait for no longer current");
 
             AddStep("load slow dummy beatmap", () =>
             {
@@ -42,7 +43,7 @@ namespace osu.Game.Tests.Visual
                 Scheduler.AddDelayed(() => slow.Ready = true, 5000);
             });
 
-            AddUntilStep(() => !loader.IsCurrentScreen, "wait for no longer current");
+            AddUntilStep(() => !loader.IsCurrentScreen(), "wait for no longer current");
         }
 
         protected class SlowLoadPlayer : Player

osu.Game.Tests/Visual/TestCaseScreenBreadcrumbControl.cs

@@ -19,16 +19,18 @@ namespace osu.Game.Tests.Visual
     public class TestCaseScreenBreadcrumbControl : OsuTestCase
     {
         private readonly ScreenBreadcrumbControl breadcrumbs;
-        private Screen currentScreen, changedScreen;
+        private readonly ScreenStack screenStack;
 
         public TestCaseScreenBreadcrumbControl()
         {
-            TestScreen startScreen;
             OsuSpriteText titleText;
 
+            IScreen startScreen = new TestScreenOne();
+            screenStack = new ScreenStack(startScreen) { RelativeSizeAxes = Axes.Both };
+
             Children = new Drawable[]
             {
-                currentScreen = startScreen = new TestScreenOne(),
+                screenStack,
                 new FillFlowContainer
                 {
                     RelativeSizeAxes = Axes.X,
@@ -37,7 +39,7 @@ namespace osu.Game.Tests.Visual
                     Spacing = new Vector2(10),
                     Children = new Drawable[]
                     {
-                        breadcrumbs = new ScreenBreadcrumbControl(startScreen)
+                        breadcrumbs = new ScreenBreadcrumbControl(screenStack)
                         {
                             RelativeSizeAxes = Axes.X,
                         },
@@ -46,12 +48,7 @@ namespace osu.Game.Tests.Visual
                 },
             };
 
-            breadcrumbs.Current.ValueChanged += s =>
-            {
-                titleText.Text = $"Changed to {s.ToString()}";
-                changedScreen = s;
-            };
-
+            breadcrumbs.Current.ValueChanged += s => titleText.Text = $"Changed to {s.ToString()}";
             breadcrumbs.Current.TriggerChange();
 
             waitForCurrent();
@@ -60,18 +57,14 @@ namespace osu.Game.Tests.Visual
             pushNext();
             waitForCurrent();
 
-            AddStep(@"make start current", () =>
-            {
-                startScreen.MakeCurrent();
-                currentScreen = startScreen;
-            });
+            AddStep(@"make start current", () => startScreen.MakeCurrent());
 
             waitForCurrent();
             pushNext();
             waitForCurrent();
             AddAssert(@"only 2 items", () => breadcrumbs.Items.Count() == 2);
-            AddStep(@"exit current", () => changedScreen.Exit());
-            AddAssert(@"current screen is first", () => startScreen == changedScreen);
+            AddStep(@"exit current", () => screenStack.CurrentScreen.Exit());
+            AddAssert(@"current screen is first", () => startScreen == screenStack.CurrentScreen);
         }
 
         [BackgroundDependencyLoader]
@@ -80,8 +73,8 @@ namespace osu.Game.Tests.Visual
             breadcrumbs.StripColour = colours.Blue;
         }
 
-        private void pushNext() => AddStep(@"push next screen", () => currentScreen = ((TestScreen)currentScreen).PushNext());
-        private void waitForCurrent() => AddUntilStep(() => currentScreen.IsCurrentScreen, "current screen");
+        private void pushNext() => AddStep(@"push next screen", () => ((TestScreen)screenStack.CurrentScreen).PushNext());
+        private void waitForCurrent() => AddUntilStep(() => screenStack.CurrentScreen.IsCurrentScreen(), "current screen");
 
         private abstract class TestScreen : OsuScreen
         {
@@ -91,14 +84,14 @@ namespace osu.Game.Tests.Visual
             public TestScreen PushNext()
             {
                 TestScreen screen = CreateNextScreen();
-                Push(screen);
+               this.Push(screen);
 
                 return screen;
             }
 
             protected TestScreen()
             {
-                Child = new FillFlowContainer
+                InternalChild = new FillFlowContainer
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,

osu.Game.Tests/WaveformTestBeatmap.cs

@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.IO.Archives;
-using osu.Game.Tests.Beatmaps.IO;
+using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests
 {
@@ -18,12 +18,12 @@ namespace osu.Game.Tests
     public class WaveformTestBeatmap : WorkingBeatmap
     {
         private readonly ZipArchiveReader reader;
-        private readonly FileStream stream;
+        private readonly Stream stream;
 
         public WaveformTestBeatmap()
             : base(new BeatmapInfo())
         {
-            stream = File.OpenRead(ImportBeatmapTest.TEST_OSZ_PATH);
+            stream = TestResources.GetTestBeatmapStream();
             reader = new ZipArchiveReader(stream);
         }
 

osu.Game/Beatmaps/BeatmapManager.cs

@@ -74,15 +74,18 @@ namespace osu.Game.Beatmaps
 
         private readonly AudioManager audioManager;
 
+        private readonly GameHost host;
+
         private readonly List<DownloadBeatmapSetRequest> currentDownloads = new List<DownloadBeatmapSetRequest>();
 
-        public BeatmapManager(Storage storage, IDatabaseContextFactory contextFactory, RulesetStore rulesets, APIAccess api, AudioManager audioManager, IIpcHost importHost = null,
+        public BeatmapManager(Storage storage, IDatabaseContextFactory contextFactory, RulesetStore rulesets, APIAccess api, AudioManager audioManager, GameHost host = null,
                               WorkingBeatmap defaultBeatmap = null)
-            : base(storage, contextFactory, new BeatmapStore(contextFactory), importHost)
+            : base(storage, contextFactory, new BeatmapStore(contextFactory), host)
         {
             this.rulesets = rulesets;
             this.api = api;
             this.audioManager = audioManager;
+            this.host = host;
 
             DefaultBeatmap = defaultBeatmap;
 
@@ -160,18 +163,14 @@ namespace osu.Game.Beatmaps
                 downloadNotification.Progress = progress;
             };
 
-            request.Success += data =>
+            request.Success += filename =>
             {
                 downloadNotification.Text = $"Importing {beatmapSetInfo.Metadata.Artist} - {beatmapSetInfo.Metadata.Title}";
 
                 Task.Factory.StartNew(() =>
                 {
-                    BeatmapSetInfo importedBeatmap;
-
                     // This gets scheduled back to the update thread, but we want the import to run in the background.
-                    using (var stream = new MemoryStream(data))
-                    using (var archive = new ZipArchiveReader(stream, beatmapSetInfo.ToString()))
-                        importedBeatmap = Import(archive);
+                    var importedBeatmap = Import(filename);
 
                     downloadNotification.CompletionClickAction = () =>
                     {
@@ -254,7 +253,7 @@ namespace osu.Game.Beatmaps
             if (beatmapInfo.Metadata == null)
                 beatmapInfo.Metadata = beatmapInfo.BeatmapSet.Metadata;
 
-            WorkingBeatmap working = new BeatmapManagerWorkingBeatmap(Files.Store, beatmapInfo, audioManager);
+            WorkingBeatmap working = new BeatmapManagerWorkingBeatmap(Files.Store, new LargeTextureStore(host?.CreateTextureLoaderStore(Files.Store)), beatmapInfo, audioManager);
 
             previous?.TransferTo(working);
 

osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs

@@ -22,10 +22,11 @@ namespace osu.Game.Beatmaps
             private readonly IResourceStore<byte[]> store;
             private readonly AudioManager audioManager;
 
-            public BeatmapManagerWorkingBeatmap(IResourceStore<byte[]> store, BeatmapInfo beatmapInfo, AudioManager audioManager)
+            public BeatmapManagerWorkingBeatmap(IResourceStore<byte[]> store, TextureStore textureStore, BeatmapInfo beatmapInfo, AudioManager audioManager)
                 : base(beatmapInfo)
             {
                 this.store = store;
+                this.textureStore = textureStore;
                 this.audioManager = audioManager;
             }
 
@@ -44,7 +45,7 @@ namespace osu.Game.Beatmaps
 
             private string getPathForFile(string filename) => BeatmapSetInfo.Files.First(f => string.Equals(f.Filename, filename, StringComparison.InvariantCultureIgnoreCase)).FileInfo.StoragePath;
 
-            private LargeTextureStore textureStore;
+            private TextureStore textureStore;
 
             protected override bool BackgroundStillValid(Texture b) => false; // bypass lazy logic. we want to return a new background each time for refcounting purposes.
 
@@ -55,7 +56,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    return (textureStore ?? (textureStore = new LargeTextureStore(new TextureLoaderStore(store)))).Get(getPathForFile(Metadata.BackgroundFile));
+                    return textureStore.Get(getPathForFile(Metadata.BackgroundFile));
                 }
                 catch
                 {

osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs

@@ -1,112 +0,0 @@
-// 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 osu.Framework.Allocation;
-using osu.Framework.Configuration;
-using osu.Framework.Graphics;
-using osu.Game.Online.API.Requests;
-
-namespace osu.Game.Beatmaps.Drawables
-{
-    /// <summary>
-    /// A component to allow downloading of a beatmap set. Automatically handles state syncing between other instances.
-    /// </summary>
-    public class BeatmapSetDownloader : Component
-    {
-        private readonly BeatmapSetInfo set;
-        private readonly bool noVideo;
-
-        private BeatmapManager beatmaps;
-
-        /// <summary>
-        /// Holds the current download state of the beatmap, whether is has already been downloaded, is in progress, or is not downloaded.
-        /// </summary>
-        public readonly Bindable<DownloadStatus> DownloadState = new Bindable<DownloadStatus>();
-
-        public BeatmapSetDownloader(BeatmapSetInfo set, bool noVideo = false)
-        {
-            this.set = set;
-            this.noVideo = noVideo;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(BeatmapManager beatmaps)
-        {
-            this.beatmaps = beatmaps;
-
-            beatmaps.ItemAdded += setAdded;
-            beatmaps.ItemRemoved += setRemoved;
-            beatmaps.BeatmapDownloadBegan += downloadBegan;
-            beatmaps.BeatmapDownloadFailed += downloadFailed;
-
-            // initial value
-            if (set.OnlineBeatmapSetID != null && beatmaps.QueryBeatmapSets(s => s.OnlineBeatmapSetID == set.OnlineBeatmapSetID && !s.DeletePending).Any())
-                DownloadState.Value = DownloadStatus.Downloaded;
-            else if (beatmaps.GetExistingDownload(set) != null)
-                DownloadState.Value = DownloadStatus.Downloading;
-            else
-                DownloadState.Value = DownloadStatus.NotDownloaded;
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (beatmaps != null)
-            {
-                beatmaps.ItemAdded -= setAdded;
-                beatmaps.ItemRemoved -= setRemoved;
-                beatmaps.BeatmapDownloadBegan -= downloadBegan;
-                beatmaps.BeatmapDownloadFailed -= downloadFailed;
-            }
-        }
-
-        /// <summary>
-        /// Begin downloading the associated beatmap set.
-        /// </summary>
-        /// <returns>True if downloading began. False if an existing download is active or completed.</returns>
-        public void Download()
-        {
-            if (DownloadState.Value > DownloadStatus.NotDownloaded)
-                return;
-
-            if (beatmaps.Download(set, noVideo))
-            {
-                // Only change state if download can happen
-                DownloadState.Value = DownloadStatus.Downloading;
-            }
-        }
-
-        private void setAdded(BeatmapSetInfo s, bool existing, bool silent) => Schedule(() =>
-        {
-            if (s.OnlineBeatmapSetID == set.OnlineBeatmapSetID)
-                DownloadState.Value = DownloadStatus.Downloaded;
-        });
-
-        private void setRemoved(BeatmapSetInfo s) => Schedule(() =>
-        {
-            if (s.OnlineBeatmapSetID == set.OnlineBeatmapSetID)
-                DownloadState.Value = DownloadStatus.NotDownloaded;
-        });
-
-        private void downloadBegan(DownloadBeatmapSetRequest d)
-        {
-            if (d.BeatmapSet.OnlineBeatmapSetID == set.OnlineBeatmapSetID)
-                DownloadState.Value = DownloadStatus.Downloading;
-        }
-
-        private void downloadFailed(DownloadBeatmapSetRequest d)
-        {
-            if (d.BeatmapSet.OnlineBeatmapSetID == set.OnlineBeatmapSetID)
-                DownloadState.Value = DownloadStatus.NotDownloaded;
-        }
-
-        public enum DownloadStatus
-        {
-            NotDownloaded,
-            Downloading,
-            Downloaded,
-        }
-    }
-}

osu.Game/Database/ArchiveModelManager.cs

@@ -150,25 +150,9 @@ namespace osu.Game.Database
                 {
                     notification.Text = $"Importing ({++current} of {paths.Length})\n{Path.GetFileName(path)}";
 
-                    TModel import;
-                    using (ArchiveReader reader = getReaderFrom(path))
-                        imported.Add(import = Import(reader));
+                    imported.Add(Import(path));
 
                     notification.Progress = (float)current / paths.Length;
-
-                    // We may or may not want to delete the file depending on where it is stored.
-                    //  e.g. reconstructing/repairing database with items from default storage.
-                    // Also, not always a single file, i.e. for LegacyFilesystemReader
-                    // TODO: Add a check to prevent files from storage to be deleted.
-                    try
-                    {
-                        if (import != null && File.Exists(path))
-                            File.Delete(path);
-                    }
-                    catch (Exception e)
-                    {
-                        Logger.Error(e, $@"Could not delete original file after import ({Path.GetFileName(path)})");
-                    }
                 }
                 catch (Exception e)
                 {
@@ -195,6 +179,34 @@ namespace osu.Game.Database
             }
         }
 
+        /// <summary>
+        /// Import one <see cref="TModel"/> from the filesystem and delete the file on success.
+        /// </summary>
+        /// <param name="path">The archive location on disk.</param>
+        /// <returns>The imported model, if successful.</returns>
+        public TModel Import(string path)
+        {
+            TModel import;
+            using (ArchiveReader reader = getReaderFrom(path))
+                import = Import(reader);
+
+            // We may or may not want to delete the file depending on where it is stored.
+            //  e.g. reconstructing/repairing database with items from default storage.
+            // Also, not always a single file, i.e. for LegacyFilesystemReader
+            // TODO: Add a check to prevent files from storage to be deleted.
+            try
+            {
+                if (import != null && File.Exists(path))
+                    File.Delete(path);
+            }
+            catch (Exception e)
+            {
+                Logger.Error(e, $@"Could not delete original file after import ({Path.GetFileName(path)})");
+            }
+
+            return import;
+        }
+
         protected virtual void PresentCompletedImport(IEnumerable<TModel> imported)
         {
         }

osu.Game/Graphics/Cursor/MenuCursorContainer.cs

@@ -50,6 +50,7 @@ namespace osu.Game.Graphics.Cursor
             if (!CanShowCursor)
             {
                 currentTarget?.Cursor?.Hide();
+                currentTarget = null;
                 return;
             }
 

osu.Game/Graphics/UserInterface/FocusedTextBox.cs

@@ -3,7 +3,9 @@
 
 using osuTK.Graphics;
 using System;
+using osu.Framework.Allocation;
 using osu.Framework.Input.Events;
+using osu.Framework.Platform;
 using osu.Game.Input.Bindings;
 using osuTK.Input;
 
@@ -21,9 +23,16 @@ namespace osu.Game.Graphics.UserInterface
 
         private bool focus;
 
+        private bool allowImmediateFocus => host?.OnScreenKeyboardOverlapsGameWindow != true;
+
+        public void TakeFocus()
+        {
+            if (allowImmediateFocus) GetContainingInputManager().ChangeFocus(this);
+        }
+
         public bool HoldFocus
         {
-            get { return focus; }
+            get => allowImmediateFocus && focus;
             set
             {
                 focus = value;
@@ -32,6 +41,14 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
+        private GameHost host;
+
+        [BackgroundDependencyLoader]
+        private void load(GameHost host)
+        {
+            this.host = host;
+        }
+
         // We may not be focused yet, but we need to handle keyboard input to be able to request focus
         public override bool HandleNonPositionalInput => HoldFocus || base.HandleNonPositionalInput;
 

osu.Game/Graphics/UserInterface/ScreenBreadcrumbControl.cs

@@ -10,45 +10,30 @@ namespace osu.Game.Graphics.UserInterface
     /// <summary>
     /// A <see cref="BreadcrumbControl"/> which follows the active screen (and allows navigation) in a <see cref="Screen"/> stack.
     /// </summary>
-    public class ScreenBreadcrumbControl : BreadcrumbControl<Screen>
+    public class ScreenBreadcrumbControl : BreadcrumbControl<IScreen>
     {
-        private Screen last;
-
-        public ScreenBreadcrumbControl(Screen initialScreen)
+        public ScreenBreadcrumbControl(ScreenStack stack)
         {
-            Current.ValueChanged += newScreen =>
-            {
-                if (last != newScreen && !newScreen.IsCurrentScreen)
-                    newScreen.MakeCurrent();
-            };
+            stack.ScreenPushed += onPushed;
+            stack.ScreenExited += onExited;
 
-            onPushed(initialScreen);
+            onPushed(null, stack.CurrentScreen);
+
+            Current.ValueChanged += newScreen => newScreen.MakeCurrent();
         }
 
-        private void screenChanged(Screen newScreen)
+        private void onPushed(IScreen lastScreen, IScreen newScreen)
         {
-            if (newScreen == null) return;
-
-            if (last != null)
-            {
-                last.Exited -= screenChanged;
-                last.ModePushed -= onPushed;
-            }
-
-            last = newScreen;
-
-            newScreen.Exited += screenChanged;
-            newScreen.ModePushed += onPushed;
-
+            AddItem(newScreen);
             Current.Value = newScreen;
         }
 
-        private void onPushed(Screen screen)
+        private void onExited(IScreen lastScreen, IScreen newScreen)
         {
-            Items.ToList().SkipWhile(i => i != Current.Value).Skip(1).ForEach(RemoveItem);
-            AddItem(screen);
+            if (newScreen != null)
+                Current.Value = newScreen;
 
-            screenChanged(screen);
+            Items.ToList().SkipWhile(s => s != Current.Value).Skip(1).ForEach(RemoveItem);
         }
     }
 }

osu.Game/Online/API/APIAccess.cs

@@ -355,11 +355,7 @@ namespace osu.Game.Online.API
             State = APIState.Offline;
         }
 
-        private static User createGuestUser() => new User
-        {
-            Username = @"Guest",
-            Id = 1,
-        };
+        private static User createGuestUser() => new GuestUser();
 
         protected override void Dispose(bool isDisposing)
         {
@@ -370,6 +366,15 @@ namespace osu.Game.Online.API
         }
     }
 
+    internal class GuestUser : User
+    {
+        public GuestUser()
+        {
+            Username = @"Guest";
+            Id = 1;
+        }
+    }
+
     public enum APIState
     {
         /// <summary>

osu.Game/Online/API/APIDownloadRequest.cs

@@ -1,20 +1,23 @@
 // 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.IO;
 using osu.Framework.IO.Network;
 
 namespace osu.Game.Online.API
 {
     public abstract class APIDownloadRequest : APIRequest
     {
+        private string filename;
+
         protected override WebRequest CreateWebRequest()
         {
-            var request = new WebRequest(Uri);
+            var request = new FileWebRequest(filename = Path.GetTempFileName(), Uri);
             request.DownloadProgress += request_Progress;
             return request;
         }
 
-        private void request_Progress(long current, long total) => API.Schedule(() => Progress?.Invoke(current, total));
+        private void request_Progress(long current, long total) => API.Schedule(() => Progressed?.Invoke(current, total));
 
         protected APIDownloadRequest()
         {
@@ -23,11 +26,11 @@ namespace osu.Game.Online.API
 
         private void onSuccess()
         {
-            Success?.Invoke(WebRequest.ResponseData);
+            Success?.Invoke(filename);
         }
 
-        public event APIProgressHandler Progress;
+        public event APIProgressHandler Progressed;
 
-        public new event APISuccessHandler<byte[]> Success;
+        public new event APISuccessHandler<string> Success;
     }
 }

osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs

@@ -10,7 +10,9 @@ namespace osu.Game.Online.API.Requests
     {
         public readonly BeatmapSetInfo BeatmapSet;
 
-        public Action<float> DownloadProgressed;
+        public float Progress;
+
+        public event Action<float> DownloadProgressed;
 
         private readonly bool noVideo;
 
@@ -19,7 +21,7 @@ namespace osu.Game.Online.API.Requests
             this.noVideo = noVideo;
             BeatmapSet = set;
 
-            Progress += (current, total) => DownloadProgressed?.Invoke((float) current / total);
+            Progressed += (current, total) => DownloadProgressed?.Invoke(Progress = (float)current / total);
         }
 
         protected override string Target => $@"beatmapsets/{BeatmapSet.OnlineBeatmapSetID}/download{(noVideo ? "?noVideo=1" : "")}";

osu.Game/OsuGame.cs

@@ -79,27 +79,23 @@ namespace osu.Game
 
         public virtual Storage GetStorageForStableInstall() => null;
 
-        private Intro intro
-        {
-            get
-            {
-                Screen screen = screenStack;
-                while (screen != null && !(screen is Intro))
-                    screen = screen.ChildScreen;
-                return screen as Intro;
-            }
-        }
-
         public float ToolbarOffset => Toolbar.Position.Y + Toolbar.DrawHeight;
 
         private IdleTracker idleTracker;
 
         public readonly Bindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>();
 
-        private OsuScreen screenStack;
+        private BackgroundScreenStack backgroundStack;
 
+        private ParallaxContainer backgroundParallax;
+
+        private ScreenStack screenStack;
         private VolumeOverlay volume;
         private OnScreenDisplay onscreenDisplay;
+        private OsuLogo osuLogo;
+
+        private MainMenu menuScreen;
+        private Intro introScreen;
 
         private Bindable<int> configRuleset;
         private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
@@ -173,6 +169,8 @@ namespace osu.Game
             dependencies.CacheAs(ruleset);
             dependencies.CacheAs<IBindable<RulesetInfo>>(ruleset);
 
+            dependencies.Cache(osuLogo = new OsuLogo { Alpha = 0 });
+
             // bind config int to database RulesetInfo
             configRuleset = LocalConfig.GetBindable<int>(OsuSetting.Ruleset);
             ruleset.Value = RulesetStore.GetRuleset(configRuleset.Value) ?? RulesetStore.AvailableRulesets.First();
@@ -211,6 +209,12 @@ namespace osu.Game
         /// <param name="beatmap">The beatmap to select.</param>
         public void PresentBeatmap(BeatmapSetInfo beatmap)
         {
+            if (menuScreen == null)
+            {
+                Schedule(() => PresentBeatmap(beatmap));
+                return;
+            }
+
             CloseAllOverlays(false);
 
             void setBeatmap()
@@ -233,16 +237,15 @@ namespace osu.Game
                 }
             }
 
-            switch (currentScreen)
+            switch (screenStack.CurrentScreen)
             {
                 case SongSelect _:
                     break;
                 default:
                     // navigate to song select if we are not already there.
-                    var menu = (MainMenu)intro.ChildScreen;
 
-                    menu.MakeCurrent();
-                    menu.LoadToSolo();
+                    menuScreen.MakeCurrent();
+                    menuScreen.LoadToSolo();
                     break;
             }
 
@@ -268,9 +271,7 @@ namespace osu.Game
 
             scoreLoad?.Cancel();
 
-            var menu = intro.ChildScreen;
-
-            if (menu == null)
+            if (menuScreen == null)
             {
                 scoreLoad = Schedule(() => LoadScore(score, false));
                 return;
@@ -291,7 +292,7 @@ namespace osu.Game
                 return;
             }
 
-            if (!currentScreen.AllowExternalScreenChange)
+            if ((screenStack.CurrentScreen as IOsuScreen)?.AllowExternalScreenChange != true)
             {
                 notifications.Post(new SimpleNotification
                 {
@@ -310,9 +311,9 @@ namespace osu.Game
 
             void loadScore()
             {
-                if (!menu.IsCurrentScreen)
+                if (!menuScreen.IsCurrentScreen())
                 {
-                    menu.MakeCurrent();
+                    menuScreen.MakeCurrent();
                     this.Delay(500).Schedule(loadScore, out scoreLoad);
                     return;
                 }
@@ -322,7 +323,7 @@ namespace osu.Game
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(databasedBeatmap);
                 Beatmap.Value.Mods.Value = databasedScoreInfo.Mods;
 
-                currentScreen.Push(new PlayerLoader(() => new ReplayPlayer(databasedScore)));
+                menuScreen.Push(new PlayerLoader(() => new ReplayPlayer(databasedScore)));
             }
         }
 
@@ -336,11 +337,6 @@ namespace osu.Game
         {
             base.LoadComplete();
 
-            // The next time this is updated is in UpdateAfterChildren, which occurs too late and results
-            // in the cursor being shown for a few frames during the intro.
-            // This prevents the cursor from showing until we have a screen with CursorVisible = true
-            MenuCursorContainer.CanShowCursor = currentScreen?.CursorVisible ?? false;
-
             // todo: all archive managers should be able to be looped here.
             SkinManager.PostNotification = n => notifications?.Post(n);
             SkinManager.GetStableStorage = GetStorageForStableInstall;
@@ -350,6 +346,8 @@ namespace osu.Game
 
             BeatmapManager.PresentBeatmap = PresentBeatmap;
 
+            Container logoContainer;
+
             AddRange(new Drawable[]
             {
                 new VolumeControlReceptor
@@ -361,6 +359,16 @@ namespace osu.Game
                 screenContainer = new ScalingContainer(ScalingMode.ExcludeOverlays)
                 {
                     RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        backgroundParallax = new ParallaxContainer
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Child = backgroundStack = new BackgroundScreenStack { RelativeSizeAxes = Axes.Both },
+                        },
+                        screenStack = new ScreenStack { RelativeSizeAxes = Axes.Both },
+                        logoContainer = new Container { RelativeSizeAxes = Axes.Both },
+                    }
                 },
                 overlayContent = new Container
                 {
@@ -370,12 +378,17 @@ namespace osu.Game
                 idleTracker = new GameIdleTracker(6000)
             });
 
-            loadComponentSingleFile(screenStack = new Loader(), d =>
+            dependencies.Cache(backgroundStack);
+
+            screenStack.ScreenPushed += screenPushed;
+            screenStack.ScreenExited += screenExited;
+
+            loadComponentSingleFile(osuLogo, logoContainer.Add);
+
+            loadComponentSingleFile(new Loader
             {
-                screenStack.ModePushed += screenAdded;
-                screenStack.Exited += screenRemoved;
-                screenContainer.Add(screenStack);
-            });
+                RelativeSizeAxes = Axes.Both
+            }, screenStack.Push);
 
             loadComponentSingleFile(Toolbar = new Toolbar
             {
@@ -383,7 +396,7 @@ namespace osu.Game
                 OnHome = delegate
                 {
                     CloseAllOverlays(false);
-                    intro?.ChildScreen?.MakeCurrent();
+                    menuScreen?.MakeCurrent();
                 },
             }, floatingOverlayContent.Add);
 
@@ -617,7 +630,7 @@ namespace osu.Game
 
         public bool OnPressed(GlobalAction action)
         {
-            if (intro == null) return false;
+            if (introScreen == null) return false;
 
             switch (action)
             {
@@ -674,19 +687,20 @@ namespace osu.Game
 
         private Container floatingOverlayContent;
 
-        private OsuScreen currentScreen;
         private FrameworkConfigManager frameworkConfig;
         private ScalingContainer screenContainer;
 
         protected override bool OnExiting()
         {
-            if (screenStack.ChildScreen == null) return false;
+            if (screenStack.CurrentScreen is Loader)
+                return false;
 
-            if (intro == null) return true;
+            if (introScreen == null)
+                return true;
 
-            if (!intro.DidLoadMenu || intro.ChildScreen != null)
+            if (!introScreen.DidLoadMenu || !(screenStack.CurrentScreen is Intro))
             {
-                Scheduler.Add(intro.MakeCurrent);
+                Scheduler.Add(introScreen.MakeCurrent);
                 return true;
             }
 
@@ -711,7 +725,7 @@ namespace osu.Game
 
             // we only want to apply these restrictions when we are inside a screen stack.
             // the use case for not applying is in visual/unit tests.
-            bool applyBeatmapRulesetRestrictions = !currentScreen?.AllowBeatmapRulesetChange ?? false;
+            bool applyBeatmapRulesetRestrictions = !(screenStack.CurrentScreen as IOsuScreen)?.AllowBeatmapRulesetChange ?? false;
 
             ruleset.Disabled = applyBeatmapRulesetRestrictions;
             Beatmap.Disabled = applyBeatmapRulesetRestrictions;
@@ -719,7 +733,7 @@ namespace osu.Game
             screenContainer.Padding = new MarginPadding { Top = ToolbarOffset };
             overlayContent.Padding = new MarginPadding { Top = ToolbarOffset };
 
-            MenuCursorContainer.CanShowCursor = currentScreen?.CursorVisible ?? false;
+            MenuCursorContainer.CanShowCursor = (screenStack.CurrentScreen as IOsuScreen)?.CursorVisible ?? false;
         }
 
         /// <summary>
@@ -748,24 +762,41 @@ namespace osu.Game
             this.ruleset.Disabled = rulesetDisabled;
         }
 
-        protected virtual void ScreenChanged(OsuScreen current, Screen newScreen)
+        protected virtual void ScreenChanged(IScreen lastScreen, IScreen newScreen)
         {
-            currentScreen = (OsuScreen)newScreen;
+            switch (newScreen)
+            {
+                case Intro intro:
+                    introScreen = intro;
+                    break;
+                case MainMenu menu:
+                    menuScreen = menu;
+                    break;
+            }
+
+            if (newScreen is IOsuScreen newOsuScreen)
+            {
+                backgroundParallax.ParallaxAmount = ParallaxContainer.DEFAULT_PARALLAX_AMOUNT * newOsuScreen.BackgroundParallaxAmount;
+
+                OverlayActivationMode.Value = newOsuScreen.InitialOverlayActivationMode;
+
+                if (newOsuScreen.HideOverlaysOnEnter)
+                    CloseAllOverlays();
+                else
+                    Toolbar.State = Visibility.Visible;
+            }
         }
 
-        private void screenAdded(Screen newScreen)
+        private void screenPushed(IScreen lastScreen, IScreen newScreen)
         {
-            ScreenChanged(currentScreen, newScreen);
+            ScreenChanged(lastScreen, newScreen);
             Logger.Log($"Screen changed → {newScreen}");
-
-            newScreen.ModePushed += screenAdded;
-            newScreen.Exited += screenRemoved;
         }
 
-        private void screenRemoved(Screen newScreen)
+        private void screenExited(IScreen lastScreen, IScreen newScreen)
         {
-            ScreenChanged(currentScreen, newScreen);
-            Logger.Log($"Screen changed ← {currentScreen}");
+            ScreenChanged(lastScreen, newScreen);
+            Logger.Log($"Screen changed ← {newScreen}");
 
             if (newScreen == null)
                 Exit();

osu.Game/OsuGameBase.cs

@@ -111,8 +111,8 @@ namespace osu.Game
 
             dependencies.Cache(contextFactory = new DatabaseContextFactory(Host.Storage));
 
-            var largeStore = new LargeTextureStore(new TextureLoaderStore(new NamespacedResourceStore<byte[]>(Resources, @"Textures")));
-            largeStore.AddStore(new TextureLoaderStore(new OnlineStore()));
+            var largeStore = new LargeTextureStore(Host.CreateTextureLoaderStore(new NamespacedResourceStore<byte[]>(Resources, @"Textures")));
+            largeStore.AddStore(Host.CreateTextureLoaderStore(new OnlineStore()));
             dependencies.Cache(largeStore);
 
             dependencies.CacheAs(this);

osu.Game/Overlays/AccountCreation/AccountCreationScreen.cs

@@ -8,22 +8,22 @@ namespace osu.Game.Overlays.AccountCreation
 {
     public abstract class AccountCreationScreen : Screen
     {
-        protected override void OnEntering(Screen last)
+        public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);
-            Content.FadeOut().Delay(200).FadeIn(200);
+            this.FadeOut().Delay(200).FadeIn(200);
         }
 
-        protected override void OnResuming(Screen last)
+        public override void OnResuming(IScreen last)
         {
             base.OnResuming(last);
-            Content.FadeIn(200);
+            this.FadeIn(200);
         }
 
-        protected override void OnSuspending(Screen next)
+        public override void OnSuspending(IScreen next)
         {
             base.OnSuspending(next);
-            Content.FadeOut(200);
+            this.FadeOut(200);
         }
     }
 }

osu.Game/Overlays/AccountCreation/ScreenEntry.cs

@@ -10,6 +10,7 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.MathUtils;
+using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -38,13 +39,15 @@ namespace osu.Game.Overlays.AccountCreation
 
         private OsuTextBox[] textboxes;
         private ProcessingOverlay processingOverlay;
+        private GameHost host;
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, APIAccess api)
+        private void load(OsuColour colours, APIAccess api, GameHost host)
         {
             this.api = api;
+            this.host = host;
 
-            Children = new Drawable[]
+            InternalChildren = new Drawable[]
             {
                 new FillFlowContainer
                 {
@@ -139,11 +142,11 @@ namespace osu.Game.Overlays.AccountCreation
         {
             base.Update();
 
-            if (!textboxes.Any(t => t.HasFocus))
+            if (host?.OnScreenKeyboardOverlapsGameWindow != true && !textboxes.Any(t => t.HasFocus))
                 focusNextTextbox();
         }
 
-        protected override void OnEntering(Screen last)
+        public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);
             processingOverlay.Hide();

osu.Game/Overlays/AccountCreation/ScreenWarning.cs

@@ -26,12 +26,12 @@ namespace osu.Game.Overlays.AccountCreation
 
         private const string help_centre_url = "/help/wiki/Help_Centre#login";
 
-        protected override void OnEntering(Screen last)
+        public override void OnEntering(IScreen last)
         {
             if (string.IsNullOrEmpty(api.ProvidedUsername))
             {
-                Content.FadeOut();
-                Push(new ScreenEntry());
+                this.FadeOut();
+                this.Push(new ScreenEntry());
                 return;
             }
 
@@ -46,7 +46,7 @@ namespace osu.Game.Overlays.AccountCreation
             if (string.IsNullOrEmpty(api.ProvidedUsername))
                 return;
 
-            Children = new Drawable[]
+            InternalChildren = new Drawable[]
             {
                 new Sprite
                 {
@@ -104,7 +104,7 @@ namespace osu.Game.Overlays.AccountCreation
                         new DangerousSettingsButton
                         {
                             Text = "I understand. This account isn't for me.",
-                            Action = () => Push(new ScreenEntry())
+                            Action = () => this.Push(new ScreenEntry())
                         },
                         furtherAssistance = new LinkFlowContainer(cp => { cp.TextSize = 12; })
                         {

osu.Game/Overlays/AccountCreation/ScreenWelcome.cs

@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Screens;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays.Settings;
 using osu.Game.Screens.Menu;
@@ -16,7 +17,7 @@ namespace osu.Game.Overlays.AccountCreation
         [BackgroundDependencyLoader]
         private void load()
         {
-            Child = new FillFlowContainer
+            InternalChild = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.Both,
                 Direction = FillDirection.Vertical,
@@ -56,7 +57,7 @@ namespace osu.Game.Overlays.AccountCreation
                     {
                         Text = "Let's create an account!",
                         Margin = new MarginPadding { Vertical = 120 },
-                        Action = () => Push(new ScreenWarning())
+                        Action = () => this.Push(new ScreenWarning())
                     }
                 }
             };

osu.Game/Overlays/AccountCreationOverlay.cs

@@ -6,6 +6,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Screens;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API;
@@ -82,7 +83,7 @@ namespace osu.Game.Overlays
             base.PopIn();
             this.FadeIn(transition_time, Easing.OutQuint);
 
-            if (welcomeScreen.ChildScreen != null)
+            if (welcomeScreen.GetChildScreen() != null)
                 welcomeScreen.MakeCurrent();
         }
 

osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs

@@ -7,42 +7,138 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API;
+using osu.Game.Overlays.Direct;
 using osu.Game.Users;
 using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Overlays.BeatmapSet.Buttons
 {
-    public class DownloadButton : HeaderButton, IHasTooltip
+    public class DownloadButton : DownloadTrackingComposite, IHasTooltip
     {
-        public string TooltipText => "Download this beatmap";
+        private readonly bool noVideo;
+
+        public string TooltipText => button.Enabled ? "Download this beatmap" : "Login to download";
 
         private readonly IBindable<User> localUser = new Bindable<User>();
 
-        public DownloadButton(BeatmapSetInfo set, bool noVideo = false)
-        {
-            Width = 120;
+        private ShakeContainer shakeContainer;
+        private HeaderButton button;
 
-            BeatmapSetDownloader downloader;
-            Add(new Container
+        public DownloadButton(BeatmapSetInfo beatmapSet, bool noVideo = false)
+            : base(beatmapSet)
+        {
+            this.noVideo = noVideo;
+
+            Width = 120;
+            RelativeSizeAxes = Axes.Y;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(APIAccess api, BeatmapManager beatmaps)
+        {
+            FillFlowContainer textSprites;
+
+            AddRangeInternal(new Drawable[]
             {
-                Depth = -1,
-                RelativeSizeAxes = Axes.Both,
-                Padding = new MarginPadding { Horizontal = 10 },
-                Children = new Drawable[]
+                shakeContainer = new ShakeContainer
                 {
-                    downloader = new BeatmapSetDownloader(set, noVideo),
-                    new FillFlowContainer
+                    Depth = -1,
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    CornerRadius = 5,
+                    Children = new Drawable[]
                     {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        AutoSizeAxes = Axes.Both,
-                        Direction = FillDirection.Vertical,
-                        Children = new[]
+                        button = new HeaderButton { RelativeSizeAxes = Axes.Both },
+                        new Container
+                        {
+                            // cannot nest inside here due to the structure of button (putting things in its own content).
+                            // requires framework fix.
+                            Padding = new MarginPadding { Horizontal = 10 },
+                            RelativeSizeAxes = Axes.Both,
+                            Children = new Drawable[]
+                            {
+                                textSprites = new FillFlowContainer
+                                {
+                                    Depth = -1,
+                                    Anchor = Anchor.CentreLeft,
+                                    Origin = Anchor.CentreLeft,
+                                    AutoSizeAxes = Axes.Both,
+                                    AutoSizeDuration = 500,
+                                    AutoSizeEasing = Easing.OutQuint,
+                                    Direction = FillDirection.Vertical,
+                                },
+                                new SpriteIcon
+                                {
+                                    Depth = -1,
+                                    Anchor = Anchor.CentreRight,
+                                    Origin = Anchor.CentreRight,
+                                    Icon = FontAwesome.fa_download,
+                                    Size = new Vector2(16),
+                                    Margin = new MarginPadding { Right = 5 },
+                                },
+                            }
+                        },
+                        new DownloadProgressBar(BeatmapSet)
+                        {
+                            Depth = -2,
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                        },
+                    },
+                },
+            });
+
+            button.Action = () =>
+            {
+                if (State.Value != DownloadState.NotDownloaded)
+                {
+                    shakeContainer.Shake();
+                    return;
+                }
+
+                beatmaps.Download(BeatmapSet, noVideo);
+            };
+
+            localUser.BindTo(api.LocalUser);
+            localUser.BindValueChanged(userChanged, true);
+            button.Enabled.BindValueChanged(enabledChanged, true);
+
+            State.BindValueChanged(state =>
+            {
+                switch (state)
+                {
+                    case DownloadState.Downloading:
+                        textSprites.Children = new Drawable[]
+                        {
+                            new OsuSpriteText
+                            {
+                                Text = "Downloading...",
+                                TextSize = 13,
+                                Font = @"Exo2.0-Bold",
+                            },
+                        };
+                        break;
+                    case DownloadState.Downloaded:
+                        textSprites.Children = new Drawable[]
+                        {
+                            new OsuSpriteText
+                            {
+                                Text = "Importing...",
+                                TextSize = 13,
+                                Font = @"Exo2.0-Bold",
+                            },
+                        };
+                        break;
+                    case DownloadState.LocallyAvailable:
+                        this.FadeOut(200);
+                        break;
+                    case DownloadState.NotDownloaded:
+                        textSprites.Children = new Drawable[]
                         {
                             new OsuSpriteText
                             {
@@ -52,57 +148,18 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
                             },
                             new OsuSpriteText
                             {
-                                Text = set.OnlineInfo.HasVideo && noVideo ? "without Video" : string.Empty,
+                                Text = BeatmapSet.Value.OnlineInfo.HasVideo && noVideo ? "without Video" : string.Empty,
                                 TextSize = 11,
                                 Font = @"Exo2.0-Bold",
                             },
-                        },
-                    },
-                    new SpriteIcon
-                    {
-                        Anchor = Anchor.CentreRight,
-                        Origin = Anchor.CentreRight,
-                        Icon = FontAwesome.fa_download,
-                        Size = new Vector2(16),
-                        Margin = new MarginPadding { Right = 5 },
-                    },
-                },
-            });
-
-            Action = () =>
-            {
-                if (downloader.DownloadState.Value == BeatmapSetDownloader.DownloadStatus.Downloading)
-                {
-                    Content.MoveToX(-5, 50, Easing.OutSine).Then()
-                           .MoveToX(5, 100, Easing.InOutSine).Then()
-                           .MoveToX(-5, 100, Easing.InOutSine).Then()
-                           .MoveToX(0, 50, Easing.InSine);
-                    return;
-                }
-
-                downloader.Download();
-            };
-
-            downloader.DownloadState.ValueChanged += state =>
-            {
-                switch (state)
-                {
-                    case BeatmapSetDownloader.DownloadStatus.Downloaded:
-                        this.FadeOut(200);
-                        break;
-                    case BeatmapSetDownloader.DownloadStatus.NotDownloaded:
+                        };
                         this.FadeIn(200);
                         break;
                 }
-            };
+            }, true);
         }
 
-        [BackgroundDependencyLoader]
-        private void load(APIAccess api)
-        {
-            localUser.BindTo(api.LocalUser);
-            Enabled.BindValueChanged(enabledChanged, true);
-        }
+        private void userChanged(User user) => button.Enabled.Value = !(user is GuestUser);
 
         private void enabledChanged(bool enabled) => this.FadeColour(enabled ? Color4.White : Color4.Gray, 200, Easing.OutQuint);
     }

osu.Game/Overlays/BeatmapSet/Header.cs

@@ -13,12 +13,14 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.BeatmapSet.Buttons;
+using osu.Game.Overlays.Direct;
 using osuTK;
 using osuTK.Graphics;
+using DownloadButton = osu.Game.Overlays.BeatmapSet.Buttons.DownloadButton;
 
 namespace osu.Game.Overlays.BeatmapSet
 {
-    public class Header : Container
+    public class Header : DownloadTrackingComposite
     {
         private const float transition_duration = 200;
         private const float tabs_height = 50;
@@ -28,76 +30,23 @@ namespace osu.Game.Overlays.BeatmapSet
         private readonly Box tabsBg;
         private readonly UpdateableBeatmapSetCover cover;
         private readonly OsuSpriteText title, artist;
-        private readonly Container noVideoButtons;
-        private readonly FillFlowContainer videoButtons;
         private readonly AuthorInfo author;
-        private readonly Container downloadButtonsContainer;
+        private readonly FillFlowContainer downloadButtonsContainer;
         private readonly BeatmapSetOnlineStatusPill onlineStatusPill;
         public Details Details;
 
         public readonly BeatmapPicker Picker;
 
-        private BeatmapSetInfo beatmapSet;
         private readonly FavouriteButton favouriteButton;
 
-        public BeatmapSetInfo BeatmapSet
-        {
-            get { return beatmapSet; }
-            set
-            {
-                if (value == beatmapSet) return;
-                beatmapSet = value;
-
-                Picker.BeatmapSet = author.BeatmapSet = Details.BeatmapSet = BeatmapSet;
-
-                updateDisplay();
-            }
-        }
-
-        private void updateDisplay()
-        {
-            title.Text = BeatmapSet?.Metadata.Title ?? string.Empty;
-            artist.Text = BeatmapSet?.Metadata.Artist ?? string.Empty;
-            onlineStatusPill.Status = BeatmapSet?.OnlineInfo.Status ?? BeatmapSetOnlineStatus.None;
-            cover.BeatmapSet = BeatmapSet;
-
-            if (BeatmapSet != null)
-            {
-                downloadButtonsContainer.FadeIn(transition_duration);
-                favouriteButton.FadeIn(transition_duration);
-
-                if (BeatmapSet.OnlineInfo.HasVideo)
-                {
-                    videoButtons.Children = new[]
-                    {
-                        new DownloadButton(BeatmapSet),
-                        new DownloadButton(BeatmapSet, true),
-                    };
-
-                    videoButtons.FadeIn(transition_duration);
-                    noVideoButtons.FadeOut(transition_duration);
-                }
-                else
-                {
-                    noVideoButtons.Child = new DownloadButton(BeatmapSet);
-
-                    noVideoButtons.FadeIn(transition_duration);
-                    videoButtons.FadeOut(transition_duration);
-                }
-            }
-            else
-            {
-                downloadButtonsContainer.FadeOut(transition_duration);
-                favouriteButton.FadeOut(transition_duration);
-            }
-        }
-
         public Header()
         {
             ExternalLinkButton externalLink;
+
             RelativeSizeAxes = Axes.X;
             Height = 400;
             Masking = true;
+
             EdgeEffect = new EdgeEffectParameters
             {
                 Colour = Color4.Black.Opacity(0.25f),
@@ -105,7 +54,8 @@ namespace osu.Game.Overlays.BeatmapSet
                 Radius = 3,
                 Offset = new Vector2(0f, 1f),
             };
-            Children = new Drawable[]
+
+            InternalChildren = new Drawable[]
             {
                 new Container
                 {
@@ -196,24 +146,11 @@ namespace osu.Game.Overlays.BeatmapSet
                                         Children = new Drawable[]
                                         {
                                             favouriteButton = new FavouriteButton(),
-                                            downloadButtonsContainer = new Container
+                                            downloadButtonsContainer = new FillFlowContainer
                                             {
                                                 RelativeSizeAxes = Axes.Both,
                                                 Padding = new MarginPadding { Left = buttons_height + buttons_spacing },
-                                                Children = new Drawable[]
-                                                {
-                                                    noVideoButtons = new Container
-                                                    {
-                                                        RelativeSizeAxes = Axes.Both,
-                                                        Alpha = 0f,
-                                                    },
-                                                    videoButtons = new FillFlowContainer
-                                                    {
-                                                        RelativeSizeAxes = Axes.Both,
-                                                        Spacing = new Vector2(buttons_spacing),
-                                                        Alpha = 0f,
-                                                    },
-                                                },
+                                                Spacing = new Vector2(buttons_spacing),
                                             },
                                         },
                                     },
@@ -245,14 +182,64 @@ namespace osu.Game.Overlays.BeatmapSet
             };
 
             Picker.Beatmap.ValueChanged += b => Details.Beatmap = b;
-            Picker.Beatmap.ValueChanged += b => externalLink.Link = $@"https://osu.ppy.sh/beatmapsets/{BeatmapSet?.OnlineBeatmapSetID}#{b?.Ruleset.ShortName}/{b?.OnlineBeatmapID}";
+            Picker.Beatmap.ValueChanged += b => externalLink.Link = $@"https://osu.ppy.sh/beatmapsets/{BeatmapSet.Value?.OnlineBeatmapSetID}#{b?.Ruleset.ShortName}/{b?.OnlineBeatmapID}";
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
             tabsBg.Colour = colours.Gray3;
-            updateDisplay();
+
+            State.BindValueChanged(_ => updateDownloadButtons());
+
+            BeatmapSet.BindValueChanged(beatmapSet =>
+            {
+                Picker.BeatmapSet = author.BeatmapSet = Details.BeatmapSet = beatmapSet;
+
+                title.Text = beatmapSet?.Metadata.Title ?? string.Empty;
+                artist.Text = beatmapSet?.Metadata.Artist ?? string.Empty;
+                onlineStatusPill.Status = beatmapSet?.OnlineInfo.Status ?? BeatmapSetOnlineStatus.None;
+                cover.BeatmapSet = beatmapSet;
+
+                if (beatmapSet != null)
+                {
+                    downloadButtonsContainer.FadeIn(transition_duration);
+                    favouriteButton.FadeIn(transition_duration);
+                }
+                else
+                {
+                    downloadButtonsContainer.FadeOut(transition_duration);
+                    favouriteButton.FadeOut(transition_duration);
+                }
+
+                updateDownloadButtons();
+            }, true);
+        }
+
+        private void updateDownloadButtons()
+        {
+            if (BeatmapSet.Value == null) return;
+            switch (State.Value)
+            {
+                case DownloadState.LocallyAvailable:
+                    // temporary for UX until new design is implemented.
+                    downloadButtonsContainer.Child = new osu.Game.Overlays.Direct.DownloadButton(BeatmapSet)
+                    {
+                        Width = 50,
+                        RelativeSizeAxes = Axes.Y
+                    };
+                    break;
+                case DownloadState.Downloading:
+                case DownloadState.Downloaded:
+                    // temporary to avoid showing two buttons for maps with novideo. will be fixed in new beatmap overlay design.
+                    downloadButtonsContainer.Child = new DownloadButton(BeatmapSet);
+                    break;
+                default:
+                    downloadButtonsContainer.Child = new DownloadButton(BeatmapSet);
+                    if (BeatmapSet.Value.OnlineInfo.HasVideo)
+                        downloadButtonsContainer.Add(new DownloadButton(BeatmapSet, true));
+                    break;
+            }
         }
     }
 }

osu.Game/Overlays/BeatmapSetOverlay.cs

@@ -46,7 +46,7 @@ namespace osu.Game.Overlays
                 if (value == beatmapSet)
                     return;
 
-                header.BeatmapSet = info.BeatmapSet = beatmapSet = value;
+                header.BeatmapSet.Value = info.BeatmapSet = beatmapSet = value;
             }
         }
 
@@ -140,7 +140,7 @@ namespace osu.Game.Overlays
             req.Success += res =>
             {
                 BeatmapSet = res.ToBeatmapSet(rulesets);
-                header.Picker.Beatmap.Value = header.BeatmapSet.Beatmaps.First(b => b.OnlineBeatmapID == beatmapId);
+                header.Picker.Beatmap.Value = header.BeatmapSet.Value.Beatmaps.First(b => b.OnlineBeatmapID == beatmapId);
             };
             api.Queue(req);
             Show();

osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs

@@ -164,7 +164,7 @@ namespace osu.Game.Overlays.Chat.Selection
 
         protected override void OnFocus(FocusEvent e)
         {
-            GetContainingInputManager().ChangeFocus(search);
+            search.TakeFocus();
             base.OnFocus(e);
         }
 

osu.Game/Overlays/ChatOverlay.cs

@@ -302,7 +302,7 @@ namespace osu.Game.Overlays
         protected override void OnFocus(FocusEvent e)
         {
             //this is necessary as textbox is masked away and therefore can't get focus :(
-            GetContainingInputManager().ChangeFocus(textbox);
+            textbox.TakeFocus();
             base.OnFocus(e);
         }
 

osu.Game/Overlays/Direct/DirectPanel.cs

@@ -16,8 +16,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.API.Requests;
 using osuTK;
 using osuTK.Graphics;
 
@@ -31,8 +29,6 @@ namespace osu.Game.Overlays.Direct
 
         private Container content;
 
-        private ProgressBar progressBar;
-        private BeatmapManager beatmaps;
         private BeatmapSetOverlay beatmapSetOverlay;
 
         public PreviewTrack Preview => PlayButton.Preview;
@@ -65,14 +61,10 @@ namespace osu.Game.Overlays.Direct
             Colour = Color4.Black.Opacity(0.3f),
         };
 
-        private OsuColour colours;
-
         [BackgroundDependencyLoader(permitNulls: true)]
         private void load(BeatmapManager beatmaps, OsuColour colours, BeatmapSetOverlay beatmapSetOverlay)
         {
-            this.beatmaps = beatmaps;
             this.beatmapSetOverlay = beatmapSetOverlay;
-            this.colours = colours;
 
             AddInternal(content = new Container
             {
@@ -82,33 +74,14 @@ namespace osu.Game.Overlays.Direct
                 Children = new[]
                 {
                     CreateBackground(),
-                    progressBar = new ProgressBar
+                    new DownloadProgressBar(SetInfo)
                     {
                         Anchor = Anchor.BottomLeft,
                         Origin = Anchor.BottomLeft,
-                        Height = 0,
-                        Alpha = 0,
-                        BackgroundColour = Color4.Black.Opacity(0.7f),
-                        FillColour = colours.Blue,
                         Depth = -1,
                     },
                 }
             });
-
-            var downloadRequest = beatmaps.GetExistingDownload(SetInfo);
-
-            if (downloadRequest != null)
-                attachDownload(downloadRequest);
-
-            beatmaps.BeatmapDownloadBegan += attachDownload;
-            beatmaps.ItemAdded += setAdded;
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            beatmaps.BeatmapDownloadBegan -= attachDownload;
-            beatmaps.ItemAdded -= setAdded;
         }
 
         protected override void Update()
@@ -149,37 +122,6 @@ namespace osu.Game.Overlays.Direct
 
         protected void ShowInformation() => beatmapSetOverlay?.ShowBeatmapSet(SetInfo);
 
-        private void attachDownload(DownloadBeatmapSetRequest request)
-        {
-            if (request.BeatmapSet.OnlineBeatmapSetID != SetInfo.OnlineBeatmapSetID)
-                return;
-
-            progressBar.FadeIn(400, Easing.OutQuint);
-            progressBar.ResizeHeightTo(4, 400, Easing.OutQuint);
-
-            progressBar.Current.Value = 0;
-
-            request.Failure += e =>
-            {
-                progressBar.Current.Value = 0;
-                progressBar.FadeOut(500);
-            };
-
-            request.DownloadProgressed += progress => Schedule(() => progressBar.Current.Value = progress);
-
-            request.Success += data =>
-            {
-                progressBar.Current.Value = 1;
-                progressBar.FillColour = colours.Yellow;
-            };
-        }
-
-        private void setAdded(BeatmapSetInfo s, bool existing, bool silent) => Schedule(() =>
-        {
-            if (s.OnlineBeatmapSetID == SetInfo.OnlineBeatmapSetID)
-                progressBar.FadeOut(500);
-        });
-
         protected override void LoadComplete()
         {
             base.LoadComplete();

osu.Game/Overlays/Direct/DownloadButton.cs

@@ -5,103 +5,114 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osuTK;
 
 namespace osu.Game.Overlays.Direct
 {
-    public class DownloadButton : OsuAnimatedButton
+    public class DownloadButton : DownloadTrackingComposite
     {
-        private readonly BeatmapSetInfo beatmapSet;
+        private readonly bool noVideo;
         private readonly SpriteIcon icon;
         private readonly SpriteIcon checkmark;
-        private readonly BeatmapSetDownloader downloader;
         private readonly Box background;
 
         private OsuColour colours;
 
-        public DownloadButton(BeatmapSetInfo beatmapSet, bool noVideo = false)
-        {
-            this.beatmapSet = beatmapSet;
+        private readonly ShakeContainer shakeContainer;
 
-            AddRange(new Drawable[]
+        private readonly OsuAnimatedButton button;
+
+        public DownloadButton(BeatmapSetInfo beatmapSet, bool noVideo = false)
+            : base(beatmapSet)
+        {
+            this.noVideo = noVideo;
+
+            InternalChild = shakeContainer = new ShakeContainer
             {
-                downloader = new BeatmapSetDownloader(beatmapSet, noVideo),
-                background = new Box
+                RelativeSizeAxes = Axes.Both,
+                Child = button = new OsuAnimatedButton
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Depth = float.MaxValue
-                },
-                icon = new SpriteIcon
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Size = new Vector2(13),
-                    Icon = FontAwesome.fa_download,
-                },
-                checkmark = new SpriteIcon
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    X = 8,
-                    Size = Vector2.Zero,
-                    Icon = FontAwesome.fa_check,
+                    Children = new Drawable[]
+                    {
+                        background = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Depth = float.MaxValue
+                        },
+                        icon = new SpriteIcon
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Size = new Vector2(13),
+                            Icon = FontAwesome.fa_download,
+                        },
+                        checkmark = new SpriteIcon
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            X = 8,
+                            Size = Vector2.Zero,
+                            Icon = FontAwesome.fa_check,
+                        }
+                    }
                 }
-            });
+            };
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            downloader.DownloadState.BindValueChanged(updateState, true);
+
+            State.BindValueChanged(updateState, true);
             FinishTransforms(true);
         }
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(OsuColour colours, OsuGame game)
+        private void load(OsuColour colours, OsuGame game, BeatmapManager beatmaps)
         {
             this.colours = colours;
 
-            Action = () =>
+            button.Action = () =>
             {
-                switch (downloader.DownloadState.Value)
+                switch (State.Value)
                 {
-                    case BeatmapSetDownloader.DownloadStatus.Downloading:
-                        // todo: replace with ShakeContainer after https://github.com/ppy/osu/pull/2909 is merged.
-                        Content.MoveToX(-5, 50, Easing.OutSine).Then()
-                               .MoveToX(5, 100, Easing.InOutSine).Then()
-                               .MoveToX(-5, 100, Easing.InOutSine).Then()
-                               .MoveToX(0, 50, Easing.InSine);
+                    case DownloadState.Downloading:
+                    case DownloadState.Downloaded:
+                        shakeContainer.Shake();
                         break;
-                    case BeatmapSetDownloader.DownloadStatus.Downloaded:
-                        game.PresentBeatmap(beatmapSet);
+                    case DownloadState.LocallyAvailable:
+                        game.PresentBeatmap(BeatmapSet);
                         break;
                     default:
-                        downloader.Download();
+                        beatmaps.Download(BeatmapSet, noVideo);
                         break;
                 }
             };
         }
 
-        private void updateState(BeatmapSetDownloader.DownloadStatus state)
+        private void updateState(DownloadState state)
         {
             switch (state)
             {
-                case BeatmapSetDownloader.DownloadStatus.NotDownloaded:
+                case DownloadState.NotDownloaded:
                     background.FadeColour(colours.Gray4, 500, Easing.InOutExpo);
                     icon.MoveToX(0, 500, Easing.InOutExpo);
                     checkmark.ScaleTo(Vector2.Zero, 500, Easing.InOutExpo);
                     break;
 
-                case BeatmapSetDownloader.DownloadStatus.Downloading:
+                case DownloadState.Downloading:
                     background.FadeColour(colours.Blue, 500, Easing.InOutExpo);
                     icon.MoveToX(0, 500, Easing.InOutExpo);
                     checkmark.ScaleTo(Vector2.Zero, 500, Easing.InOutExpo);
                     break;
-
-                case BeatmapSetDownloader.DownloadStatus.Downloaded:
+                case DownloadState.Downloaded:
+                    background.FadeColour(colours.Yellow, 500, Easing.InOutExpo);
+                    break;
+                case DownloadState.LocallyAvailable:
                     background.FadeColour(colours.Green, 500, Easing.InOutExpo);
                     icon.MoveToX(-8, 500, Easing.InOutExpo);
                     checkmark.ScaleTo(new Vector2(13), 500, Easing.InOutExpo);

osu.Game/Overlays/Direct/DownloadProgressBar.cs

@@ -0,0 +1,64 @@
+// 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.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.Direct
+{
+    public class DownloadProgressBar : DownloadTrackingComposite
+    {
+        private readonly ProgressBar progressBar;
+
+        public DownloadProgressBar(BeatmapSetInfo beatmapSet)
+            : base(beatmapSet)
+        {
+            AddInternal(progressBar = new ProgressBar
+            {
+                Height = 0,
+                Alpha = 0,
+            });
+
+            AutoSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.X;
+        }
+
+        [BackgroundDependencyLoader(true)]
+        private void load(OsuColour colours)
+        {
+            progressBar.FillColour = colours.Blue;
+            progressBar.BackgroundColour = Color4.Black.Opacity(0.7f);
+            progressBar.Current = Progress;
+
+            State.BindValueChanged(state =>
+            {
+                switch (state)
+                {
+                    case DownloadState.NotDownloaded:
+                        progressBar.Current.Value = 0;
+                        progressBar.FadeOut(500);
+                        break;
+                    case DownloadState.Downloading:
+                        progressBar.FadeIn(400, Easing.OutQuint);
+                        progressBar.ResizeHeightTo(4, 400, Easing.OutQuint);
+                        break;
+                    case DownloadState.Downloaded:
+                        progressBar.FadeIn(400, Easing.OutQuint);
+                        progressBar.ResizeHeightTo(4, 400, Easing.OutQuint);
+
+                        progressBar.Current.Value = 1;
+                        progressBar.FillColour = colours.Yellow;
+                        break;
+                    case DownloadState.LocallyAvailable:
+                        progressBar.FadeOut(500);
+                        break;
+                }
+            }, true);
+        }
+    }
+}

osu.Game/Overlays/Direct/DownloadState.cs

@@ -0,0 +1,13 @@
+// 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.
+
+namespace osu.Game.Overlays.Direct
+{
+    public enum DownloadState
+    {
+        NotDownloaded,
+        Downloading,
+        Downloaded,
+        LocallyAvailable
+    }
+}

osu.Game/Overlays/Direct/DownloadTrackingComposite.cs

@@ -0,0 +1,131 @@
+// 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;
+using Microsoft.EntityFrameworkCore.Internal;
+using osu.Framework.Allocation;
+using osu.Framework.Configuration;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Online.API.Requests;
+
+namespace osu.Game.Overlays.Direct
+{
+    public abstract class DownloadTrackingComposite : CompositeDrawable
+    {
+        public readonly Bindable<BeatmapSetInfo> BeatmapSet = new Bindable<BeatmapSetInfo>();
+
+        private BeatmapManager beatmaps;
+
+        /// <summary>
+        /// Holds the current download state of the beatmap, whether is has already been downloaded, is in progress, or is not downloaded.
+        /// </summary>
+        protected readonly Bindable<DownloadState> State = new Bindable<DownloadState>();
+
+        protected readonly Bindable<double> Progress = new Bindable<double>();
+
+        protected DownloadTrackingComposite(BeatmapSetInfo beatmapSet = null)
+        {
+            BeatmapSet.Value = beatmapSet;
+        }
+
+        [BackgroundDependencyLoader(true)]
+        private void load(BeatmapManager beatmaps)
+        {
+            this.beatmaps = beatmaps;
+
+            BeatmapSet.BindValueChanged(set =>
+            {
+                if (set == null)
+                    attachDownload(null);
+                else if (beatmaps.QueryBeatmapSets(s => s.OnlineBeatmapSetID == set.OnlineBeatmapSetID).Any())
+                    State.Value = DownloadState.LocallyAvailable;
+                else
+                    attachDownload(beatmaps.GetExistingDownload(set));
+            }, true);
+
+            beatmaps.BeatmapDownloadBegan += download =>
+            {
+                if (download.BeatmapSet.OnlineBeatmapSetID == BeatmapSet.Value?.OnlineBeatmapSetID)
+                    attachDownload(download);
+            };
+
+            beatmaps.ItemAdded += setAdded;
+        }
+
+        #region Disposal
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            beatmaps.BeatmapDownloadBegan -= attachDownload;
+            beatmaps.ItemAdded -= setAdded;
+
+            State.UnbindAll();
+
+            attachDownload(null);
+        }
+
+        #endregion
+
+        private DownloadBeatmapSetRequest attachedRequest;
+
+        private void attachDownload(DownloadBeatmapSetRequest request)
+        {
+            if (attachedRequest != null)
+            {
+                attachedRequest.Failure -= onRequestFailure;
+                attachedRequest.DownloadProgressed -= onRequestProgress;
+                attachedRequest.Success -= onRequestSuccess;
+            }
+
+            attachedRequest = request;
+
+            if (attachedRequest != null)
+            {
+                if (attachedRequest.Progress == 1)
+                {
+                    State.Value = DownloadState.Downloaded;
+                    Progress.Value = 1;
+                }
+                else
+                {
+                    State.Value = DownloadState.Downloading;
+                    Progress.Value = attachedRequest.Progress;
+
+                    attachedRequest.Failure += onRequestFailure;
+                    attachedRequest.DownloadProgressed += onRequestProgress;
+                    attachedRequest.Success += onRequestSuccess;
+                }
+            }
+            else
+            {
+                State.Value = DownloadState.NotDownloaded;
+            }
+        }
+
+        private void onRequestSuccess(string data)
+        {
+            Schedule(() => State.Value = DownloadState.Downloaded);
+        }
+
+        private void onRequestProgress(float progress)
+        {
+            Schedule(() => Progress.Value = progress);
+        }
+
+        private void onRequestFailure(Exception e)
+        {
+            Schedule(() => attachDownload(null));
+        }
+
+        private void setAdded(BeatmapSetInfo s, bool existing, bool silent)
+        {
+            if (s.OnlineBeatmapSetID != BeatmapSet.Value?.OnlineBeatmapSetID)
+                return;
+
+            Schedule(() => State.Value = DownloadState.LocallyAvailable);
+        }
+    }
+}

osu.Game/Overlays/Music/FilterControl.cs

@@ -1,7 +1,6 @@
 // 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.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
@@ -53,10 +52,9 @@ namespace osu.Game.Overlays.Music
 
         public class FilterTextBox : SearchTextBox
         {
-            private Color4 backgroundColour;
+            protected override Color4 BackgroundUnfocused => OsuColour.Gray(0.06f);
+            protected override Color4 BackgroundFocused => OsuColour.Gray(0.12f);
 
-            protected override Color4 BackgroundUnfocused => backgroundColour;
-            protected override Color4 BackgroundFocused => backgroundColour;
             protected override bool AllowCommit => true;
 
             public FilterTextBox()
@@ -64,12 +62,6 @@ namespace osu.Game.Overlays.Music
                 Masking = true;
                 CornerRadius = 5;
             }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                backgroundColour = colours.Gray2;
-            }
         }
     }
 }

osu.Game/Overlays/Music/PlaylistOverlay.cs

@@ -92,7 +92,7 @@ namespace osu.Game.Overlays.Music
         protected override void PopIn()
         {
             filter.Search.HoldFocus = true;
-            Schedule(() => GetContainingInputManager().ChangeFocus(filter.Search));
+            Schedule(() => filter.Search.TakeFocus());
 
             this.ResizeTo(new Vector2(1, playlist_height), transition_duration, Easing.OutQuint);
             this.FadeIn(transition_duration, Easing.OutQuint);

osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs

@@ -127,17 +127,10 @@ namespace osu.Game.Overlays.SearchableList
 
         private class FilterSearchTextBox : SearchTextBox
         {
-            protected override Color4 BackgroundUnfocused => backgroundColour;
-            protected override Color4 BackgroundFocused => backgroundColour;
+            protected override Color4 BackgroundUnfocused => OsuColour.Gray(0.06f);
+            protected override Color4 BackgroundFocused => OsuColour.Gray(0.12f);
+
             protected override bool AllowCommit => true;
-
-            private Color4 backgroundColour;
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                backgroundColour = colours.Gray2.Opacity(0.9f);
-            }
         }
     }
 }

osu.Game/Overlays/SearchableList/SearchableListOverlay.cs

@@ -103,7 +103,7 @@ namespace osu.Game.Overlays.SearchableList
 
         protected override void OnFocus(FocusEvent e)
         {
-            GetContainingInputManager().ChangeFocus(Filter.Search);
+            Filter.Search.TakeFocus();
         }
 
         protected override void PopIn()

osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs

@@ -86,7 +86,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private class SensitivitySlider : OsuSliderBar<double>
         {
-            public override string TooltipText => Current.Disabled ? "Enable raw input to adjust sensitivity" : Current.Value.ToString(@"0.##x");
+            public override string TooltipText => Current.Disabled ? "Enable raw input to adjust sensitivity" : $"{base.TooltipText}x";
         }
     }
 }

osu.Game/Overlays/SettingsOverlay.cs

@@ -179,7 +179,7 @@ namespace osu.Game.Overlays
 
         protected override void OnFocus(FocusEvent e)
         {
-            GetContainingInputManager().ChangeFocus(searchTextBox);
+            searchTextBox.TakeFocus();
             base.OnFocus(e);
         }
 

osu.Game/Properties/AssemblyInfo.cs

@@ -9,3 +9,4 @@ using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("osu.Game.Tests")]
 [assembly: InternalsVisibleTo("osu.Game.Tests.Dynamic")]
+[assembly: InternalsVisibleTo("osu.Game.Tests.iOS")]

osu.Game/Screens/BackgroundScreen.cs

@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Threading;
 using osu.Framework.Screens;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
@@ -12,6 +11,12 @@ namespace osu.Game.Screens
 {
     public abstract class BackgroundScreen : Screen, IEquatable<BackgroundScreen>
     {
+        protected BackgroundScreen()
+        {
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+        }
+
         public virtual bool Equals(BackgroundScreen other)
         {
             return other?.GetType() == GetType();
@@ -26,64 +31,40 @@ namespace osu.Game.Screens
             return false;
         }
 
-        public override void Push(Screen screen)
-        {
-            // When trying to push a non-loaded screen, load it asynchronously and re-invoke Push
-            // once it's done.
-            if (screen.LoadState == LoadState.NotLoaded)
-            {
-                LoadComponentAsync(screen, d => Push((BackgroundScreen)d));
-                return;
-            }
-
-            // Make sure the in-progress loading is complete before pushing the screen.
-            while (screen.LoadState < LoadState.Ready)
-                Thread.Sleep(1);
-
-            try
-            {
-                base.Push(screen);
-            }
-            catch (ScreenAlreadyExitedException)
-            {
-                // screen may have exited before the push was successful.
-            }
-        }
-
         protected override void Update()
         {
             base.Update();
-            Content.Scale = new Vector2(1 + x_movement_amount / DrawSize.X * 2);
+            Scale = new Vector2(1 + x_movement_amount / DrawSize.X * 2);
         }
 
-        protected override void OnEntering(Screen last)
+        public override void OnEntering(IScreen last)
         {
-            Content.FadeOut();
-            Content.MoveToX(x_movement_amount);
+            this.FadeOut();
+            this.MoveToX(x_movement_amount);
 
-            Content.FadeIn(transition_length, Easing.InOutQuart);
-            Content.MoveToX(0, transition_length, Easing.InOutQuart);
+            this.FadeIn(transition_length, Easing.InOutQuart);
+            this.MoveToX(0, transition_length, Easing.InOutQuart);
 
             base.OnEntering(last);
         }
 
-        protected override void OnSuspending(Screen next)
+        public override void OnSuspending(IScreen next)
         {
-            Content.MoveToX(-x_movement_amount, transition_length, Easing.InOutQuart);
+            this.MoveToX(-x_movement_amount, transition_length, Easing.InOutQuart);
             base.OnSuspending(next);
         }
 
-        protected override bool OnExiting(Screen next)
+        public override bool OnExiting(IScreen next)
         {
-            Content.FadeOut(transition_length, Easing.OutExpo);
-            Content.MoveToX(x_movement_amount, transition_length, Easing.OutExpo);
+            this.FadeOut(transition_length, Easing.OutExpo);
+            this.MoveToX(x_movement_amount, transition_length, Easing.OutExpo);
 
             return base.OnExiting(next);
         }
 
-        protected override void OnResuming(Screen last)
+        public override void OnResuming(IScreen last)
         {
-            Content.MoveToX(0, transition_length, Easing.OutExpo);
+            this.MoveToX(0, transition_length, Easing.OutExpo);
             base.OnResuming(last);
         }
     }

osu.Game/Screens/BackgroundScreenStack.cs

@@ -0,0 +1,32 @@
+// 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 osu.Framework.Graphics;
+using osu.Framework.Screens;
+using osuTK;
+
+namespace osu.Game.Screens
+{
+    public class BackgroundScreenStack : ScreenStack
+    {
+        public BackgroundScreenStack()
+        {
+            Scale = new Vector2(1.06f);
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        //public float ParallaxAmount { set => parallax.ParallaxAmount = ParallaxContainer.DEFAULT_PARALLAX_AMOUNT * value; }
+
+        public new void Push(BackgroundScreen screen)
+        {
+            if (screen == null)
+                return;
+
+            if (EqualityComparer<BackgroundScreen>.Default.Equals((BackgroundScreen)CurrentScreen, screen))
+                return;
+
+            base.Push(screen);
+        }
+    }
+}

osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs

@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Backgrounds
                         }
 
                         b.Depth = newDepth;
-                        Add(Background = b);
+                        AddInternal(Background = b);
                         Background.BlurSigma = BlurTarget;
                     }));
                 });