Merge branch 'master' into fix-skip-button-clickability

README.md

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

osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs

@@ -92,25 +92,17 @@ namespace osu.Game.Overlays.Changelog
                     });
                 }
 
-                NavigationIconButton left, right;
+                fill.Insert(-1, new NavigationIconButton(Build.Versions?.Previous)
-
-                fill.AddRange(new[]
-                {
-                    left = new NavigationIconButton(Build.Versions?.Previous)
                 {
                     Icon = FontAwesome.Solid.ChevronLeft,
                     SelectBuild = b => SelectBuild(b)
-                    },
+                });
-                    right = new NavigationIconButton(Build.Versions?.Next)
+                fill.Insert(1, new NavigationIconButton(Build.Versions?.Next)
                 {
                     Icon = FontAwesome.Solid.ChevronRight,
                     SelectBuild = b => SelectBuild(b)
-                    },
                 });
 
-                fill.SetLayoutPosition(left, -1);
-                fill.SetLayoutPosition(right, 1);
-
                 return fill;
             }
         }

osu.Game/Overlays/Music/PlaylistList.cs

@@ -85,10 +85,7 @@ namespace osu.Game.Overlays.Music
 
             private void addBeatmapSet(BeatmapSetInfo obj) => Schedule(() =>
             {
-                var newItem = new PlaylistItem(obj) { OnSelect = set => Selected?.Invoke(set) };
+                items.Insert(items.Count - 1, new PlaylistItem(obj) { OnSelect = set => Selected?.Invoke(set) });
-
-                items.Add(newItem);
-                items.SetLayoutPosition(newItem, items.Count - 1);
             });
 
             private void removeBeatmapSet(BeatmapSetInfo obj) => Schedule(() =>

osu.Game/Overlays/Notifications/NotificationSection.cs

@@ -26,8 +26,7 @@ namespace osu.Game.Overlays.Notifications
 
         public void Add(Notification notification, float position)
         {
-            notifications.Add(notification);
+            notifications.Insert((int)position, notification);
-            notifications.SetLayoutPosition(notification, position);
         }
 
         public IEnumerable<Type> AcceptTypes;

osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs

@@ -78,10 +78,8 @@ namespace osu.Game.Overlays.Profile.Header
                     int displayIndex = index;
                     LoadComponentAsync(new DrawableBadge(badges[index]), asyncBadge =>
                     {
-                        badgeFlowContainer.Add(asyncBadge);
-
                         // load in stable order regardless of async load order.
-                        badgeFlowContainer.SetLayoutPosition(asyncBadge, displayIndex);
+                        badgeFlowContainer.Insert(displayIndex, asyncBadge);
                     });
                 }
             }

osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs

@@ -49,8 +49,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                 Font = OsuFont.GetFont(size: 11, weight: FontWeight.Regular, italics: true)
             };
 
-            RightFlowContainer.Add(text);
+            RightFlowContainer.Insert(1, text);
-            RightFlowContainer.SetLayoutPosition(text, 1);
 
             LeftFlowContainer.Add(new BeatmapMetadataContainer(Score.Beatmap));
             LeftFlowContainer.Add(new DrawableDate(Score.Date));

osu.Game/Overlays/Settings/SettingsItem.cs

@@ -46,8 +46,7 @@ namespace osu.Game.Overlays.Settings
                 if (text == null)
                 {
                     // construct lazily for cases where the label is not needed (may be provided by the Control).
-                    Add(text = new OsuSpriteText());
+                    FlowContent.Insert(-1, text = new OsuSpriteText());
-                    FlowContent.SetLayoutPosition(text, -1);
                 }
 
                 text.Text = value;

osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs

@@ -110,8 +110,7 @@ namespace osu.Game.Screens.Select.Options
                 HotKey = hotkey
             };
 
-            buttonsContainer.Add(button);
+            buttonsContainer.Insert((int)depth, button);
-            buttonsContainer.SetLayoutPosition(button, depth);
         }
     }
 }

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

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

osu.iOS/osu.iOS.csproj

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