diff --git a/src/HyPlayer.App/App.csproj b/src/HyPlayer.App/App.csproj index dfb7c7b..0897101 100644 --- a/src/HyPlayer.App/App.csproj +++ b/src/HyPlayer.App/App.csproj @@ -19,6 +19,7 @@ HyPlayer 3e757a82-9759-482b-851c-170ec2aa99dc 10.0.19041.0 + 10.0.22621.35-preview @@ -59,7 +60,7 @@ - + diff --git a/src/HyPlayer.App/App.xaml.cs b/src/HyPlayer.App/App.xaml.cs index ef71536..164788f 100644 --- a/src/HyPlayer.App/App.xaml.cs +++ b/src/HyPlayer.App/App.xaml.cs @@ -3,7 +3,7 @@ using Depository.Extensions; using HyPlayer.Extensions.DependencyInjectionExtensions; using HyPlayer.Extensions.Helpers; -using HyPlayer.Interfaces.Views; +using HyPlayer.Interfaces.Services; using HyPlayer.PlayCore; using HyPlayer.PlayCore.Abstraction; using HyPlayer.Services; diff --git a/src/HyPlayer.App/Interfaces/Views/INavigationService.cs b/src/HyPlayer.App/Interfaces/Services/INavigationService.cs similarity index 82% rename from src/HyPlayer.App/Interfaces/Views/INavigationService.cs rename to src/HyPlayer.App/Interfaces/Services/INavigationService.cs index 03b4d62..1a4874c 100644 --- a/src/HyPlayer.App/Interfaces/Views/INavigationService.cs +++ b/src/HyPlayer.App/Interfaces/Services/INavigationService.cs @@ -1,8 +1,8 @@ -using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Navigation; using System; -namespace HyPlayer.Interfaces.Views; +namespace HyPlayer.Interfaces.Services; public interface INavigationService { diff --git a/src/HyPlayer.App/Interfaces/Views/IPageService.cs b/src/HyPlayer.App/Interfaces/Services/IPageService.cs similarity index 67% rename from src/HyPlayer.App/Interfaces/Views/IPageService.cs rename to src/HyPlayer.App/Interfaces/Services/IPageService.cs index 316b8cb..325b92f 100644 --- a/src/HyPlayer.App/Interfaces/Views/IPageService.cs +++ b/src/HyPlayer.App/Interfaces/Services/IPageService.cs @@ -1,6 +1,6 @@ using System; -namespace HyPlayer.Interfaces.Views; +namespace HyPlayer.Interfaces.Services; public interface IPageService { diff --git a/src/HyPlayer.App/Services/NavigationService.cs b/src/HyPlayer.App/Services/NavigationService.cs index dc84d0f..e5188b0 100644 --- a/src/HyPlayer.App/Services/NavigationService.cs +++ b/src/HyPlayer.App/Services/NavigationService.cs @@ -1,4 +1,4 @@ -using HyPlayer.Interfaces.Views; +using HyPlayer.Interfaces.Services; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media.Animation; using Microsoft.UI.Xaml.Navigation; diff --git a/src/HyPlayer.App/Services/PageService.cs b/src/HyPlayer.App/Services/PageService.cs index 7b7b29f..5340473 100644 --- a/src/HyPlayer.App/Services/PageService.cs +++ b/src/HyPlayer.App/Services/PageService.cs @@ -1,4 +1,4 @@ -using HyPlayer.Interfaces.Views; +using HyPlayer.Interfaces.Services; using HyPlayer.Views.Pages; using System; diff --git a/src/HyPlayer.App/ViewModels/ShellViewModel.cs b/src/HyPlayer.App/ViewModels/ShellViewModel.cs index 9cf6445..7368160 100644 --- a/src/HyPlayer.App/ViewModels/ShellViewModel.cs +++ b/src/HyPlayer.App/ViewModels/ShellViewModel.cs @@ -1,7 +1,7 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; +using HyPlayer.Interfaces.Services; using HyPlayer.Interfaces.ViewModels; -using HyPlayer.Interfaces.Views; namespace HyPlayer.ViewModels { diff --git a/src/HyPlayer.App/Views/Controls/Dialogs/SignInDialog.xaml.cs b/src/HyPlayer.App/Views/Controls/Dialogs/SignInDialog.xaml.cs index 7fe79b8..4df0458 100644 --- a/src/HyPlayer.App/Views/Controls/Dialogs/SignInDialog.xaml.cs +++ b/src/HyPlayer.App/Views/Controls/Dialogs/SignInDialog.xaml.cs @@ -1,7 +1,7 @@ using Depository.Abstraction.Interfaces; using Depository.Core; using Depository.Extensions; -using HyPlayer.Interfaces.Views; +using HyPlayer.Interfaces.Services; using HyPlayer.ViewModels; using Microsoft.UI.Xaml.Controls; diff --git a/src/HyPlayer.App/Views/Controls/Search/SearchBox.xaml.cs b/src/HyPlayer.App/Views/Controls/Search/SearchBox.xaml.cs index 793c711..e033391 100644 --- a/src/HyPlayer.App/Views/Controls/Search/SearchBox.xaml.cs +++ b/src/HyPlayer.App/Views/Controls/Search/SearchBox.xaml.cs @@ -1,3 +1,4 @@ +using HyPlayer.Interfaces.Services; using HyPlayer.Interfaces.Views; using HyPlayer.ViewModels; using HyPlayer.Views.Pages; diff --git a/src/HyPlayer.App/Views/Pages/HomePage.xaml.cs b/src/HyPlayer.App/Views/Pages/HomePage.xaml.cs index ccb575e..c60c08d 100644 --- a/src/HyPlayer.App/Views/Pages/HomePage.xaml.cs +++ b/src/HyPlayer.App/Views/Pages/HomePage.xaml.cs @@ -1,4 +1,5 @@ using AsyncAwaitBestPractices; +using HyPlayer.Interfaces.Services; using HyPlayer.Interfaces.Views; using HyPlayer.NeteaseProvider.Models; using Microsoft.UI.Xaml; diff --git a/src/HyPlayer.App/Views/Pages/ShellPage.xaml.cs b/src/HyPlayer.App/Views/Pages/ShellPage.xaml.cs index ac07f23..94f3bc1 100644 --- a/src/HyPlayer.App/Views/Pages/ShellPage.xaml.cs +++ b/src/HyPlayer.App/Views/Pages/ShellPage.xaml.cs @@ -1,3 +1,4 @@ +using HyPlayer.Interfaces.Services; using HyPlayer.Interfaces.Views; using HyPlayer.ViewModels; using Microsoft.UI.Xaml; diff --git a/src/HyPlayer.App/Views/Window/MainWindow.xaml.cs b/src/HyPlayer.App/Views/Window/MainWindow.xaml.cs index 0b9151b..c9f15b3 100644 --- a/src/HyPlayer.App/Views/Window/MainWindow.xaml.cs +++ b/src/HyPlayer.App/Views/Window/MainWindow.xaml.cs @@ -1,7 +1,7 @@ using Depository.Abstraction.Interfaces; using Depository.Core; using Depository.Extensions; -using HyPlayer.Interfaces.Views; +using HyPlayer.Interfaces.Services; using HyPlayer.ViewModels; using HyPlayer.Views.Controls.Dialogs; using HyPlayer.Views.Pages;