From bbd11d19d6d2448c2b2a24c9cc589f8e7f30ab82 Mon Sep 17 00:00:00 2001 From: GreemDev Date: Fri, 21 Nov 2025 01:16:42 -0600 Subject: [PATCH] cleanup --- .../Systems/SetupWizard/BaseSetupWizard.cs | 6 ++--- .../Systems/SetupWizard/SetupWizardPage.cs | 25 ++++++++----------- .../SetupWizard/SetupWizardPageBuilder.cs | 18 ++++++------- .../SetupWizard/SetupWizardPageView.axaml | 3 --- .../SetupWizard/SetupWizardPageView.axaml.cs | 4 --- .../Pages/SetupKeysPageViewModel.cs | 1 - .../UI/SetupWizard/RyujinxSetupWizard.cs | 1 - .../RyujinxSetupWizardWindow.axaml.cs | 2 -- 8 files changed, 22 insertions(+), 38 deletions(-) diff --git a/src/Ryujinx/Systems/SetupWizard/BaseSetupWizard.cs b/src/Ryujinx/Systems/SetupWizard/BaseSetupWizard.cs index ee72f105e..90bed2383 100644 --- a/src/Ryujinx/Systems/SetupWizard/BaseSetupWizard.cs +++ b/src/Ryujinx/Systems/SetupWizard/BaseSetupWizard.cs @@ -22,9 +22,7 @@ namespace Ryujinx.Ava.Systems.SetupWizard .Show(); } - protected SetupWizardPageBuilder NextPage() - { - return new SetupWizardPageBuilder(presenter); - } + protected SetupWizardPageBuilder NextPage() + => new(presenter); } } diff --git a/src/Ryujinx/Systems/SetupWizard/SetupWizardPage.cs b/src/Ryujinx/Systems/SetupWizard/SetupWizardPage.cs index 1286210d1..032f72830 100644 --- a/src/Ryujinx/Systems/SetupWizard/SetupWizardPage.cs +++ b/src/Ryujinx/Systems/SetupWizard/SetupWizardPage.cs @@ -3,7 +3,6 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.UI.ViewModels; -using Ryujinx.Ava.Systems.SetupWizard; using System.Threading; using System.Threading.Tasks; @@ -13,20 +12,19 @@ namespace Ryujinx.Ava.Systems.SetupWizard { protected bool? _result; protected readonly CancellationTokenSource _cancellationTokenSource = new(); - + public bool IsFirstPage { get; } = isFirstPage; [ObservableProperty] - private string? _title; + public partial string? Title { get; set; } [ObservableProperty] - private object? _content; + public partial object? Content { get; set; } + + [ObservableProperty] public partial object? HelpContent { get; set; } = "test"; [ObservableProperty] - private object? _helpContent; - - [ObservableProperty] - private object? _actionContent = LocaleManager.Instance[LocaleKeys.SetupWizardActionNext]; + public partial object? ActionContent { get; set; } = LocaleManager.Instance[LocaleKeys.SetupWizardActionNext]; [RelayCommand] private void MoveBack() @@ -44,15 +42,14 @@ namespace Ryujinx.Ava.Systems.SetupWizard public async ValueTask Show(ContentPresenter presenter) { - presenter.Content = new SetupWizardPageView - { - DataContext = this, - }; + presenter.Content = new SetupWizardPageView { DataContext = this, }; - try { + try + { await Task.Delay(-1, _cancellationTokenSource.Token); } - catch (TaskCanceledException) { + catch (TaskCanceledException) + { return _result ?? false; } diff --git a/src/Ryujinx/Systems/SetupWizard/SetupWizardPageBuilder.cs b/src/Ryujinx/Systems/SetupWizard/SetupWizardPageBuilder.cs index c97475a97..cc9f9ce55 100644 --- a/src/Ryujinx/Systems/SetupWizard/SetupWizardPageBuilder.cs +++ b/src/Ryujinx/Systems/SetupWizard/SetupWizardPageBuilder.cs @@ -2,7 +2,6 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Controls.Presenters; using Ryujinx.Ava.Common.Locale; -using Ryujinx.Ava.Systems.SetupWizard; using System.Threading.Tasks; namespace Ryujinx.Ava.Systems.SetupWizard @@ -28,15 +27,17 @@ namespace Ryujinx.Ava.Systems.SetupWizard public SetupWizardPageBuilder WithContent(object? content) { - if (content is StyledElement { Parent: ContentControl parent }) { + if (content is StyledElement { Parent: ContentControl parent }) + { parent.Content = null; } - + _page.Content = content; return this; } - public SetupWizardPageBuilder WithHelpContent(LocaleKeys content) => WithHelpContent(LocaleManager.Instance[content]); + public SetupWizardPageBuilder WithHelpContent(LocaleKeys content) => + WithHelpContent(LocaleManager.Instance[content]); public SetupWizardPageBuilder WithHelpContent(object? content) { @@ -46,14 +47,13 @@ namespace Ryujinx.Ava.Systems.SetupWizard public SetupWizardPageBuilder WithContent(object? context = null) where TControl : Control, new() { - _page.Content = new TControl { - DataContext = context - }; - + _page.Content = new TControl { DataContext = context }; + return this; } - public SetupWizardPageBuilder WithActionContent(LocaleKeys content) => WithActionContent(LocaleManager.Instance[content]); + public SetupWizardPageBuilder WithActionContent(LocaleKeys content) => + WithActionContent(LocaleManager.Instance[content]); public SetupWizardPageBuilder WithActionContent(object? content) { diff --git a/src/Ryujinx/Systems/SetupWizard/SetupWizardPageView.axaml b/src/Ryujinx/Systems/SetupWizard/SetupWizardPageView.axaml index 1f0de0925..88d79ca46 100644 --- a/src/Ryujinx/Systems/SetupWizard/SetupWizardPageView.axaml +++ b/src/Ryujinx/Systems/SetupWizard/SetupWizardPageView.axaml @@ -3,8 +3,6 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup" - xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls" - xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers" xmlns:fa="using:Projektanker.Icons.Avalonia" xmlns:wiz="using:Ryujinx.Ava.Systems.SetupWizard" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" @@ -15,7 +13,6 @@ diff --git a/src/Ryujinx/Systems/SetupWizard/SetupWizardPageView.axaml.cs b/src/Ryujinx/Systems/SetupWizard/SetupWizardPageView.axaml.cs index e6c5418e9..08b027b99 100644 --- a/src/Ryujinx/Systems/SetupWizard/SetupWizardPageView.axaml.cs +++ b/src/Ryujinx/Systems/SetupWizard/SetupWizardPageView.axaml.cs @@ -1,7 +1,3 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; -using Ryujinx.Ava.Systems.SetupWizard; using Ryujinx.Ava.UI.Controls; namespace Ryujinx.Ava.Systems.SetupWizard diff --git a/src/Ryujinx/UI/SetupWizard/Pages/SetupKeysPageViewModel.cs b/src/Ryujinx/UI/SetupWizard/Pages/SetupKeysPageViewModel.cs index 358f9ccb5..3cfc74075 100644 --- a/src/Ryujinx/UI/SetupWizard/Pages/SetupKeysPageViewModel.cs +++ b/src/Ryujinx/UI/SetupWizard/Pages/SetupKeysPageViewModel.cs @@ -2,7 +2,6 @@ using Avalonia.Controls; using Avalonia.Platform.Storage; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; -using Ryujinx.Ava; using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.UI.ViewModels; using System.Threading.Tasks; diff --git a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs index 05c638d38..2ed1fd5f7 100644 --- a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs +++ b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs @@ -4,7 +4,6 @@ using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.Systems.Configuration; using Ryujinx.Ava.Systems.SetupWizard; using Ryujinx.Ava.UI.ViewModels; -using Ryujinx.Ava.UI.SetupWizard; using Ryujinx.Ava.UI.SetupWizard.Pages; using System; using System.IO; diff --git a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml.cs b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml.cs index 206a802a1..27fdcd26a 100644 --- a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml.cs +++ b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml.cs @@ -1,8 +1,6 @@ -using Ryujinx.Ava; using Ryujinx.Ava.Systems.Configuration; using Ryujinx.Ava.Systems.SetupWizard; using Ryujinx.Ava.UI.Helpers; -using Ryujinx.Ava.UI.SetupWizard; using Ryujinx.Ava.UI.ViewModels; using Ryujinx.Ava.UI.Windows; using Ryujinx.Common.Configuration;