Merge pull request #18802 from Supersonicboss1/reorganised-maintenance-section

Added subheadings to maintenance section in settings

osu.Game/Overlays/Settings/Sections/Maintenance/BeatmapSettings.cs

@@ -0,0 +1,88 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Localisation;
+using osu.Game.Beatmaps;
+using osu.Game.Database;
+using osu.Game.Localisation;
+
+namespace osu.Game.Overlays.Settings.Sections.Maintenance
+{
+    public class BeatmapSettings : SettingsSubsection
+    {
+        protected override LocalisableString Header => "Beatmaps";
+
+        private SettingsButton importBeatmapsButton = null!;
+        private SettingsButton deleteBeatmapsButton = null!;
+        private SettingsButton deleteBeatmapVideosButton = null!;
+        private SettingsButton restoreButton = null!;
+        private SettingsButton undeleteButton = null!;
+
+        [BackgroundDependencyLoader]
+        private void load(BeatmapManager beatmaps, LegacyImportManager? legacyImportManager, IDialogOverlay? dialogOverlay)
+        {
+            if (legacyImportManager?.SupportsImportFromStable == true)
+            {
+                Add(importBeatmapsButton = new SettingsButton
+                {
+                    Text = MaintenanceSettingsStrings.ImportBeatmapsFromStable,
+                    Action = () =>
+                    {
+                        importBeatmapsButton.Enabled.Value = false;
+                        legacyImportManager.ImportFromStableAsync(StableContent.Beatmaps).ContinueWith(t => Schedule(() => importBeatmapsButton.Enabled.Value = true));
+                    }
+                });
+            }
+
+            Add(deleteBeatmapsButton = new DangerousSettingsButton
+            {
+                Text = MaintenanceSettingsStrings.DeleteAllBeatmaps,
+                Action = () =>
+                {
+                    dialogOverlay?.Push(new MassDeleteConfirmationDialog(() =>
+                    {
+                        deleteBeatmapsButton.Enabled.Value = false;
+                        Task.Run(() => beatmaps.Delete()).ContinueWith(t => Schedule(() => deleteBeatmapsButton.Enabled.Value = true));
+                    }));
+                }
+            });
+
+            Add(deleteBeatmapVideosButton = new DangerousSettingsButton
+            {
+                Text = MaintenanceSettingsStrings.DeleteAllBeatmapVideos,
+                Action = () =>
+                {
+                    dialogOverlay?.Push(new MassVideoDeleteConfirmationDialog(() =>
+                    {
+                        deleteBeatmapVideosButton.Enabled.Value = false;
+                        Task.Run(beatmaps.DeleteAllVideos).ContinueWith(t => Schedule(() => deleteBeatmapVideosButton.Enabled.Value = true));
+                    }));
+                }
+            });
+            AddRange(new Drawable[]
+            {
+                restoreButton = new SettingsButton
+                {
+                    Text = MaintenanceSettingsStrings.RestoreAllHiddenDifficulties,
+                    Action = () =>
+                    {
+                        restoreButton.Enabled.Value = false;
+                        Task.Run(beatmaps.RestoreAll).ContinueWith(t => Schedule(() => restoreButton.Enabled.Value = true));
+                    }
+                },
+                undeleteButton = new SettingsButton
+                {
+                    Text = MaintenanceSettingsStrings.RestoreAllRecentlyDeletedBeatmaps,
+                    Action = () =>
+                    {
+                        undeleteButton.Enabled.Value = false;
+                        Task.Run(beatmaps.UndeleteAll).ContinueWith(t => Schedule(() => undeleteButton.Enabled.Value = true));
+                    }
+                }
+            });
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/Maintenance/CollectionsSettings.cs

@@ -0,0 +1,46 @@
+// 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.Localisation;
+using osu.Game.Collections;
+using osu.Game.Database;
+using osu.Game.Localisation;
+
+namespace osu.Game.Overlays.Settings.Sections.Maintenance
+{
+    public class CollectionsSettings : SettingsSubsection
+    {
+        protected override LocalisableString Header => "Collections";
+
+        private SettingsButton importCollectionsButton = null!;
+
+        [BackgroundDependencyLoader]
+        private void load(CollectionManager? collectionManager, LegacyImportManager? legacyImportManager, IDialogOverlay? dialogOverlay)
+        {
+            if (collectionManager == null) return;
+
+            if (legacyImportManager?.SupportsImportFromStable == true)
+            {
+                Add(importCollectionsButton = new SettingsButton
+                {
+                    Text = MaintenanceSettingsStrings.ImportCollectionsFromStable,
+                    Action = () =>
+                    {
+                        importCollectionsButton.Enabled.Value = false;
+                        legacyImportManager.ImportFromStableAsync(StableContent.Collections).ContinueWith(t => Schedule(() => importCollectionsButton.Enabled.Value = true));
+                    }
+                });
+            }
+
+            Add(new DangerousSettingsButton
+            {
+                Text = MaintenanceSettingsStrings.DeleteAllCollections,
+                Action = () =>
+                {
+                    dialogOverlay?.Push(new MassDeleteConfirmationDialog(collectionManager.DeleteAll));
+                }
+            });
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs

@@ -1,177 +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.
-
-#nullable disable
-
-using System.Threading.Tasks;
-using JetBrains.Annotations;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Localisation;
-using osu.Game.Beatmaps;
-using osu.Game.Collections;
-using osu.Game.Database;
-using osu.Game.Localisation;
-using osu.Game.Scoring;
-using osu.Game.Skinning;
-
-namespace osu.Game.Overlays.Settings.Sections.Maintenance
-{
-    public class GeneralSettings : SettingsSubsection
-    {
-        protected override LocalisableString Header => "General";
-
-        private SettingsButton importBeatmapsButton;
-        private SettingsButton importScoresButton;
-        private SettingsButton importSkinsButton;
-        private SettingsButton importCollectionsButton;
-        private SettingsButton deleteBeatmapsButton;
-        private SettingsButton deleteScoresButton;
-        private SettingsButton deleteSkinsButton;
-        private SettingsButton restoreButton;
-        private SettingsButton undeleteButton;
-        private SettingsButton deleteBeatmapVideosButton;
-
-        [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, [CanBeNull] CollectionManager collectionManager, [CanBeNull] LegacyImportManager legacyImportManager, IDialogOverlay dialogOverlay)
-        {
-            if (legacyImportManager?.SupportsImportFromStable == true)
-            {
-                Add(importBeatmapsButton = new SettingsButton
-                {
-                    Text = MaintenanceSettingsStrings.ImportBeatmapsFromStable,
-                    Action = () =>
-                    {
-                        importBeatmapsButton.Enabled.Value = false;
-                        legacyImportManager.ImportFromStableAsync(StableContent.Beatmaps).ContinueWith(t => Schedule(() => importBeatmapsButton.Enabled.Value = true));
-                    }
-                });
-            }
-
-            Add(deleteBeatmapsButton = new DangerousSettingsButton
-            {
-                Text = MaintenanceSettingsStrings.DeleteAllBeatmaps,
-                Action = () =>
-                {
-                    dialogOverlay?.Push(new MassDeleteConfirmationDialog(() =>
-                    {
-                        deleteBeatmapsButton.Enabled.Value = false;
-                        Task.Run(() => beatmaps.Delete()).ContinueWith(t => Schedule(() => deleteBeatmapsButton.Enabled.Value = true));
-                    }));
-                }
-            });
-
-            Add(deleteBeatmapVideosButton = new DangerousSettingsButton
-            {
-                Text = MaintenanceSettingsStrings.DeleteAllBeatmapVideos,
-                Action = () =>
-                {
-                    dialogOverlay?.Push(new MassVideoDeleteConfirmationDialog(() =>
-                    {
-                        deleteBeatmapVideosButton.Enabled.Value = false;
-                        Task.Run(beatmaps.DeleteAllVideos).ContinueWith(t => Schedule(() => deleteBeatmapVideosButton.Enabled.Value = true));
-                    }));
-                }
-            });
-
-            if (legacyImportManager?.SupportsImportFromStable == true)
-            {
-                Add(importScoresButton = new SettingsButton
-                {
-                    Text = MaintenanceSettingsStrings.ImportScoresFromStable,
-                    Action = () =>
-                    {
-                        importScoresButton.Enabled.Value = false;
-                        legacyImportManager.ImportFromStableAsync(StableContent.Scores).ContinueWith(t => Schedule(() => importScoresButton.Enabled.Value = true));
-                    }
-                });
-            }
-
-            Add(deleteScoresButton = new DangerousSettingsButton
-            {
-                Text = MaintenanceSettingsStrings.DeleteAllScores,
-                Action = () =>
-                {
-                    dialogOverlay?.Push(new MassDeleteConfirmationDialog(() =>
-                    {
-                        deleteScoresButton.Enabled.Value = false;
-                        Task.Run(() => scores.Delete()).ContinueWith(t => Schedule(() => deleteScoresButton.Enabled.Value = true));
-                    }));
-                }
-            });
-
-            if (legacyImportManager?.SupportsImportFromStable == true)
-            {
-                Add(importSkinsButton = new SettingsButton
-                {
-                    Text = MaintenanceSettingsStrings.ImportSkinsFromStable,
-                    Action = () =>
-                    {
-                        importSkinsButton.Enabled.Value = false;
-                        legacyImportManager.ImportFromStableAsync(StableContent.Skins).ContinueWith(t => Schedule(() => importSkinsButton.Enabled.Value = true));
-                    }
-                });
-            }
-
-            Add(deleteSkinsButton = new DangerousSettingsButton
-            {
-                Text = MaintenanceSettingsStrings.DeleteAllSkins,
-                Action = () =>
-                {
-                    dialogOverlay?.Push(new MassDeleteConfirmationDialog(() =>
-                    {
-                        deleteSkinsButton.Enabled.Value = false;
-                        Task.Run(() => skins.Delete()).ContinueWith(t => Schedule(() => deleteSkinsButton.Enabled.Value = true));
-                    }));
-                }
-            });
-
-            if (collectionManager != null)
-            {
-                if (legacyImportManager?.SupportsImportFromStable == true)
-                {
-                    Add(importCollectionsButton = new SettingsButton
-                    {
-                        Text = MaintenanceSettingsStrings.ImportCollectionsFromStable,
-                        Action = () =>
-                        {
-                            importCollectionsButton.Enabled.Value = false;
-                            legacyImportManager.ImportFromStableAsync(StableContent.Collections).ContinueWith(t => Schedule(() => importCollectionsButton.Enabled.Value = true));
-                        }
-                    });
-                }
-
-                Add(new DangerousSettingsButton
-                {
-                    Text = MaintenanceSettingsStrings.DeleteAllCollections,
-                    Action = () =>
-                    {
-                        dialogOverlay?.Push(new MassDeleteConfirmationDialog(collectionManager.DeleteAll));
-                    }
-                });
-            }
-
-            AddRange(new Drawable[]
-            {
-                restoreButton = new SettingsButton
-                {
-                    Text = MaintenanceSettingsStrings.RestoreAllHiddenDifficulties,
-                    Action = () =>
-                    {
-                        restoreButton.Enabled.Value = false;
-                        Task.Run(beatmaps.RestoreAll).ContinueWith(t => Schedule(() => restoreButton.Enabled.Value = true));
-                    }
-                },
-                undeleteButton = new SettingsButton
-                {
-                    Text = MaintenanceSettingsStrings.RestoreAllRecentlyDeletedBeatmaps,
-                    Action = () =>
-                    {
-                        undeleteButton.Enabled.Value = false;
-                        Task.Run(beatmaps.UndeleteAll).ContinueWith(t => Schedule(() => undeleteButton.Enabled.Value = true));
-                    }
-                },
-            });
-        }
-    }
-}

osu.Game/Overlays/Settings/Sections/Maintenance/ScoreSettings.cs

@@ -0,0 +1,50 @@
+// 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.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Localisation;
+using osu.Game.Database;
+using osu.Game.Localisation;
+using osu.Game.Scoring;
+
+namespace osu.Game.Overlays.Settings.Sections.Maintenance
+{
+    public class ScoreSettings : SettingsSubsection
+    {
+        protected override LocalisableString Header => "Scores";
+
+        private SettingsButton importScoresButton = null!;
+        private SettingsButton deleteScoresButton = null!;
+
+        [BackgroundDependencyLoader]
+        private void load(ScoreManager scores, LegacyImportManager? legacyImportManager, IDialogOverlay? dialogOverlay)
+        {
+            if (legacyImportManager?.SupportsImportFromStable == true)
+            {
+                Add(importScoresButton = new SettingsButton
+                {
+                    Text = MaintenanceSettingsStrings.ImportScoresFromStable,
+                    Action = () =>
+                    {
+                        importScoresButton.Enabled.Value = false;
+                        legacyImportManager.ImportFromStableAsync(StableContent.Scores).ContinueWith(t => Schedule(() => importScoresButton.Enabled.Value = true));
+                    }
+                });
+            }
+
+            Add(deleteScoresButton = new DangerousSettingsButton
+            {
+                Text = MaintenanceSettingsStrings.DeleteAllScores,
+                Action = () =>
+                {
+                    dialogOverlay?.Push(new MassDeleteConfirmationDialog(() =>
+                    {
+                        deleteScoresButton.Enabled.Value = false;
+                        Task.Run(() => scores.Delete()).ContinueWith(t => Schedule(() => deleteScoresButton.Enabled.Value = true));
+                    }));
+                }
+            });
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/Maintenance/SkinSettings.cs

@@ -0,0 +1,50 @@
+// 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.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Localisation;
+using osu.Game.Database;
+using osu.Game.Localisation;
+using osu.Game.Skinning;
+
+namespace osu.Game.Overlays.Settings.Sections.Maintenance
+{
+    public class SkinSettings : SettingsSubsection
+    {
+        protected override LocalisableString Header => "Skins";
+
+        private SettingsButton importSkinsButton = null!;
+        private SettingsButton deleteSkinsButton = null!;
+
+        [BackgroundDependencyLoader]
+        private void load(SkinManager skins, LegacyImportManager? legacyImportManager, IDialogOverlay? dialogOverlay)
+        {
+            if (legacyImportManager?.SupportsImportFromStable == true)
+            {
+                Add(importSkinsButton = new SettingsButton
+                {
+                    Text = MaintenanceSettingsStrings.ImportSkinsFromStable,
+                    Action = () =>
+                    {
+                        importSkinsButton.Enabled.Value = false;
+                        legacyImportManager.ImportFromStableAsync(StableContent.Skins).ContinueWith(t => Schedule(() => importSkinsButton.Enabled.Value = true));
+                    }
+                });
+            }
+
+            Add(deleteSkinsButton = new DangerousSettingsButton
+            {
+                Text = MaintenanceSettingsStrings.DeleteAllSkins,
+                Action = () =>
+                {
+                    dialogOverlay?.Push(new MassDeleteConfirmationDialog(() =>
+                    {
+                        deleteSkinsButton.Enabled.Value = false;
+                        Task.Run(() => skins.Delete()).ContinueWith(t => Schedule(() => deleteSkinsButton.Enabled.Value = true));
+                    }));
+                }
+            });
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/MaintenanceSection.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 osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
@@ -24,7 +22,10 @@ namespace osu.Game.Overlays.Settings.Sections
         {
             Children = new Drawable[]
             {
-                new GeneralSettings()
+                new BeatmapSettings(),
+                new SkinSettings(),
+                new CollectionsSettings(),
+                new ScoreSettings()
             };
         }
     }