From e7795296e2e77d5b91d37251e4b0bdccba2ce1e9 Mon Sep 17 00:00:00 2001 From: Dao Heng Liu Date: Sun, 16 Jul 2023 22:44:41 +0100 Subject: [PATCH] refactor LadderResetTeamsDialog.cs --- .../Screens/Editors/LadderEditorScreen.cs | 3 +-- .../Components/LadderResetTeamsDialog.cs} | 17 +++-------------- .../Screens/Ladder/LadderScreen.cs | 2 -- 3 files changed, 4 insertions(+), 18 deletions(-) rename osu.Game.Tournament/Screens/{BracketResetTeamsDialog.cs => Ladder/Components/LadderResetTeamsDialog.cs} (50%) diff --git a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs index 52d073068b..2cd5dfb513 100644 --- a/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs +++ b/osu.Game.Tournament/Screens/Editors/LadderEditorScreen.cs @@ -14,7 +14,6 @@ using osu.Framework.Graphics.UserInterface; using osu.Framework.Input.Events; using osu.Framework.Input.States; -using osu.Framework.Logging; using osu.Game.Graphics.UserInterface; using osu.Game.Tournament.Components; using osu.Game.Overlays; @@ -80,7 +79,7 @@ public MenuItem[] ContextMenuItems }), new OsuMenuItem("Reset teams", MenuItemType.Destructive, () => { - dialogOverlay?.Push(new BracketResetTeamsDialog(MatchesContainer)); + dialogOverlay?.Push(new LadderResetTeamsDialog(MatchesContainer)); }) }; } diff --git a/osu.Game.Tournament/Screens/BracketResetTeamsDialog.cs b/osu.Game.Tournament/Screens/Ladder/Components/LadderResetTeamsDialog.cs similarity index 50% rename from osu.Game.Tournament/Screens/BracketResetTeamsDialog.cs rename to osu.Game.Tournament/Screens/Ladder/Components/LadderResetTeamsDialog.cs index d3197bd1e6..0ecaab9af0 100644 --- a/osu.Game.Tournament/Screens/BracketResetTeamsDialog.cs +++ b/osu.Game.Tournament/Screens/Ladder/Components/LadderResetTeamsDialog.cs @@ -1,29 +1,18 @@ // Copyright (c) ppy Pty Ltd . 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.Containers; using osu.Framework.Graphics.Sprites; using osu.Game.Overlays.Dialog; -using osu.Game.Tournament.Screens.Ladder.Components; -namespace osu.Game.Tournament.Screens +namespace osu.Game.Tournament.Screens.Ladder.Components { - public partial class BracketResetTeamsDialog : DangerousActionDialog + public partial class LadderResetTeamsDialog : DangerousActionDialog { - private readonly Container matchesContainer; - - public BracketResetTeamsDialog(Container matchesContainer) + public LadderResetTeamsDialog(Container matchesContainer) { - this.matchesContainer = matchesContainer; - BodyText = @""; HeaderText = @"Confirm reset teams?"; Icon = FontAwesome.Solid.Undo; - } - - [BackgroundDependencyLoader] - private void load() - { DangerousAction = () => { foreach (var p in matchesContainer) diff --git a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs index fa0ac644b9..a74c9a9429 100644 --- a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs +++ b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs @@ -6,14 +6,12 @@ using System.Collections.Specialized; using System.Diagnostics; using System.Linq; -using JetBrains.Annotations; using osu.Framework.Allocation; using osu.Framework.Caching; using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Lines; -using osu.Game.Overlays; using osu.Game.Tournament.Components; using osu.Game.Tournament.Models; using osu.Game.Tournament.Screens.Editors;