Merge branch 'master' into Save-Score-Failed

osu.Android.props

@@ -52,7 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.702.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.713.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.715.0" />
   </ItemGroup>
   <ItemGroup Label="Transitive Dependencies">
     <!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->

osu.Android/AndroidJoystickSettings.cs

@@ -0,0 +1,76 @@
+// 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.Android.Input;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Localisation;
+using osu.Game.Localisation;
+using osu.Game.Overlays.Settings;
+
+namespace osu.Android
+{
+    public class AndroidJoystickSettings : SettingsSubsection
+    {
+        protected override LocalisableString Header => JoystickSettingsStrings.JoystickGamepad;
+
+        private readonly AndroidJoystickHandler joystickHandler;
+
+        private readonly Bindable<bool> enabled = new BindableBool(true);
+
+        private SettingsSlider<float> deadzoneSlider = null!;
+
+        private Bindable<float> handlerDeadzone = null!;
+
+        private Bindable<float> localDeadzone = null!;
+
+        public AndroidJoystickSettings(AndroidJoystickHandler joystickHandler)
+        {
+            this.joystickHandler = joystickHandler;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            // use local bindable to avoid changing enabled state of game host's bindable.
+            handlerDeadzone = joystickHandler.DeadzoneThreshold.GetBoundCopy();
+            localDeadzone = handlerDeadzone.GetUnboundCopy();
+
+            Children = new Drawable[]
+            {
+                new SettingsCheckbox
+                {
+                    LabelText = CommonStrings.Enabled,
+                    Current = enabled
+                },
+                deadzoneSlider = new SettingsSlider<float>
+                {
+                    LabelText = JoystickSettingsStrings.DeadzoneThreshold,
+                    KeyboardStep = 0.01f,
+                    DisplayAsPercentage = true,
+                    Current = localDeadzone,
+                },
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            enabled.BindTo(joystickHandler.Enabled);
+            enabled.BindValueChanged(e => deadzoneSlider.Current.Disabled = !e.NewValue, true);
+
+            handlerDeadzone.BindValueChanged(val =>
+            {
+                bool disabled = localDeadzone.Disabled;
+
+                localDeadzone.Disabled = false;
+                localDeadzone.Value = val.NewValue;
+                localDeadzone.Disabled = disabled;
+            }, true);
+
+            localDeadzone.BindValueChanged(val => handlerDeadzone.Value = val.NewValue);
+        }
+    }
+}

osu.Android/OsuGameAndroid.cs

@@ -96,6 +96,9 @@ namespace osu.Android
                 case AndroidMouseHandler mh:
                     return new AndroidMouseSettings(mh);
 
+                case AndroidJoystickHandler jh:
+                    return new AndroidJoystickSettings(jh);
+
                 default:
                     return base.CreateSettingsSubsectionFor(handler);
             }

osu.Android/osu.Android.csproj

@@ -26,6 +26,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="AndroidJoystickSettings.cs" />
     <Compile Include="AndroidMouseSettings.cs" />
     <Compile Include="GameplayScreenRotationLocker.cs" />
     <Compile Include="OsuGameActivity.cs" />

osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyFollowCircle.cs

@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             if (ParentObject.Judged)
                 return;
 
-            double remainingTime = ParentObject.HitStateUpdateTime - Time.Current;
+            double remainingTime = Math.Max(0, ParentObject.HitStateUpdateTime - Time.Current);
 
             // Note that the scale adjust here is 2 instead of DrawableSliderBall.FOLLOW_AREA to match legacy behaviour.
             // This means the actual tracking area for gameplay purposes is larger than the sprite (but skins may be accounting for this).

osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs

@@ -274,14 +274,18 @@ namespace osu.Game.Tests.Visual.Online
                 }
             };
 
+            const int initial_great_count = 2000;
+
+            int greatCount = initial_great_count;
+
             foreach (var s in scores.Scores)
             {
                 s.Statistics = new Dictionary<HitResult, int>
                 {
-                    { HitResult.Great, RNG.Next(2000) },
+                    { HitResult.Great, greatCount -= 100 },
-                    { HitResult.Ok, RNG.Next(2000) },
+                    { HitResult.Ok, RNG.Next(100) },
-                    { HitResult.Meh, RNG.Next(2000) },
+                    { HitResult.Meh, RNG.Next(100) },
-                    { HitResult.Miss, RNG.Next(2000) }
+                    { HitResult.Miss, initial_great_count - greatCount }
                 };
             }
 

osu.Game/Database/EFToRealmMigrator.cs

@@ -443,7 +443,6 @@ namespace osu.Game.Database
                             TotalScore = score.TotalScore,
                             MaxCombo = score.MaxCombo,
                             Accuracy = score.Accuracy,
-                            HasReplay = ((IScoreInfo)score).HasReplay,
                             Date = score.Date,
                             PP = score.PP,
                             Rank = score.Rank,

osu.Game/Database/RealmAccess.cs

@@ -59,8 +59,9 @@ namespace osu.Game.Database
         /// 13   2022-01-13    Final migration of beatmaps and scores to realm (multiple new storage fields).
         /// 14   2022-03-01    Added BeatmapUserSettings to BeatmapInfo.
         /// 15   2022-07-13    Added LastPlayed to BeatmapInfo.
+        /// 16   2022-07-15    Removed HasReplay from ScoreInfo.
         /// </summary>
-        private const int schema_version = 15;
+        private const int schema_version = 16;
 
         /// <summary>
         /// Lock object which is held during <see cref="BlockAllOperations"/> sections, blocking realm retrieval during blocking periods.

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

@@ -35,7 +35,7 @@ namespace osu.Game.Online.API.Requests
             this.mods = mods ?? Array.Empty<IMod>();
         }
 
-        protected override string Target => $@"beatmaps/{beatmapInfo.OnlineID}/scores{createQueryParameters()}";
+        protected override string Target => $@"beatmaps/{beatmapInfo.OnlineID}/solo-scores{createQueryParameters()}";
 
         private string createQueryParameters()
         {

osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs

@@ -103,9 +103,6 @@ namespace osu.Game.Online.API.Requests.Responses
 
             var mods = Mods.Select(apiMod => rulesetInstance.CreateModFromAcronym(apiMod.Acronym)).Where(m => m != null).ToArray();
 
-            // all API scores provided by this class are considered to be legacy.
-            mods = mods.Append(rulesetInstance.CreateMod<ModClassic>()).ToArray();
-
             var scoreInfo = ToScoreInfo(mods);
 
             scoreInfo.Ruleset = ruleset;
@@ -132,8 +129,7 @@ namespace osu.Game.Online.API.Requests.Responses
             Rank = Rank,
             Statistics = Statistics,
             Date = EndedAt ?? DateTimeOffset.Now,
-            Hash = "online", // TODO: temporary?
+            Hash = HasReplay ? "online" : string.Empty, // TODO: temporary?
-            HasReplay = HasReplay,
             Mods = mods,
             PP = PP,
         };

osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs

@@ -143,7 +143,7 @@ namespace osu.Game.Overlays.BeatmapListing
         }
 
         public void Search(string query)
-            => searchControl.Query.Value = query;
+            => Schedule(() => searchControl.Query.Value = query);
 
         protected override void LoadComplete()
         {

osu.Game/Overlays/BeatmapSet/MetadataSection.cs

@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -22,11 +23,14 @@ namespace osu.Game.Overlays.BeatmapSet
         private readonly MetadataType type;
         private TextFlowContainer textFlow;
 
+        private readonly Action<string> searchAction;
+
         private const float transition_duration = 250;
 
-        public MetadataSection(MetadataType type)
+        public MetadataSection(MetadataType type, Action<string> searchAction = null)
         {
             this.type = type;
+            this.searchAction = searchAction;
 
             Alpha = 0;
 
@@ -91,7 +95,12 @@ namespace osu.Game.Overlays.BeatmapSet
 
                         for (int i = 0; i <= tags.Length - 1; i++)
                         {
-                            loaded.AddLink(tags[i], LinkAction.SearchBeatmapSet, tags[i]);
+                            string tag = tags[i];
+
+                            if (searchAction != null)
+                                loaded.AddLink(tag, () => searchAction(tag));
+                            else
+                                loaded.AddLink(tag, LinkAction.SearchBeatmapSet, tag);
 
                             if (i != tags.Length - 1)
                                 loaded.AddText(" ");
@@ -100,7 +109,11 @@ namespace osu.Game.Overlays.BeatmapSet
                         break;
 
                     case MetadataType.Source:
+                        if (searchAction != null)
+                            loaded.AddLink(text, () => searchAction(text));
+                        else
                             loaded.AddLink(text, LinkAction.SearchBeatmapSet, text);
+
                         break;
 
                     default:

osu.Game/Scoring/ScoreInfo.cs

@@ -45,7 +45,7 @@ namespace osu.Game.Scoring
 
         public double Accuracy { get; set; }
 
-        public bool HasReplay { get; set; }
+        public bool HasReplay => !string.IsNullOrEmpty(Hash);
 
         public DateTimeOffset Date { get; set; }
 

osu.Game/Scoring/ScoreRank.cs

@@ -11,6 +11,7 @@ namespace osu.Game.Scoring
 {
     public enum ScoreRank
     {
+        // TODO: Localisable?
         [Description(@"F")]
         F = -1,
 

osu.Game/Screens/Ranking/ReplayDownloadButton.cs

@@ -33,7 +33,7 @@ namespace osu.Game.Screens.Ranking
                 if (State.Value == DownloadState.LocallyAvailable)
                     return ReplayAvailability.Local;
 
-                if (!string.IsNullOrEmpty(Score.Value?.Hash))
+                if (Score.Value?.HasReplay == true)
                     return ReplayAvailability.Online;
 
                 return ReplayAvailability.NotAvailable;

osu.Game/Screens/Select/BeatmapDetails.cs

@@ -1,8 +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.
 
-#nullable disable
-
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
@@ -38,15 +36,18 @@ namespace osu.Game.Screens.Select
         private readonly LoadingLayer loading;
 
         [Resolved]
-        private IAPIProvider api { get; set; }
+        private IAPIProvider api { get; set; } = null!;
 
-        private IBeatmapInfo beatmapInfo;
+        [Resolved]
+        private SongSelect? songSelect { get; set; }
 
-        private APIFailTimes failTimes;
+        private IBeatmapInfo? beatmapInfo;
 
-        private int[] ratings;
+        private APIFailTimes? failTimes;
 
-        public IBeatmapInfo BeatmapInfo
+        private int[]? ratings;
+
+        public IBeatmapInfo? BeatmapInfo
         {
             get => beatmapInfo;
             set
@@ -56,7 +57,7 @@ namespace osu.Game.Screens.Select
                 beatmapInfo = value;
 
                 var onlineInfo = beatmapInfo as IBeatmapOnlineInfo;
-                var onlineSetInfo = beatmapInfo.BeatmapSet as IBeatmapSetOnlineInfo;
+                var onlineSetInfo = beatmapInfo?.BeatmapSet as IBeatmapSetOnlineInfo;
 
                 failTimes = onlineInfo?.FailTimes;
                 ratings = onlineSetInfo?.Ratings;
@@ -140,9 +141,9 @@ namespace osu.Game.Screens.Select
                                                     LayoutEasing = Easing.OutQuad,
                                                     Children = new[]
                                                     {
-                                                        description = new MetadataSection(MetadataType.Description),
+                                                        description = new MetadataSection(MetadataType.Description, searchOnSongSelect),
-                                                        source = new MetadataSection(MetadataType.Source),
+                                                        source = new MetadataSection(MetadataType.Source, searchOnSongSelect),
-                                                        tags = new MetadataSection(MetadataType.Tags),
+                                                        tags = new MetadataSection(MetadataType.Tags, searchOnSongSelect),
                                                     },
                                                 },
                                             },
@@ -175,6 +176,12 @@ namespace osu.Game.Screens.Select
                 },
                 loading = new LoadingLayer(true)
             };
+
+            void searchOnSongSelect(string text)
+            {
+                if (songSelect != null)
+                    songSelect.FilterControl.CurrentTextSearch.Value = text;
+            }
         }
 
         private void updateStatistics()

osu.Game/Screens/Select/FilterControl.cs

@@ -31,6 +31,8 @@ namespace osu.Game.Screens.Select
 
         public Action<FilterCriteria> FilterChanged;
 
+        public Bindable<string> CurrentTextSearch => searchTextBox.Current;
+
         private OsuTabControl<SortMode> sortTabs;
 
         private Bindable<SortMode> sortMode;
@@ -63,6 +65,7 @@ namespace osu.Game.Screens.Select
         }
 
         private SeekLimitedSearchTextBox searchTextBox;
+
         private CollectionFilterDropdown collectionDropdown;
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>

osu.Game/Screens/Select/NoResultsPlaceholder.cs

@@ -109,7 +109,7 @@ namespace osu.Game.Screens.Select
                 textFlow.AddParagraph("No beatmaps found!");
                 textFlow.AddParagraph(string.Empty);
 
-                textFlow.AddParagraph("Consider using the \"");
+                textFlow.AddParagraph("- Consider running the \"");
                 textFlow.AddLink(FirstRunSetupOverlayStrings.FirstRunSetupTitle, () => firstRunSetupOverlay?.Show());
                 textFlow.AddText("\" to download or import some beatmaps!");
             }
@@ -141,6 +141,7 @@ namespace osu.Game.Screens.Select
                     textFlow.AddLink(" enabling ", () => config.SetValue(OsuSetting.ShowConvertedBeatmaps, true));
                     textFlow.AddText("automatic conversion!");
                 }
+            }
 
             if (!string.IsNullOrEmpty(filter?.SearchText))
             {
@@ -148,8 +149,6 @@ namespace osu.Game.Screens.Select
                 textFlow.AddLink("searching online", LinkAction.SearchBeatmapSet, filter.SearchText);
                 textFlow.AddText($" for \"{filter.SearchText}\".");
             }
-            }
-
             // TODO: add clickable link to reset criteria.
         }
     }

osu.Game/osu.Game.csproj

@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.14.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.713.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.715.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.702.0" />
     <PackageReference Include="Sentry" Version="3.19.0" />
     <PackageReference Include="SharpCompress" Version="0.32.1" />

osu.iOS.props

@@ -61,7 +61,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.713.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.715.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.702.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
@@ -84,7 +84,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.14" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.713.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.715.0" />
     <PackageReference Include="SharpCompress" Version="0.32.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />