Skip to content

Commit

Permalink
[Infra] Separate UI services from the main project (#238)
Browse files Browse the repository at this point in the history 
* Move UI services into a separate project

* Fix build

* Move project path

* Add WinUI infra project

* Rename WinUI infra classes

* Move project

* Rename namespaces
  • Loading branch information
@gaviny82
gaviny82 authored Jul 4, 2024
1 parent b70dd04 commit a6f4035
Show file tree
Hide file tree
Showing 46 changed files with 167 additions and 77 deletions.
42 changes: 42 additions & 0 deletions Natsurainko.FluentLauncher.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Natsurainko.FluentLauncher"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Natsurainko.FluentCore", "Natsurainko.FluentCore\Natsurainko.FluentCore\Natsurainko.FluentCore.csproj", "{7CA745E6-DEE6-4018-87DB-4012EC94C3B8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Infrastructure", "Infrastructure", "{0537A9FF-BF86-4F92-A731-B6141B27ADDB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentLauncher.Infra.UI", "infra\FluentLauncher.Infra.UI\FluentLauncher.Infra.UI.csproj", "{EC4A7DE1-589A-4FFF-9E2A-48ED6114182F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentLauncher.Infra.WinUI", "infra\FluentLauncher.Infra.WinUI\FluentLauncher.Infra.WinUI.csproj", "{0AD85018-AAA2-49D9-A29F-910E6A82A6BF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -54,10 +60,46 @@ Global
{7CA745E6-DEE6-4018-87DB-4012EC94C3B8}.Release|x64.Build.0 = Release|Any CPU
{7CA745E6-DEE6-4018-87DB-4012EC94C3B8}.Release|x86.ActiveCfg = Release|Any CPU
{7CA745E6-DEE6-4018-87DB-4012EC94C3B8}.Release|x86.Build.0 = Release|Any CPU
{EC4A7DE1-589A-4FFF-9E2A-48ED6114182F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EC4A7DE1-589A-4FFF-9E2A-48ED6114182F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EC4A7DE1-589A-4FFF-9E2A-48ED6114182F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{EC4A7DE1-589A-4FFF-9E2A-48ED6114182F}.Debug|ARM64.Build.0 = Debug|Any CPU
{EC4A7DE1-589A-4FFF-9E2A-48ED6114182F}.Debug|x64.ActiveCfg = Debug|Any CPU
{EC4A7DE1-589A-4FFF-9E2A-48ED6114182F}.Debug|x64.Build.0 = Debug|Any CPU
{EC4A7DE1-589A-4FFF-9E2A-48ED6114182F}.Debug|x86.ActiveCfg = Debug|Any CPU
{EC4A7DE1-589A-4FFF-9E2A-48ED6114182F}.Debug|x86.Build.0 = Debug|Any CPU
{EC4A7DE1-589A-4FFF-9E2A-48ED6114182F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EC4A7DE1-589A-4FFF-9E2A-48ED6114182F}.Release|Any CPU.Build.0 = Release|Any CPU
{EC4A7DE1-589A-4FFF-9E2A-48ED6114182F}.Release|ARM64.ActiveCfg = Release|Any CPU
{EC4A7DE1-589A-4FFF-9E2A-48ED6114182F}.Release|ARM64.Build.0 = Release|Any CPU
{EC4A7DE1-589A-4FFF-9E2A-48ED6114182F}.Release|x64.ActiveCfg = Release|Any CPU
{EC4A7DE1-589A-4FFF-9E2A-48ED6114182F}.Release|x64.Build.0 = Release|Any CPU
{EC4A7DE1-589A-4FFF-9E2A-48ED6114182F}.Release|x86.ActiveCfg = Release|Any CPU
{EC4A7DE1-589A-4FFF-9E2A-48ED6114182F}.Release|x86.Build.0 = Release|Any CPU
{0AD85018-AAA2-49D9-A29F-910E6A82A6BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0AD85018-AAA2-49D9-A29F-910E6A82A6BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0AD85018-AAA2-49D9-A29F-910E6A82A6BF}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{0AD85018-AAA2-49D9-A29F-910E6A82A6BF}.Debug|ARM64.Build.0 = Debug|Any CPU
{0AD85018-AAA2-49D9-A29F-910E6A82A6BF}.Debug|x64.ActiveCfg = Debug|Any CPU
{0AD85018-AAA2-49D9-A29F-910E6A82A6BF}.Debug|x64.Build.0 = Debug|Any CPU
{0AD85018-AAA2-49D9-A29F-910E6A82A6BF}.Debug|x86.ActiveCfg = Debug|Any CPU
{0AD85018-AAA2-49D9-A29F-910E6A82A6BF}.Debug|x86.Build.0 = Debug|Any CPU
{0AD85018-AAA2-49D9-A29F-910E6A82A6BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0AD85018-AAA2-49D9-A29F-910E6A82A6BF}.Release|Any CPU.Build.0 = Release|Any CPU
{0AD85018-AAA2-49D9-A29F-910E6A82A6BF}.Release|ARM64.ActiveCfg = Release|Any CPU
{0AD85018-AAA2-49D9-A29F-910E6A82A6BF}.Release|ARM64.Build.0 = Release|Any CPU
{0AD85018-AAA2-49D9-A29F-910E6A82A6BF}.Release|x64.ActiveCfg = Release|Any CPU
{0AD85018-AAA2-49D9-A29F-910E6A82A6BF}.Release|x64.Build.0 = Release|Any CPU
{0AD85018-AAA2-49D9-A29F-910E6A82A6BF}.Release|x86.ActiveCfg = Release|Any CPU
{0AD85018-AAA2-49D9-A29F-910E6A82A6BF}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{EC4A7DE1-589A-4FFF-9E2A-48ED6114182F} = {0537A9FF-BF86-4F92-A731-B6141B27ADDB}
{0AD85018-AAA2-49D9-A29F-910E6A82A6BF} = {0537A9FF-BF86-4F92-A731-B6141B27ADDB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {7BD789E2-AC9A-40C1-BD71-A7DA5DFBF325}
EndGlobalSection
Expand Down
12 changes: 8 additions & 4 deletions Natsurainko.FluentLauncher/App.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
using AppSettingsManagement;
using AppSettingsManagement.Windows;
using FluentLauncher.Infra.UI.Navigation;
using FluentLauncher.Infra.UI.Pages;
using FluentLauncher.Infra.UI.Windows;
using FluentLauncher.Infra.WinUI;
using FluentLauncher.Infra.WinUI.Navigation;
using FluentLauncher.Infra.WinUI.Pages;
using FluentLauncher.Infra.WinUI.Windows;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
Expand All @@ -11,9 +18,6 @@
using Natsurainko.FluentLauncher.Services.SystemServices;
using Natsurainko.FluentLauncher.Services.UI;
using Natsurainko.FluentLauncher.Services.UI.Messaging;
using Natsurainko.FluentLauncher.Services.UI.Navigation;
using Natsurainko.FluentLauncher.Services.UI.Pages;
using Natsurainko.FluentLauncher.Services.UI.Windows;
using Natsurainko.FluentLauncher.ViewModels;
using Natsurainko.FluentLauncher.ViewModels.Activities;
using Natsurainko.FluentLauncher.Views;
Expand Down Expand Up @@ -129,7 +133,7 @@ private static IServiceProvider ConfigureServices()
// UI services
services.AddSingleton<IPageProvider>(sp => BuildPageProvider(sp));
services.AddSingleton<IActivationService>(_ => BuildActivationService());
services.AddScoped<INavigationService, NavigationService>(); // A scope is created for each window or page that supports navigation.
services.AddScoped<INavigationService, WinUINavigationService>(); // A scope is created for each window or page that supports navigation.

// Settings service
services.AddSingleton<SettingsService>();
Expand Down
1 change: 1 addition & 0 deletions Natsurainko.FluentLauncher/Natsurainko.FluentLauncher.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\infra\FluentLauncher.Infra.WinUI\FluentLauncher.Infra.WinUI.csproj" />
<ProjectReference Include="..\Natsurainko.FluentCore\Natsurainko.FluentCore\Natsurainko.FluentCore.csproj" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions Natsurainko.FluentLauncher/Services/Download/DownloadService.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Natsurainko.FluentLauncher.Models.Download;
using FluentLauncher.Infra.UI.Navigation;
using Natsurainko.FluentLauncher.Models.Download;
using Natsurainko.FluentLauncher.Models.UI;
using Natsurainko.FluentLauncher.Services.Launch;
using Natsurainko.FluentLauncher.Services.Settings;
using Natsurainko.FluentLauncher.Services.Storage;
using Natsurainko.FluentLauncher.Services.UI.Navigation;
using Natsurainko.FluentLauncher.Utils;
using Natsurainko.FluentLauncher.Utils.Xaml;
using Nrk.FluentCore.Management;
Expand Down
2 changes: 1 addition & 1 deletion Natsurainko.FluentLauncher/Services/SystemServices/JumpListService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using Microsoft.Windows.AppNotifications.Builder;
using Natsurainko.FluentLauncher.Components.Launch;
using Natsurainko.FluentLauncher.Services.Launch;
using Natsurainko.FluentLauncher.Services.UI.Windows;
using Natsurainko.FluentLauncher.Utils;
using Natsurainko.FluentLauncher.ViewModels.Activities;
using Nrk.FluentCore.Launch;
Expand All @@ -14,6 +13,7 @@
using System.Text.Json;
using System.Threading.Tasks;
using Windows.UI.StartScreen;
using FluentLauncher.Infra.UI.Windows;

namespace Natsurainko.FluentLauncher.Services.SystemServices;

Expand Down
2 changes: 1 addition & 1 deletion Natsurainko.FluentLauncher/ViewModels/Activities/ActivitiesNavigationViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using CommunityToolkit.Mvvm.ComponentModel;
using Natsurainko.FluentLauncher.Services.UI.Navigation;
using FluentLauncher.Infra.UI.Navigation;

namespace Natsurainko.FluentLauncher.ViewModels.Activities;

Expand Down
2 changes: 1 addition & 1 deletion Natsurainko.FluentLauncher/ViewModels/Activities/DownloadViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using FluentLauncher.Infra.UI.Navigation;
using Microsoft.UI.Xaml;
using Natsurainko.FluentLauncher.Models.UI;
using Natsurainko.FluentLauncher.Services.Download;
using Natsurainko.FluentLauncher.Services.UI.Navigation;
using System;
using System.Collections.ObjectModel;
using System.Linq;
Expand Down
2 changes: 1 addition & 1 deletion Natsurainko.FluentLauncher/ViewModels/Activities/LaunchViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using FluentLauncher.Infra.UI.Navigation;
using Microsoft.UI.Xaml;
using Natsurainko.FluentLauncher.Components.Launch;
using Natsurainko.FluentLauncher.Services.Settings;
using Natsurainko.FluentLauncher.Services.UI.Navigation;
using System;
using System.Collections.ObjectModel;
using System.Collections.Specialized;
Expand Down
2 changes: 1 addition & 1 deletion Natsurainko.FluentLauncher/ViewModels/Common/DeleteGameDialogViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using FluentLauncher.Infra.UI.Navigation;
using Microsoft.UI.Xaml.Controls;
using Natsurainko.FluentLauncher.Services.Launch;
using Natsurainko.FluentLauncher.Services.UI;
using Natsurainko.FluentLauncher.Services.UI.Navigation;
using Natsurainko.FluentLauncher.Utils;
using Nrk.FluentCore.Management;
using Nrk.FluentCore.Utils;
Expand Down
2 changes: 1 addition & 1 deletion Natsurainko.FluentLauncher/ViewModels/Common/ResourceItemFilesDialogViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using FluentLauncher.Infra.UI.Navigation;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Data;
using Microsoft.Win32;
using Natsurainko.FluentLauncher.Models.UI;
using Natsurainko.FluentLauncher.Services.Download;
using Natsurainko.FluentLauncher.Services.Launch;
using Natsurainko.FluentLauncher.Services.Storage;
using Natsurainko.FluentLauncher.Services.UI.Navigation;
using Natsurainko.FluentLauncher.Utils;
using Nrk.FluentCore.Resources;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion Natsurainko.FluentLauncher/ViewModels/Cores/CoresViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using AppSettingsManagement.Mvvm;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using FluentLauncher.Infra.UI.Navigation;
using Natsurainko.FluentLauncher.Models.Download;
using Natsurainko.FluentLauncher.Services.Launch;
using Natsurainko.FluentLauncher.Services.Settings;
using Natsurainko.FluentLauncher.Services.UI;
using Natsurainko.FluentLauncher.Services.UI.Navigation;
using Natsurainko.FluentLauncher.Utils;
using Nrk.FluentCore.Management;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion Natsurainko.FluentLauncher/ViewModels/Cores/Manage/CoreModsViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using FluentLauncher.Infra.UI.Navigation;
using Natsurainko.FluentLauncher.Models.Download;
using Natsurainko.FluentLauncher.Services.UI.Navigation;
using Natsurainko.FluentLauncher.Utils;
using Nrk.FluentCore.Management;
using Nrk.FluentCore.Management.Mods;
Expand Down
2 changes: 1 addition & 1 deletion Natsurainko.FluentLauncher/ViewModels/Cores/Manage/CoreSettingsViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using FluentLauncher.Infra.UI.Navigation;
using Natsurainko.FluentLauncher.Models.Launch;
using Natsurainko.FluentLauncher.Services.Accounts;
using Natsurainko.FluentLauncher.Services.Launch;
using Natsurainko.FluentLauncher.Services.UI.Navigation;
using Natsurainko.FluentLauncher.Utils;
using Natsurainko.FluentLauncher.ViewModels.Common;
using Natsurainko.FluentLauncher.Views;
Expand Down
2 changes: 1 addition & 1 deletion Natsurainko.FluentLauncher/ViewModels/Cores/Manage/CoreStatisticViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using CommunityToolkit.Mvvm.ComponentModel;
using Natsurainko.FluentLauncher.Services.UI.Navigation;
using FluentLauncher.Infra.UI.Navigation;
using Nrk.FluentCore.Management;
using Nrk.FluentCore.Utils;
using System;
Expand Down
2 changes: 1 addition & 1 deletion Natsurainko.FluentLauncher/ViewModels/Cores/ManageNavigationViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using FluentLauncher.Infra.UI.Navigation;
using Microsoft.UI.Xaml.Controls;
using Natsurainko.FluentLauncher.Services.UI.Navigation;
using Natsurainko.FluentLauncher.Utils;
using Natsurainko.FluentLauncher.ViewModels.Common;
using Natsurainko.FluentLauncher.Views;
Expand Down
2 changes: 1 addition & 1 deletion Natsurainko.FluentLauncher/ViewModels/Downloads/CoreInstallWizardViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using FluentLauncher.Infra.UI.Navigation;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media.Animation;
using Natsurainko.FluentLauncher.Services.Download;
using Natsurainko.FluentLauncher.Services.Launch;
using Natsurainko.FluentLauncher.Services.Storage;
using Natsurainko.FluentLauncher.Services.UI;
using Natsurainko.FluentLauncher.Services.UI.Navigation;
using Natsurainko.FluentLauncher.Utils;
using Natsurainko.FluentLauncher.ViewModels.Common;
using Natsurainko.FluentLauncher.ViewModels.CoreInstallWizard;
Expand Down
2 changes: 1 addition & 1 deletion Natsurainko.FluentLauncher/ViewModels/Downloads/DownloadsViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using FluentLauncher.Infra.UI.Navigation;
using Microsoft.UI.Xaml;
using Natsurainko.FluentLauncher.Models.Download;
using Natsurainko.FluentLauncher.Models.UI;
using Natsurainko.FluentLauncher.Services.Launch;
using Natsurainko.FluentLauncher.Services.Storage;
using Natsurainko.FluentLauncher.Services.UI;
using Natsurainko.FluentLauncher.Services.UI.Navigation;
using Natsurainko.FluentLauncher.Utils;
using Nrk.FluentCore.Management.Downloader.Data;
using Nrk.FluentCore.Resources;
Expand Down
2 changes: 1 addition & 1 deletion Natsurainko.FluentLauncher/ViewModels/Downloads/ResourceItemViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using CommunityToolkit.Labs.WinUI.MarkdownTextBlock;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using FluentLauncher.Infra.UI.Navigation;
using Microsoft.UI.Xaml;
using Natsurainko.FluentLauncher.Services.Storage;
using Natsurainko.FluentLauncher.Services.UI.Navigation;
using Natsurainko.FluentLauncher.Utils;
using Natsurainko.FluentLauncher.ViewModels.Common;
using Natsurainko.FluentLauncher.Views;
Expand Down
2 changes: 1 addition & 1 deletion Natsurainko.FluentLauncher/ViewModels/Downloads/ResourcesSearchViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using FluentLauncher.Infra.UI.Navigation;
using Microsoft.UI.Xaml;
using Natsurainko.FluentLauncher.Models.Download;
using Natsurainko.FluentLauncher.Services.Launch;
using Natsurainko.FluentLauncher.Services.Storage;
using Natsurainko.FluentLauncher.Services.UI;
using Natsurainko.FluentLauncher.Services.UI.Navigation;
using Natsurainko.FluentLauncher.Utils;
using Nrk.FluentCore.Management.Downloader.Data;
using Nrk.FluentCore.Resources;
Expand Down
3 changes: 2 additions & 1 deletion Natsurainko.FluentLauncher/ViewModels/Home/HomeViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using CommunityToolkit.Mvvm.Messaging;
using FluentLauncher.Infra.UI.Navigation;
using Microsoft.UI.Xaml;
using Natsurainko.FluentLauncher.Services.Accounts;
using Natsurainko.FluentLauncher.Services.Launch;
using Natsurainko.FluentLauncher.Services.UI.Messaging;
using Natsurainko.FluentLauncher.Services.UI.Navigation;

using Natsurainko.FluentLauncher.Utils;
using Nrk.FluentCore.Authentication;
using Nrk.FluentCore.Management;
Expand Down
3 changes: 2 additions & 1 deletion Natsurainko.FluentLauncher/ViewModels/OOBE/OOBEViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using CommunityToolkit.Mvvm.Messaging;
using FluentLauncher.Infra.UI.Navigation;
using Microsoft.UI.Xaml.Controls;
using Natsurainko.FluentLauncher.Services.Accounts;
using Natsurainko.FluentLauncher.Services.Launch;
using Natsurainko.FluentLauncher.Services.Settings;
using Natsurainko.FluentLauncher.Services.UI;
using Natsurainko.FluentLauncher.Services.UI.Messaging;
using Natsurainko.FluentLauncher.Services.UI.Navigation;

using Natsurainko.FluentLauncher.Utils;
using Natsurainko.FluentLauncher.Views.Common;
using Nrk.FluentCore.Authentication;
Expand Down
3 changes: 2 additions & 1 deletion Natsurainko.FluentLauncher/ViewModels/Settings/LaunchViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
using AppSettingsManagement.Mvvm;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using FluentLauncher.Infra.UI.Navigation;
using Microsoft.Win32;
using Natsurainko.FluentLauncher.Services.Launch;
using Natsurainko.FluentLauncher.Services.Settings;
using Natsurainko.FluentLauncher.Services.UI;
using Natsurainko.FluentLauncher.Services.UI.Navigation;

using Natsurainko.FluentLauncher.Utils;
using Natsurainko.FluentLauncher.ViewModels.Common;
using Natsurainko.FluentLauncher.Views;
Expand Down
3 changes: 2 additions & 1 deletion Natsurainko.FluentLauncher/ViewModels/Settings/SettingsNavigationViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using CommunityToolkit.Mvvm.ComponentModel;
using Natsurainko.FluentLauncher.Services.UI.Navigation;
using FluentLauncher.Infra.UI.Navigation;


namespace Natsurainko.FluentLauncher.ViewModels.Settings;

Expand Down
3 changes: 2 additions & 1 deletion Natsurainko.FluentLauncher/ViewModels/ShellViewModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Natsurainko.FluentLauncher.Services.UI.Navigation;
using FluentLauncher.Infra.UI.Navigation;


namespace Natsurainko.FluentLauncher.ViewModels;

Expand Down
4 changes: 2 additions & 2 deletions Natsurainko.FluentLauncher/Views/Activities/ActivitiesNavigationPage.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using FluentLauncher.Infra.UI.Navigation;
using FluentLauncher.Infra.UI.Pages;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Navigation;
using Natsurainko.FluentLauncher.Services.UI.Navigation;
using Natsurainko.FluentLauncher.Services.UI.Pages;
using Natsurainko.FluentLauncher.Utils;
using Natsurainko.FluentLauncher.ViewModels.Activities;
using System.Linq;
Expand Down
3 changes: 2 additions & 1 deletion Natsurainko.FluentLauncher/Views/Cores/ManageNavigationPage.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using FluentLauncher.Infra.UI.Navigation;
using Microsoft.UI.Xaml.Controls;
using Natsurainko.FluentLauncher.Services.UI.Navigation;

using Natsurainko.FluentLauncher.Utils;
using Natsurainko.FluentLauncher.ViewModels.Cores;

Expand Down
3 changes: 2 additions & 1 deletion Natsurainko.FluentLauncher/Views/Downloads/CoreInstallWizardPage.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using FluentLauncher.Infra.UI.Navigation;
using Microsoft.UI.Xaml.Controls;
using Natsurainko.FluentLauncher.Services.UI.Navigation;


namespace Natsurainko.FluentLauncher.Views.Downloads;

Expand Down
3 changes: 2 additions & 1 deletion Natsurainko.FluentLauncher/Views/MainWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
using FluentLauncher.Infra.UI.Navigation;
using Microsoft.UI;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Natsurainko.FluentLauncher.Services.Settings;
using Natsurainko.FluentLauncher.Services.UI;
using Natsurainko.FluentLauncher.Services.UI.Navigation;

using Natsurainko.FluentLauncher.Utils;
using System.IO;
using Windows.ApplicationModel;
Expand Down
4 changes: 2 additions & 2 deletions Natsurainko.FluentLauncher/Views/OOBE/OOBENavigationPage.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using FluentLauncher.Infra.UI.Navigation;
using FluentLauncher.Infra.UI.Pages;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media.Animation;
using Microsoft.UI.Xaml.Navigation;
using Natsurainko.FluentLauncher.Services.UI.Navigation;
using Natsurainko.FluentLauncher.Services.UI.Pages;
using Natsurainko.FluentLauncher.Utils;
using Natsurainko.FluentLauncher.ViewModels.OOBE;
using System.Linq;
Expand Down
Loading

0 comments on commit a6f4035

Please sign in to comment.