From 2f857d9e633a38ddea5724652f74ede27f5c8b58 Mon Sep 17 00:00:00 2001 From: JasonWei512 <16899918+JasonWei512@users.noreply.github.com> Date: Tue, 12 Sep 2023 20:43:51 +0800 Subject: [PATCH] Move namespace "EnergyStarX.Interfaces" to "EnergyStarX.Contracts" For compatibility with TemplateStudio --- .../{Interfaces => Contracts}/Services/IFileService.cs | 2 +- src/EnergyStarX.Core/Services/FileService.cs | 2 +- src/EnergyStarX.Test/Fakes/FakeWindowService.cs | 2 +- src/EnergyStarX.Test/Tests/EnergyServiceTest.cs | 2 +- src/EnergyStarX/Activation/DefaultActivationHandler.cs | 2 +- src/EnergyStarX/App.xaml.cs | 4 ++-- src/EnergyStarX/Behaviors/NavigationViewHeaderBehavior.cs | 2 +- src/EnergyStarX/Behaviors/TextBlockBehavior.cs | 2 +- .../Services/IActivationService.cs | 2 +- .../{Interfaces => Contracts}/Services/IDialogService.cs | 2 +- .../{Interfaces => Contracts}/Services/IEnergyService.cs | 2 +- .../Services/INavigationService.cs | 2 +- .../Services/INavigationViewService.cs | 2 +- .../{Interfaces => Contracts}/Services/IPageService.cs | 2 +- .../{Interfaces => Contracts}/Services/ISettingsService.cs | 2 +- .../{Interfaces => Contracts}/Services/IStartupService.cs | 2 +- .../Services/ISystemTrayIconService.cs | 2 +- .../{Interfaces => Contracts}/Services/IWindowService.cs | 2 +- .../ViewModels/INavigationAware.cs | 2 +- src/EnergyStarX/Services/ActivationService.cs | 2 +- src/EnergyStarX/Services/DialogService.cs | 4 ++-- src/EnergyStarX/Services/EnergyService.cs | 2 +- src/EnergyStarX/Services/NavigationService.cs | 6 +++--- src/EnergyStarX/Services/NavigationViewService.cs | 4 ++-- src/EnergyStarX/Services/PageService.cs | 2 +- src/EnergyStarX/Services/SettingsService.cs | 4 ++-- src/EnergyStarX/Services/StartupService.cs | 2 +- src/EnergyStarX/Services/SystemTrayIconService.cs | 2 +- src/EnergyStarX/Services/WindowService.cs | 2 +- src/EnergyStarX/ViewModels/HomeViewModel.cs | 2 +- src/EnergyStarX/ViewModels/LogViewModel.cs | 2 +- src/EnergyStarX/ViewModels/SettingsViewModel.cs | 2 +- src/EnergyStarX/ViewModels/ShellViewModel.cs | 2 +- src/EnergyStarX/Views/ShellPage.xaml.cs | 4 ++-- 34 files changed, 41 insertions(+), 41 deletions(-) rename src/EnergyStarX.Core/{Interfaces => Contracts}/Services/IFileService.cs (80%) rename src/EnergyStarX/{Interfaces => Contracts}/Services/IActivationService.cs (64%) rename src/EnergyStarX/{Interfaces => Contracts}/Services/IDialogService.cs (72%) rename src/EnergyStarX/{Interfaces => Contracts}/Services/IEnergyService.cs (97%) rename src/EnergyStarX/{Interfaces => Contracts}/Services/INavigationService.cs (90%) rename src/EnergyStarX/{Interfaces => Contracts}/Services/INavigationViewService.cs (87%) rename src/EnergyStarX/{Interfaces => Contracts}/Services/IPageService.cs (60%) rename src/EnergyStarX/{Interfaces => Contracts}/Services/ISettingsService.cs (82%) rename src/EnergyStarX/{Interfaces => Contracts}/Services/IStartupService.cs (88%) rename src/EnergyStarX/{Interfaces => Contracts}/Services/ISystemTrayIconService.cs (61%) rename src/EnergyStarX/{Interfaces => Contracts}/Services/IWindowService.cs (85%) rename src/EnergyStarX/{Interfaces => Contracts}/ViewModels/INavigationAware.cs (69%) diff --git a/src/EnergyStarX.Core/Interfaces/Services/IFileService.cs b/src/EnergyStarX.Core/Contracts/Services/IFileService.cs similarity index 80% rename from src/EnergyStarX.Core/Interfaces/Services/IFileService.cs rename to src/EnergyStarX.Core/Contracts/Services/IFileService.cs index ca67476..523bf29 100644 --- a/src/EnergyStarX.Core/Interfaces/Services/IFileService.cs +++ b/src/EnergyStarX.Core/Contracts/Services/IFileService.cs @@ -1,4 +1,4 @@ -namespace EnergyStarX.Core.Interfaces.Services; +namespace EnergyStarX.Core.Contracts.Services; public interface IFileService { diff --git a/src/EnergyStarX.Core/Services/FileService.cs b/src/EnergyStarX.Core/Services/FileService.cs index 8287f98..cdd45da 100644 --- a/src/EnergyStarX.Core/Services/FileService.cs +++ b/src/EnergyStarX.Core/Services/FileService.cs @@ -1,4 +1,4 @@ -using EnergyStarX.Core.Interfaces.Services; +using EnergyStarX.Core.Contracts.Services; using System.Text; using System.Text.Json; diff --git a/src/EnergyStarX.Test/Fakes/FakeWindowService.cs b/src/EnergyStarX.Test/Fakes/FakeWindowService.cs index 071732f..98c46e5 100644 --- a/src/EnergyStarX.Test/Fakes/FakeWindowService.cs +++ b/src/EnergyStarX.Test/Fakes/FakeWindowService.cs @@ -1,4 +1,4 @@ -using EnergyStarX.Interfaces.Services; +using EnergyStarX.Contracts.Services; namespace EnergyStarX.Test.Fakes; diff --git a/src/EnergyStarX.Test/Tests/EnergyServiceTest.cs b/src/EnergyStarX.Test/Tests/EnergyServiceTest.cs index cc4e43e..4899881 100644 --- a/src/EnergyStarX.Test/Tests/EnergyServiceTest.cs +++ b/src/EnergyStarX.Test/Tests/EnergyServiceTest.cs @@ -1,4 +1,4 @@ -using EnergyStarX.Interfaces.Services; +using EnergyStarX.Contracts.Services; using EnergyStarX.Services; using EnergyStarX.Test.Fakes; diff --git a/src/EnergyStarX/Activation/DefaultActivationHandler.cs b/src/EnergyStarX/Activation/DefaultActivationHandler.cs index 9d9df47..8f2e602 100644 --- a/src/EnergyStarX/Activation/DefaultActivationHandler.cs +++ b/src/EnergyStarX/Activation/DefaultActivationHandler.cs @@ -1,4 +1,4 @@ -using EnergyStarX.Interfaces.Services; +using EnergyStarX.Contracts.Services; using EnergyStarX.ViewModels; using Microsoft.UI.Xaml; diff --git a/src/EnergyStarX/App.xaml.cs b/src/EnergyStarX/App.xaml.cs index 282df63..933a124 100644 --- a/src/EnergyStarX/App.xaml.cs +++ b/src/EnergyStarX/App.xaml.cs @@ -1,9 +1,9 @@ using EnergyStarX.Activation; using EnergyStarX.Constants; -using EnergyStarX.Core.Interfaces.Services; +using EnergyStarX.Contracts.Services; +using EnergyStarX.Core.Contracts.Services; using EnergyStarX.Core.Services; using EnergyStarX.Helpers; -using EnergyStarX.Interfaces.Services; using EnergyStarX.Models; using EnergyStarX.Services; using EnergyStarX.ViewModels; diff --git a/src/EnergyStarX/Behaviors/NavigationViewHeaderBehavior.cs b/src/EnergyStarX/Behaviors/NavigationViewHeaderBehavior.cs index 13dea0a..0bd4a19 100644 --- a/src/EnergyStarX/Behaviors/NavigationViewHeaderBehavior.cs +++ b/src/EnergyStarX/Behaviors/NavigationViewHeaderBehavior.cs @@ -1,4 +1,4 @@ -using EnergyStarX.Interfaces.Services; +using EnergyStarX.Contracts.Services; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; diff --git a/src/EnergyStarX/Behaviors/TextBlockBehavior.cs b/src/EnergyStarX/Behaviors/TextBlockBehavior.cs index c76efba..ff7a970 100644 --- a/src/EnergyStarX/Behaviors/TextBlockBehavior.cs +++ b/src/EnergyStarX/Behaviors/TextBlockBehavior.cs @@ -1,5 +1,5 @@ using DependencyPropertyGenerator; -using EnergyStarX.Interfaces.Services; +using EnergyStarX.Contracts.Services; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Documents; diff --git a/src/EnergyStarX/Interfaces/Services/IActivationService.cs b/src/EnergyStarX/Contracts/Services/IActivationService.cs similarity index 64% rename from src/EnergyStarX/Interfaces/Services/IActivationService.cs rename to src/EnergyStarX/Contracts/Services/IActivationService.cs index 1c696de..6daff69 100644 --- a/src/EnergyStarX/Interfaces/Services/IActivationService.cs +++ b/src/EnergyStarX/Contracts/Services/IActivationService.cs @@ -1,4 +1,4 @@ -namespace EnergyStarX.Interfaces.Services; +namespace EnergyStarX.Contracts.Services; public interface IActivationService { diff --git a/src/EnergyStarX/Interfaces/Services/IDialogService.cs b/src/EnergyStarX/Contracts/Services/IDialogService.cs similarity index 72% rename from src/EnergyStarX/Interfaces/Services/IDialogService.cs rename to src/EnergyStarX/Contracts/Services/IDialogService.cs index c36678f..70d590e 100644 --- a/src/EnergyStarX/Interfaces/Services/IDialogService.cs +++ b/src/EnergyStarX/Contracts/Services/IDialogService.cs @@ -1,4 +1,4 @@ -namespace EnergyStarX.Interfaces.Services; +namespace EnergyStarX.Contracts.Services; public interface IDialogService { diff --git a/src/EnergyStarX/Interfaces/Services/IEnergyService.cs b/src/EnergyStarX/Contracts/Services/IEnergyService.cs similarity index 97% rename from src/EnergyStarX/Interfaces/Services/IEnergyService.cs rename to src/EnergyStarX/Contracts/Services/IEnergyService.cs index 5d57d66..2b07445 100644 --- a/src/EnergyStarX/Interfaces/Services/IEnergyService.cs +++ b/src/EnergyStarX/Contracts/Services/IEnergyService.cs @@ -1,4 +1,4 @@ -namespace EnergyStarX.Interfaces.Services; +namespace EnergyStarX.Contracts.Services; public enum ThrottleStatus { diff --git a/src/EnergyStarX/Interfaces/Services/INavigationService.cs b/src/EnergyStarX/Contracts/Services/INavigationService.cs similarity index 90% rename from src/EnergyStarX/Interfaces/Services/INavigationService.cs rename to src/EnergyStarX/Contracts/Services/INavigationService.cs index 2dcc3e1..810409d 100644 --- a/src/EnergyStarX/Interfaces/Services/INavigationService.cs +++ b/src/EnergyStarX/Contracts/Services/INavigationService.cs @@ -2,7 +2,7 @@ using Microsoft.UI.Xaml.Media.Animation; using Microsoft.UI.Xaml.Navigation; -namespace EnergyStarX.Interfaces.Services; +namespace EnergyStarX.Contracts.Services; public interface INavigationService { diff --git a/src/EnergyStarX/Interfaces/Services/INavigationViewService.cs b/src/EnergyStarX/Contracts/Services/INavigationViewService.cs similarity index 87% rename from src/EnergyStarX/Interfaces/Services/INavigationViewService.cs rename to src/EnergyStarX/Contracts/Services/INavigationViewService.cs index b89b3d5..05a2208 100644 --- a/src/EnergyStarX/Interfaces/Services/INavigationViewService.cs +++ b/src/EnergyStarX/Contracts/Services/INavigationViewService.cs @@ -1,6 +1,6 @@ using Microsoft.UI.Xaml.Controls; -namespace EnergyStarX.Interfaces.Services; +namespace EnergyStarX.Contracts.Services; public interface INavigationViewService { diff --git a/src/EnergyStarX/Interfaces/Services/IPageService.cs b/src/EnergyStarX/Contracts/Services/IPageService.cs similarity index 60% rename from src/EnergyStarX/Interfaces/Services/IPageService.cs rename to src/EnergyStarX/Contracts/Services/IPageService.cs index 4cac871..0ecbd2f 100644 --- a/src/EnergyStarX/Interfaces/Services/IPageService.cs +++ b/src/EnergyStarX/Contracts/Services/IPageService.cs @@ -1,4 +1,4 @@ -namespace EnergyStarX.Interfaces.Services; +namespace EnergyStarX.Contracts.Services; public interface IPageService { diff --git a/src/EnergyStarX/Interfaces/Services/ISettingsService.cs b/src/EnergyStarX/Contracts/Services/ISettingsService.cs similarity index 82% rename from src/EnergyStarX/Interfaces/Services/ISettingsService.cs rename to src/EnergyStarX/Contracts/Services/ISettingsService.cs index a44dfb7..2a1658c 100644 --- a/src/EnergyStarX/Interfaces/Services/ISettingsService.cs +++ b/src/EnergyStarX/Contracts/Services/ISettingsService.cs @@ -1,4 +1,4 @@ -namespace EnergyStarX.Interfaces.Services; +namespace EnergyStarX.Contracts.Services; public interface ISettingsService { diff --git a/src/EnergyStarX/Interfaces/Services/IStartupService.cs b/src/EnergyStarX/Contracts/Services/IStartupService.cs similarity index 88% rename from src/EnergyStarX/Interfaces/Services/IStartupService.cs rename to src/EnergyStarX/Contracts/Services/IStartupService.cs index 5004de2..43acc19 100644 --- a/src/EnergyStarX/Interfaces/Services/IStartupService.cs +++ b/src/EnergyStarX/Contracts/Services/IStartupService.cs @@ -1,4 +1,4 @@ -namespace EnergyStarX.Interfaces.Services; +namespace EnergyStarX.Contracts.Services; public enum StartupType { diff --git a/src/EnergyStarX/Interfaces/Services/ISystemTrayIconService.cs b/src/EnergyStarX/Contracts/Services/ISystemTrayIconService.cs similarity index 61% rename from src/EnergyStarX/Interfaces/Services/ISystemTrayIconService.cs rename to src/EnergyStarX/Contracts/Services/ISystemTrayIconService.cs index 82014d8..5abd662 100644 --- a/src/EnergyStarX/Interfaces/Services/ISystemTrayIconService.cs +++ b/src/EnergyStarX/Contracts/Services/ISystemTrayIconService.cs @@ -1,4 +1,4 @@ -namespace EnergyStarX.Interfaces.Services; +namespace EnergyStarX.Contracts.Services; public interface ISystemTrayIconService { diff --git a/src/EnergyStarX/Interfaces/Services/IWindowService.cs b/src/EnergyStarX/Contracts/Services/IWindowService.cs similarity index 85% rename from src/EnergyStarX/Interfaces/Services/IWindowService.cs rename to src/EnergyStarX/Contracts/Services/IWindowService.cs index cc19dd9..187762f 100644 --- a/src/EnergyStarX/Interfaces/Services/IWindowService.cs +++ b/src/EnergyStarX/Contracts/Services/IWindowService.cs @@ -1,4 +1,4 @@ -namespace EnergyStarX.Interfaces.Services; +namespace EnergyStarX.Contracts.Services; public interface IWindowService { diff --git a/src/EnergyStarX/Interfaces/ViewModels/INavigationAware.cs b/src/EnergyStarX/Contracts/ViewModels/INavigationAware.cs similarity index 69% rename from src/EnergyStarX/Interfaces/ViewModels/INavigationAware.cs rename to src/EnergyStarX/Contracts/ViewModels/INavigationAware.cs index 668c6b3..4ba9983 100644 --- a/src/EnergyStarX/Interfaces/ViewModels/INavigationAware.cs +++ b/src/EnergyStarX/Contracts/ViewModels/INavigationAware.cs @@ -1,4 +1,4 @@ -namespace EnergyStarX.Interfaces.ViewModels; +namespace EnergyStarX.Contracts.ViewModels; public interface INavigationAware { diff --git a/src/EnergyStarX/Services/ActivationService.cs b/src/EnergyStarX/Services/ActivationService.cs index 60b5ee1..d24e333 100644 --- a/src/EnergyStarX/Services/ActivationService.cs +++ b/src/EnergyStarX/Services/ActivationService.cs @@ -1,5 +1,5 @@ using EnergyStarX.Activation; -using EnergyStarX.Interfaces.Services; +using EnergyStarX.Contracts.Services; using EnergyStarX.ViewModels; using EnergyStarX.Views; diff --git a/src/EnergyStarX/Services/DialogService.cs b/src/EnergyStarX/Services/DialogService.cs index b1d8eed..d92d79b 100644 --- a/src/EnergyStarX/Services/DialogService.cs +++ b/src/EnergyStarX/Services/DialogService.cs @@ -1,5 +1,5 @@ -using EnergyStarX.Helpers; -using EnergyStarX.Interfaces.Services; +using EnergyStarX.Contracts.Services; +using EnergyStarX.Helpers; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; diff --git a/src/EnergyStarX/Services/EnergyService.cs b/src/EnergyStarX/Services/EnergyService.cs index 567bf21..69e0ff9 100644 --- a/src/EnergyStarX/Services/EnergyService.cs +++ b/src/EnergyStarX/Services/EnergyService.cs @@ -4,7 +4,7 @@ // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // If you are Microsoft (and/or its affiliates) employee, vendor or contractor who is working on Windows-specific integration projects, you may use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so without the restriction above. -using EnergyStarX.Interfaces.Services; +using EnergyStarX.Contracts.Services; using EnergyStarX.Interop; using Microsoft.Windows.System.Power; using NLog; diff --git a/src/EnergyStarX/Services/NavigationService.cs b/src/EnergyStarX/Services/NavigationService.cs index 6b0fbbd..3dfa5ce 100644 --- a/src/EnergyStarX/Services/NavigationService.cs +++ b/src/EnergyStarX/Services/NavigationService.cs @@ -1,6 +1,6 @@ -using EnergyStarX.Helpers; -using EnergyStarX.Interfaces.Services; -using EnergyStarX.Interfaces.ViewModels; +using EnergyStarX.Contracts.Services; +using EnergyStarX.Contracts.ViewModels; +using EnergyStarX.Helpers; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media.Animation; using Microsoft.UI.Xaml.Navigation; diff --git a/src/EnergyStarX/Services/NavigationViewService.cs b/src/EnergyStarX/Services/NavigationViewService.cs index 530299c..e230499 100644 --- a/src/EnergyStarX/Services/NavigationViewService.cs +++ b/src/EnergyStarX/Services/NavigationViewService.cs @@ -1,5 +1,5 @@ -using EnergyStarX.Helpers; -using EnergyStarX.Interfaces.Services; +using EnergyStarX.Contracts.Services; +using EnergyStarX.Helpers; using EnergyStarX.ViewModels; using Microsoft.UI.Xaml.Controls; using System.Diagnostics.CodeAnalysis; diff --git a/src/EnergyStarX/Services/PageService.cs b/src/EnergyStarX/Services/PageService.cs index 684b4a8..ee8278f 100644 --- a/src/EnergyStarX/Services/PageService.cs +++ b/src/EnergyStarX/Services/PageService.cs @@ -1,6 +1,6 @@ using CommunityToolkit.Mvvm.ComponentModel; -using EnergyStarX.Interfaces.Services; +using EnergyStarX.Contracts.Services; using EnergyStarX.ViewModels; using EnergyStarX.Views; diff --git a/src/EnergyStarX/Services/SettingsService.cs b/src/EnergyStarX/Services/SettingsService.cs index d2f1ee8..79739b6 100644 --- a/src/EnergyStarX/Services/SettingsService.cs +++ b/src/EnergyStarX/Services/SettingsService.cs @@ -1,5 +1,5 @@ -using EnergyStarX.Helpers; -using EnergyStarX.Interfaces.Services; +using EnergyStarX.Contracts.Services; +using EnergyStarX.Helpers; using NickJohn.WinUI.ObservableSettings; namespace EnergyStarX.Services; diff --git a/src/EnergyStarX/Services/StartupService.cs b/src/EnergyStarX/Services/StartupService.cs index c2b56f0..3637a17 100644 --- a/src/EnergyStarX/Services/StartupService.cs +++ b/src/EnergyStarX/Services/StartupService.cs @@ -10,7 +10,7 @@ It will be uninstalled automatically when the app is uninstalled. It can also th But that requires a double-process and communication app model, which is more complex to implement. */ -using EnergyStarX.Interfaces.Services; +using EnergyStarX.Contracts.Services; using NLog; using System.ComponentModel; using System.Diagnostics; diff --git a/src/EnergyStarX/Services/SystemTrayIconService.cs b/src/EnergyStarX/Services/SystemTrayIconService.cs index 24499bc..d4e2b57 100644 --- a/src/EnergyStarX/Services/SystemTrayIconService.cs +++ b/src/EnergyStarX/Services/SystemTrayIconService.cs @@ -1,6 +1,6 @@ using CommunityToolkit.WinUI; +using EnergyStarX.Contracts.Services; using EnergyStarX.Helpers; -using EnergyStarX.Interfaces.Services; using H.NotifyIcon.Core; using Microsoft.UI.Dispatching; using NLog; diff --git a/src/EnergyStarX/Services/WindowService.cs b/src/EnergyStarX/Services/WindowService.cs index 57b14d4..3ee75e3 100644 --- a/src/EnergyStarX/Services/WindowService.cs +++ b/src/EnergyStarX/Services/WindowService.cs @@ -1,4 +1,4 @@ -using EnergyStarX.Interfaces.Services; +using EnergyStarX.Contracts.Services; using Microsoft.AppCenter.Analytics; using Microsoft.UI.Xaml; diff --git a/src/EnergyStarX/ViewModels/HomeViewModel.cs b/src/EnergyStarX/ViewModels/HomeViewModel.cs index ec06924..4a39c5d 100644 --- a/src/EnergyStarX/ViewModels/HomeViewModel.cs +++ b/src/EnergyStarX/ViewModels/HomeViewModel.cs @@ -1,7 +1,7 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.WinUI; +using EnergyStarX.Contracts.Services; using EnergyStarX.Helpers; -using EnergyStarX.Interfaces.Services; using Microsoft.UI.Dispatching; using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Media.Imaging; diff --git a/src/EnergyStarX/ViewModels/LogViewModel.cs b/src/EnergyStarX/ViewModels/LogViewModel.cs index 5fb0d2e..b285d0a 100644 --- a/src/EnergyStarX/ViewModels/LogViewModel.cs +++ b/src/EnergyStarX/ViewModels/LogViewModel.cs @@ -1,8 +1,8 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using CommunityToolkit.WinUI; +using EnergyStarX.Contracts.Services; using EnergyStarX.Helpers; -using EnergyStarX.Interfaces.Services; using Microsoft.UI.Dispatching; using System.Collections.ObjectModel; using Windows.ApplicationModel.DataTransfer; diff --git a/src/EnergyStarX/ViewModels/SettingsViewModel.cs b/src/EnergyStarX/ViewModels/SettingsViewModel.cs index b64f6a3..432e08d 100644 --- a/src/EnergyStarX/ViewModels/SettingsViewModel.cs +++ b/src/EnergyStarX/ViewModels/SettingsViewModel.cs @@ -1,7 +1,7 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; +using EnergyStarX.Contracts.Services; using EnergyStarX.Helpers; -using EnergyStarX.Interfaces.Services; using Windows.ApplicationModel; using Windows.Security.ExchangeActiveSyncProvisioning; using Windows.System; diff --git a/src/EnergyStarX/ViewModels/ShellViewModel.cs b/src/EnergyStarX/ViewModels/ShellViewModel.cs index 34404cd..5e5594c 100644 --- a/src/EnergyStarX/ViewModels/ShellViewModel.cs +++ b/src/EnergyStarX/ViewModels/ShellViewModel.cs @@ -1,7 +1,7 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; +using EnergyStarX.Contracts.Services; using EnergyStarX.Helpers; -using EnergyStarX.Interfaces.Services; using EnergyStarX.Views; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Navigation; diff --git a/src/EnergyStarX/Views/ShellPage.xaml.cs b/src/EnergyStarX/Views/ShellPage.xaml.cs index 5381401..308be2d 100644 --- a/src/EnergyStarX/Views/ShellPage.xaml.cs +++ b/src/EnergyStarX/Views/ShellPage.xaml.cs @@ -1,5 +1,5 @@ -using EnergyStarX.Helpers; -using EnergyStarX.Interfaces.Services; +using EnergyStarX.Contracts.Services; +using EnergyStarX.Helpers; using EnergyStarX.ViewModels; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls;