From 136a15ad6fbb05209bc4b002fdec2cf667325247 Mon Sep 17 00:00:00 2001 From: GreemDev Date: Fri, 21 Nov 2025 00:24:48 -0600 Subject: [PATCH] cleanup --- src/Ryujinx/Systems/SetupWizard/BaseSetupWizard.cs | 1 - src/Ryujinx/Systems/SetupWizard/SetupWizardPage.cs | 2 +- src/Ryujinx/Systems/SetupWizard/SetupWizardPageBuilder.cs | 2 +- src/Ryujinx/Systems/SetupWizard/SetupWizardPageView.axaml | 2 +- .../Systems/SetupWizard/SetupWizardPageView.axaml.cs | 2 +- src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs | 2 -- .../UI/SetupWizard/RyujinxSetupWizardWindow.axaml.cs | 3 ++- src/Ryujinx/UI/Windows/MainWindow.axaml.cs | 7 +++++-- 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/Ryujinx/Systems/SetupWizard/BaseSetupWizard.cs b/src/Ryujinx/Systems/SetupWizard/BaseSetupWizard.cs index 5a679884b..ee72f105e 100644 --- a/src/Ryujinx/Systems/SetupWizard/BaseSetupWizard.cs +++ b/src/Ryujinx/Systems/SetupWizard/BaseSetupWizard.cs @@ -1,6 +1,5 @@ using Avalonia.Controls.Presenters; using Ryujinx.Ava.Common.Locale; -using Ryujinx.Systems.SetupWizard; using System.Threading.Tasks; namespace Ryujinx.Ava.Systems.SetupWizard diff --git a/src/Ryujinx/Systems/SetupWizard/SetupWizardPage.cs b/src/Ryujinx/Systems/SetupWizard/SetupWizardPage.cs index 1f4600e7f..1286210d1 100644 --- a/src/Ryujinx/Systems/SetupWizard/SetupWizardPage.cs +++ b/src/Ryujinx/Systems/SetupWizard/SetupWizardPage.cs @@ -3,7 +3,7 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.UI.ViewModels; -using Ryujinx.Systems.SetupWizard; +using Ryujinx.Ava.Systems.SetupWizard; using System.Threading; using System.Threading.Tasks; diff --git a/src/Ryujinx/Systems/SetupWizard/SetupWizardPageBuilder.cs b/src/Ryujinx/Systems/SetupWizard/SetupWizardPageBuilder.cs index 6e6edffd5..c97475a97 100644 --- a/src/Ryujinx/Systems/SetupWizard/SetupWizardPageBuilder.cs +++ b/src/Ryujinx/Systems/SetupWizard/SetupWizardPageBuilder.cs @@ -5,7 +5,7 @@ using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.Systems.SetupWizard; using System.Threading.Tasks; -namespace Ryujinx.Systems.SetupWizard +namespace Ryujinx.Ava.Systems.SetupWizard { public class SetupWizardPageBuilder(ContentPresenter presenter, bool isFirstPage = false) { diff --git a/src/Ryujinx/Systems/SetupWizard/SetupWizardPageView.axaml b/src/Ryujinx/Systems/SetupWizard/SetupWizardPageView.axaml index dca206897..1f0de0925 100644 --- a/src/Ryujinx/Systems/SetupWizard/SetupWizardPageView.axaml +++ b/src/Ryujinx/Systems/SetupWizard/SetupWizardPageView.axaml @@ -9,7 +9,7 @@ xmlns:wiz="using:Ryujinx.Ava.Systems.SetupWizard" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:DataType="wiz:SetupWizardPage" - x:Class="Ryujinx.Systems.SetupWizard.SetupWizardPageView"> + x:Class="Ryujinx.Ava.Systems.SetupWizard.SetupWizardPageView"> diff --git a/src/Ryujinx/Systems/SetupWizard/SetupWizardPageView.axaml.cs b/src/Ryujinx/Systems/SetupWizard/SetupWizardPageView.axaml.cs index 1e0fca7f9..e6c5418e9 100644 --- a/src/Ryujinx/Systems/SetupWizard/SetupWizardPageView.axaml.cs +++ b/src/Ryujinx/Systems/SetupWizard/SetupWizardPageView.axaml.cs @@ -4,7 +4,7 @@ using Avalonia.Markup.Xaml; using Ryujinx.Ava.Systems.SetupWizard; using Ryujinx.Ava.UI.Controls; -namespace Ryujinx.Systems.SetupWizard +namespace Ryujinx.Ava.Systems.SetupWizard { public partial class SetupWizardPageView : RyujinxControl { diff --git a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs index 539fe6b61..8ca84fcfe 100644 --- a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs +++ b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs @@ -3,13 +3,11 @@ using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.Systems.Configuration; using Ryujinx.Ava.Systems.SetupWizard; using Ryujinx.Ava.UI.ViewModels; -using Ryujinx.Common.Logging; using Ryujinx.UI.SetupWizard; using Ryujinx.UI.SetupWizard.Pages; using System; using System.IO; using System.Threading.Tasks; -using Logger = Ryujinx.Common.Logging.Logger; namespace Ryujinx.Ava.UI.SetupWizard { diff --git a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml.cs b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml.cs index 0e9d3c3ff..fe723c395 100644 --- a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml.cs +++ b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml.cs @@ -1,5 +1,6 @@ using Ryujinx.Ava; using Ryujinx.Ava.Systems.Configuration; +using Ryujinx.Ava.Systems.SetupWizard; using Ryujinx.Ava.UI.SetupWizard; using Ryujinx.Ava.UI.ViewModels; using Ryujinx.Ava.UI.Windows; @@ -24,7 +25,7 @@ namespace Ryujinx.UI.SetupWizard } } - public static RyujinxSetupWizardWindow CreateWindow(MainWindowViewModel mwvm, out RyujinxSetupWizard setupWizard) + public static RyujinxSetupWizardWindow CreateWindow(MainWindowViewModel mwvm, out BaseSetupWizard setupWizard) { RyujinxSetupWizardWindow window = new(); window.DataContext = setupWizard = new RyujinxSetupWizard(window.WizardPresenter, mwvm, () => diff --git a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs index b221e6e77..abc9dc5fe 100644 --- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs +++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs @@ -15,6 +15,7 @@ using Ryujinx.Ava.Systems; using Ryujinx.Ava.Systems.AppLibrary; using Ryujinx.Ava.Systems.Configuration; using Ryujinx.Ava.Systems.Configuration.UI; +using Ryujinx.Ava.Systems.SetupWizard; using Ryujinx.Ava.UI.Applet; using Ryujinx.Ava.UI.Helpers; using Ryujinx.Ava.UI.Models; @@ -145,8 +146,10 @@ namespace Ryujinx.Ava.UI.Windows if (Program.IsFirstStart && RyujinxSetupWizardWindow.CanShowSetupWizard) { - Task windowTask = ShowAsync(RyujinxSetupWizardWindow.CreateWindow(ViewModel, out var wiz), this); - _ = wiz.Start(); + Task windowTask = ShowAsync( + RyujinxSetupWizardWindow.CreateWindow(ViewModel, out BaseSetupWizard wiz), + this); + _ = wiz.Start().AsTask(); await windowTask; } });