From 734a3d75db688711213c0feaf3af33aaeff6096c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Burak=20Kaan=20K=C3=B6se?= Date: Mon, 29 Sep 2025 11:23:44 +0200 Subject: [PATCH] Replace Core.UWP namespace with Core.WinUI --- .../Models/Accounts/ProviderDetail.cs | 4 ++-- Wino.Core.WinUI/AppThemes/Clouds.xaml | 2 +- Wino.Core.WinUI/AppThemes/Forest.xaml | 2 +- Wino.Core.WinUI/AppThemes/Garden.xaml | 2 +- Wino.Core.WinUI/AppThemes/Nighty.xaml | 2 +- Wino.Core.WinUI/AppThemes/Snowflake.xaml | 2 +- Wino.Core.WinUI/BasePage.cs | 2 +- .../AccountCreationDialogControl.xaml | 4 ++-- .../AccountCreationDialogControl.xaml.cs | 2 +- Wino.Core.WinUI/Controls/ControlConstants.cs | 2 +- Wino.Core.WinUI/Controls/CustomWrapPanel.cs | 2 +- Wino.Core.WinUI/Controls/EqualGridPanel.cs | 2 +- Wino.Core.WinUI/Controls/WinoAppTitleBar.xaml | 2 +- .../Controls/WinoAppTitleBar.xaml.cs | 2 +- Wino.Core.WinUI/Controls/WinoFontIcon.cs | 2 +- .../Controls/WinoFontIconSource.cs | 2 +- Wino.Core.WinUI/Controls/WinoInfoBar.cs | 2 +- .../Controls/WinoNavigationViewItem.cs | 2 +- .../Converters/HexToColorBrushConverter.cs | 2 +- Wino.Core.WinUI/CoreGeneric.xaml | 6 ++--- Wino.Core.WinUI/CoreGeneric.xaml.cs | 2 +- Wino.Core.WinUI/CoreUWPContainerSetup.cs | 4 ++-- .../Dialogs/AccountCreationDialog.xaml | 2 +- .../Dialogs/CustomThemeBuilderDialog.xaml.cs | 2 +- Wino.Core.WinUI/Dialogs/NewAccountDialog.xaml | 2 +- .../Dialogs/NewAccountDialog.xaml.cs | 2 +- Wino.Core.WinUI/Dispatcher.cs | 2 +- .../Extensions/ElementThemeExtensions.cs | 2 +- .../Extensions/StartupTaskStateExtensions.cs | 2 +- .../Extensions/StorageFileExtensions.cs | 2 +- .../Extensions/WebViewExtensions.cs | 2 +- Wino.Core.WinUI/Helpers/XamlHelpers.cs | 2 +- .../Models/Personalization/CustomAppTheme.cs | 4 ++-- .../Personalization/PreDefinedAppTheme.cs | 6 ++--- .../Models/Personalization/SystemAppTheme.cs | 2 +- .../AppThemePreviewTemplateSelector.cs | 4 ++-- .../CustomWinoMessageDialogIconSelector.cs | 2 +- .../Selectors/FileAttachmentTypeSelector.cs | 2 +- .../NavigationMenuTemplateSelector.cs | 2 +- .../Services/ApplicationResourceManager.cs | 2 +- Wino.Core.WinUI/Services/ClipboardService.cs | 2 +- .../Services/ConfigurationService.cs | 2 +- Wino.Core.WinUI/Services/DialogServiceBase.cs | 6 ++--- Wino.Core.WinUI/Services/FileService.cs | 2 +- Wino.Core.WinUI/Services/KeyPressService.cs | 2 +- .../Services/NavigationServiceBase.cs | 2 +- .../Services/NotificationBuilder.cs | 2 +- .../Services/PreferencesService.cs | 2 +- Wino.Core.WinUI/Services/PrintService.cs | 2 +- .../Services/StartupBehaviorService.cs | 4 ++-- .../Services/StatePersistenceService.cs | 2 +- .../Services/StoreManagementService.cs | 2 +- .../Services/StoreRatingService.cs | 2 +- Wino.Core.WinUI/Services/ThemeService.cs | 8 +++---- Wino.Core.WinUI/Services/ThumbnailService.cs | 2 +- .../Services/UnderlyingThemeService.cs | 2 +- .../Services/WinoServerConnectionManager.cs | 2 +- Wino.Core.WinUI/Styles/ContentPresenters.xaml | 2 +- .../Styles/CustomMessageDialogStyles.xaml | 4 ++-- .../Styles/CustomMessageDialogStyles.xaml.cs | 2 +- Wino.Core.WinUI/Styles/DataTemplates.xaml | 10 ++++----- Wino.Core.WinUI/Styles/DataTemplates.xaml.cs | 2 +- Wino.Core.WinUI/Styles/IconTemplates.xaml | 22 +++++++++---------- Wino.Core.WinUI/Styles/SharedStyles.xaml | 2 +- Wino.Core.WinUI/Styles/WinoInfoBar.xaml | 2 +- .../Abstract/ManageAccountsPageAbstract.cs | 2 +- .../Views/Abstract/SettingsPageAbstract.cs | 2 +- .../Views/Abstract/SettingsPageBase.cs | 2 +- Wino.Core.WinUI/Views/ManageAccountsPage.xaml | 2 +- .../Views/ManageAccountsPage.xaml.cs | 2 +- Wino.Core.WinUI/WinoApplication.cs | 2 +- .../Activation/FileActivationHandler.cs | 2 +- Wino.Mail.WinUI/App.xaml | 2 +- Wino.Mail.WinUI/App.xaml.cs | 2 +- Wino.Mail.WinUI/AppShell.xaml | 6 ++--- Wino.Mail.WinUI/AppShell.xaml.cs | 2 +- .../Behaviors/BindableCommandBarBehavior.cs | 2 +- .../CreateMailNavigationItemBehavior.cs | 2 +- .../Controls/AccountNavigationItem.cs | 2 +- .../MailItemDisplayInformationControl.xaml | 2 +- .../Controls/WebViewEditorControl.cs | 4 ++-- .../Dialogs/AccountReorderDialog.xaml | 2 +- Wino.Mail.WinUI/Dialogs/MoveMailDialog.xaml | 2 +- .../Dialogs/SignatureEditorDialog.xaml | 2 +- .../SystemFolderConfigurationDialog.xaml | 2 +- .../MenuFlyouts/AccountSelectorFlyout.cs | 2 +- .../MenuFlyouts/FilterMenuFlyout.cs | 2 +- .../MenuFlyouts/WinoOperationFlyoutItem.cs | 2 +- Wino.Mail.WinUI/Services/DialogService.cs | 4 ++-- Wino.Mail.WinUI/Services/NavigationService.cs | 4 ++-- .../Views/Abstract/AboutPageAbstract.cs | 2 +- .../Abstract/AccountDetailsPageAbstract.cs | 2 +- .../Abstract/AccountManagementPageAbstract.cs | 2 +- .../Abstract/AliasManagementPageAbstract.cs | 2 +- .../Abstract/AppPreferencesPageAbstract.cs | 2 +- .../Views/Abstract/AppShellAbstract.cs | 2 +- .../Views/Abstract/ComposePageAbstract.cs | 2 +- .../EditAccountDetailsPageAbstract.cs | 2 +- .../Views/Abstract/IdlePageAbstract.cs | 2 +- .../Abstract/LanguageTimePageAbstract.cs | 2 +- .../Views/Abstract/MailListPageAbstract.cs | 2 +- .../Abstract/MailRenderingPageAbstract.cs | 2 +- .../MergedAccountDetailsPageAbstract.cs | 2 +- .../Views/Abstract/MessageListPageAbstract.cs | 2 +- .../Abstract/ReadComposePanePageAbstract.cs | 2 +- .../SignatureManagementPageAbstract.cs | 2 +- .../Views/Abstract/WelcomePageAbstract.cs | 2 +- .../Views/Account/AccountDetailsPage.xaml | 2 +- .../Views/Account/AccountManagementPage.xaml | 2 +- .../Account/MergedAccountDetailsPage.xaml | 2 +- Wino.Mail.WinUI/Views/ComposePage.xaml | 4 ++-- Wino.Mail.WinUI/Views/ComposePage.xaml.cs | 2 +- .../ImapSetup/TestingImapConnectionPage.xaml | 2 +- Wino.Mail.WinUI/Views/MailListPage.xaml | 4 ++-- Wino.Mail.WinUI/Views/MailRenderingPage.xaml | 2 +- .../Views/MailRenderingPage.xaml.cs | 2 +- .../Settings/EditAccountDetailsPage.xaml | 2 +- .../Views/Settings/PersonalizationPage.xaml | 4 ++-- 118 files changed, 156 insertions(+), 156 deletions(-) diff --git a/Wino.Core.Domain/Models/Accounts/ProviderDetail.cs b/Wino.Core.Domain/Models/Accounts/ProviderDetail.cs index c5449892..226b35a4 100644 --- a/Wino.Core.Domain/Models/Accounts/ProviderDetail.cs +++ b/Wino.Core.Domain/Models/Accounts/ProviderDetail.cs @@ -17,11 +17,11 @@ public class ProviderDetail : IProviderDetail { if (SpecialImapProvider == SpecialImapProvider.None) { - return $"/Wino.Core.UWP/Assets/Providers/{Type}.png"; + return $"/Wino.Core.WinUI/Assets/Providers/{Type}.png"; } else { - return $"/Wino.Core.UWP/Assets/Providers/{SpecialImapProvider}.png"; + return $"/Wino.Core.WinUI/Assets/Providers/{SpecialImapProvider}.png"; } } } diff --git a/Wino.Core.WinUI/AppThemes/Clouds.xaml b/Wino.Core.WinUI/AppThemes/Clouds.xaml index 75210457..eb77ee44 100644 --- a/Wino.Core.WinUI/AppThemes/Clouds.xaml +++ b/Wino.Core.WinUI/AppThemes/Clouds.xaml @@ -4,7 +4,7 @@ xmlns:xaml="using:Microsoft.UI.Xaml"> Clouds - ms-appx:///Wino.Core.UWP/BackgroundImages/Clouds.jpg + ms-appx:///Wino.Core.WinUI/BackgroundImages/Clouds.jpg False diff --git a/Wino.Core.WinUI/AppThemes/Forest.xaml b/Wino.Core.WinUI/AppThemes/Forest.xaml index c39bfdf6..9584b11f 100644 --- a/Wino.Core.WinUI/AppThemes/Forest.xaml +++ b/Wino.Core.WinUI/AppThemes/Forest.xaml @@ -4,7 +4,7 @@ xmlns:xaml="using:Microsoft.UI.Xaml"> Forest - ms-appx:///Wino.Core.UWP/BackgroundImages/Forest.jpg + ms-appx:///Wino.Core.WinUI/BackgroundImages/Forest.jpg False diff --git a/Wino.Core.WinUI/AppThemes/Garden.xaml b/Wino.Core.WinUI/AppThemes/Garden.xaml index b3763e48..84e057a6 100644 --- a/Wino.Core.WinUI/AppThemes/Garden.xaml +++ b/Wino.Core.WinUI/AppThemes/Garden.xaml @@ -4,7 +4,7 @@ xmlns:xaml="using:Microsoft.UI.Xaml"> Garden - ms-appx:///Wino.Core.UWP/BackgroundImages/Garden.jpg + ms-appx:///Wino.Core.WinUI/BackgroundImages/Garden.jpg False diff --git a/Wino.Core.WinUI/AppThemes/Nighty.xaml b/Wino.Core.WinUI/AppThemes/Nighty.xaml index 99c94e63..f6cdcb91 100644 --- a/Wino.Core.WinUI/AppThemes/Nighty.xaml +++ b/Wino.Core.WinUI/AppThemes/Nighty.xaml @@ -4,7 +4,7 @@ xmlns:xaml="using:Microsoft.UI.Xaml"> Nighty - ms-appx:///Wino.Core.UWP/BackgroundImages/Nighty.jpg + ms-appx:///Wino.Core.WinUI/BackgroundImages/Nighty.jpg False diff --git a/Wino.Core.WinUI/AppThemes/Snowflake.xaml b/Wino.Core.WinUI/AppThemes/Snowflake.xaml index 63631e04..0f4450ae 100644 --- a/Wino.Core.WinUI/AppThemes/Snowflake.xaml +++ b/Wino.Core.WinUI/AppThemes/Snowflake.xaml @@ -4,7 +4,7 @@ xmlns:xaml="using:Microsoft.UI.Xaml"> Snowflake - ms-appx:///Wino.Core.UWP/BackgroundImages/Snowflake.jpg + ms-appx:///Wino.Core.WinUI/BackgroundImages/Snowflake.jpg False diff --git a/Wino.Core.WinUI/BasePage.cs b/Wino.Core.WinUI/BasePage.cs index 74835584..f25a7c9c 100644 --- a/Wino.Core.WinUI/BasePage.cs +++ b/Wino.Core.WinUI/BasePage.cs @@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Navigation; using Wino.Core.ViewModels; using Wino.Messaging.Client.Shell; -namespace Wino.Core.UWP; +namespace Wino.Core.WinUI; public partial class BasePage : Page, IRecipient { diff --git a/Wino.Core.WinUI/Controls/AccountCreationDialogControl.xaml b/Wino.Core.WinUI/Controls/AccountCreationDialogControl.xaml index ae38dd73..5f4cc520 100644 --- a/Wino.Core.WinUI/Controls/AccountCreationDialogControl.xaml +++ b/Wino.Core.WinUI/Controls/AccountCreationDialogControl.xaml @@ -1,10 +1,10 @@  { diff --git a/Wino.Core.WinUI/Controls/ControlConstants.cs b/Wino.Core.WinUI/Controls/ControlConstants.cs index db693d77..813dbcad 100644 --- a/Wino.Core.WinUI/Controls/ControlConstants.cs +++ b/Wino.Core.WinUI/Controls/ControlConstants.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Wino.Core.UWP.Controls; +namespace Wino.Core.WinUI.Controls; public static class ControlConstants { diff --git a/Wino.Core.WinUI/Controls/CustomWrapPanel.cs b/Wino.Core.WinUI/Controls/CustomWrapPanel.cs index dd863ad5..55095052 100644 --- a/Wino.Core.WinUI/Controls/CustomWrapPanel.cs +++ b/Wino.Core.WinUI/Controls/CustomWrapPanel.cs @@ -1,6 +1,6 @@ using System; -namespace Wino.Core.UWP.Controls +namespace Wino.Core.WinUI.Controls { using Windows.Foundation; using Microsoft.UI.Xaml; diff --git a/Wino.Core.WinUI/Controls/EqualGridPanel.cs b/Wino.Core.WinUI/Controls/EqualGridPanel.cs index 653d84f4..89b37dbd 100644 --- a/Wino.Core.WinUI/Controls/EqualGridPanel.cs +++ b/Wino.Core.WinUI/Controls/EqualGridPanel.cs @@ -2,7 +2,7 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -namespace Wino.Core.UWP.Controls; +namespace Wino.Core.WinUI.Controls; public partial class EqualGridPanel : Panel { diff --git a/Wino.Core.WinUI/Controls/WinoAppTitleBar.xaml b/Wino.Core.WinUI/Controls/WinoAppTitleBar.xaml index 4a3f5eab..b4889e19 100644 --- a/Wino.Core.WinUI/Controls/WinoAppTitleBar.xaml +++ b/Wino.Core.WinUI/Controls/WinoAppTitleBar.xaml @@ -1,5 +1,5 @@  + xmlns:coreControls="using:Wino.Core.WinUI.Controls" + xmlns:styles="using:Wino.Core.WinUI.Styles"> diff --git a/Wino.Core.WinUI/CoreGeneric.xaml.cs b/Wino.Core.WinUI/CoreGeneric.xaml.cs index bdc34987..10f94a4f 100644 --- a/Wino.Core.WinUI/CoreGeneric.xaml.cs +++ b/Wino.Core.WinUI/CoreGeneric.xaml.cs @@ -1,6 +1,6 @@ using Microsoft.UI.Xaml; -namespace Wino.Core.UWP; +namespace Wino.Core.WinUI; public partial class CoreGeneric : ResourceDictionary { diff --git a/Wino.Core.WinUI/CoreUWPContainerSetup.cs b/Wino.Core.WinUI/CoreUWPContainerSetup.cs index ed55061a..dcaa7a66 100644 --- a/Wino.Core.WinUI/CoreUWPContainerSetup.cs +++ b/Wino.Core.WinUI/CoreUWPContainerSetup.cs @@ -2,11 +2,11 @@ using Microsoft.UI.Xaml; using Windows.ApplicationModel.AppService; using Wino.Core.Domain.Interfaces; -using Wino.Core.UWP.Services; +using Wino.Core.WinUI.Services; using Wino.Core.ViewModels; using Wino.Services; -namespace Wino.Core.UWP; +namespace Wino.Core.WinUI; public static class CoreUWPContainerSetup { diff --git a/Wino.Core.WinUI/Dialogs/AccountCreationDialog.xaml b/Wino.Core.WinUI/Dialogs/AccountCreationDialog.xaml index 6de492a6..b957392d 100644 --- a/Wino.Core.WinUI/Dialogs/AccountCreationDialog.xaml +++ b/Wino.Core.WinUI/Dialogs/AccountCreationDialog.xaml @@ -2,7 +2,7 @@ x:Class="Wino.Dialogs.AccountCreationDialog" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:Wino.Core.UWP.Controls" + xmlns:controls="using:Wino.Core.WinUI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:dialogs="using:Wino.Dialogs" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" diff --git a/Wino.Core.WinUI/Dialogs/CustomThemeBuilderDialog.xaml.cs b/Wino.Core.WinUI/Dialogs/CustomThemeBuilderDialog.xaml.cs index b446fe5f..5810ab4f 100644 --- a/Wino.Core.WinUI/Dialogs/CustomThemeBuilderDialog.xaml.cs +++ b/Wino.Core.WinUI/Dialogs/CustomThemeBuilderDialog.xaml.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media; using Wino.Core.Domain.Interfaces; -using Wino.Core.UWP; +using Wino.Core.WinUI; namespace Wino.Dialogs; diff --git a/Wino.Core.WinUI/Dialogs/NewAccountDialog.xaml b/Wino.Core.WinUI/Dialogs/NewAccountDialog.xaml index 1c69c70f..9dcc9ad9 100644 --- a/Wino.Core.WinUI/Dialogs/NewAccountDialog.xaml +++ b/Wino.Core.WinUI/Dialogs/NewAccountDialog.xaml @@ -1,5 +1,5 @@  /// Custom themes that are generated by users. @@ -24,7 +24,7 @@ public class CustomAppTheme : AppThemeBase public override async Task GetThemeResourceDictionaryContentAsync() { - var customAppThemeFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Wino.Core.UWP/AppThemes/Custom.xaml")); + var customAppThemeFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Wino.Core.WinUI/AppThemes/Custom.xaml")); return await FileIO.ReadTextAsync(customAppThemeFile); } } diff --git a/Wino.Core.WinUI/Models/Personalization/PreDefinedAppTheme.cs b/Wino.Core.WinUI/Models/Personalization/PreDefinedAppTheme.cs index 960e5722..c21eccb6 100644 --- a/Wino.Core.WinUI/Models/Personalization/PreDefinedAppTheme.cs +++ b/Wino.Core.WinUI/Models/Personalization/PreDefinedAppTheme.cs @@ -4,7 +4,7 @@ using Windows.Storage; using Wino.Core.Domain.Enums; using Wino.Core.Domain.Models.Personalization; -namespace Wino.Core.UWP.Models.Personalization; +namespace Wino.Core.WinUI.Models.Personalization; /// /// Forest, Nighty, Clouds etc. applies to pre-defined themes in Wino. @@ -23,11 +23,11 @@ public class PreDefinedAppTheme : AppThemeBase public override AppThemeType AppThemeType => AppThemeType.PreDefined; public override string GetBackgroundPreviewImagePath() - => $"ms-appx:///Wino.Core.UWP/BackgroundImages/{ThemeName}.jpg"; + => $"ms-appx:///Wino.Core.WinUI/BackgroundImages/{ThemeName}.jpg"; public override async Task GetThemeResourceDictionaryContentAsync() { - var xamlDictionaryFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri($"ms-appx:///Wino.Core.UWP/AppThemes/{ThemeName}.xaml")); + var xamlDictionaryFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri($"ms-appx:///Wino.Core.WinUI/AppThemes/{ThemeName}.xaml")); return await FileIO.ReadTextAsync(xamlDictionaryFile); } } diff --git a/Wino.Core.WinUI/Models/Personalization/SystemAppTheme.cs b/Wino.Core.WinUI/Models/Personalization/SystemAppTheme.cs index f836ffb0..4ae4aec9 100644 --- a/Wino.Core.WinUI/Models/Personalization/SystemAppTheme.cs +++ b/Wino.Core.WinUI/Models/Personalization/SystemAppTheme.cs @@ -1,7 +1,7 @@ using System; using Wino.Core.Domain.Enums; -namespace Wino.Core.UWP.Models.Personalization; +namespace Wino.Core.WinUI.Models.Personalization; // Mica - Acrylic. public class SystemAppTheme : PreDefinedAppTheme diff --git a/Wino.Core.WinUI/Selectors/AppThemePreviewTemplateSelector.cs b/Wino.Core.WinUI/Selectors/AppThemePreviewTemplateSelector.cs index e2462e6e..81d87a25 100644 --- a/Wino.Core.WinUI/Selectors/AppThemePreviewTemplateSelector.cs +++ b/Wino.Core.WinUI/Selectors/AppThemePreviewTemplateSelector.cs @@ -1,8 +1,8 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Wino.Core.UWP.Models.Personalization; +using Wino.Core.WinUI.Models.Personalization; -namespace Wino.Core.UWP.Selectors; +namespace Wino.Core.WinUI.Selectors; public partial class AppThemePreviewTemplateSelector : DataTemplateSelector { diff --git a/Wino.Core.WinUI/Selectors/CustomWinoMessageDialogIconSelector.cs b/Wino.Core.WinUI/Selectors/CustomWinoMessageDialogIconSelector.cs index 2187228c..721b05fe 100644 --- a/Wino.Core.WinUI/Selectors/CustomWinoMessageDialogIconSelector.cs +++ b/Wino.Core.WinUI/Selectors/CustomWinoMessageDialogIconSelector.cs @@ -3,7 +3,7 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Wino.Core.Domain.Enums; -namespace Wino.Core.UWP.Selectors; +namespace Wino.Core.WinUI.Selectors; public partial class CustomWinoMessageDialogIconSelector : DataTemplateSelector { diff --git a/Wino.Core.WinUI/Selectors/FileAttachmentTypeSelector.cs b/Wino.Core.WinUI/Selectors/FileAttachmentTypeSelector.cs index 79740e8d..8a5e97fd 100644 --- a/Wino.Core.WinUI/Selectors/FileAttachmentTypeSelector.cs +++ b/Wino.Core.WinUI/Selectors/FileAttachmentTypeSelector.cs @@ -2,7 +2,7 @@ using Microsoft.UI.Xaml.Controls; using Wino.Core.Domain.Enums; -namespace Wino.Core.UWP.Selectors; +namespace Wino.Core.WinUI.Selectors; public partial class FileAttachmentTypeSelector : DataTemplateSelector { diff --git a/Wino.Core.WinUI/Selectors/NavigationMenuTemplateSelector.cs b/Wino.Core.WinUI/Selectors/NavigationMenuTemplateSelector.cs index 483db210..d3259997 100644 --- a/Wino.Core.WinUI/Selectors/NavigationMenuTemplateSelector.cs +++ b/Wino.Core.WinUI/Selectors/NavigationMenuTemplateSelector.cs @@ -2,7 +2,7 @@ using Microsoft.UI.Xaml.Controls; using Wino.Core.Domain.MenuItems; -namespace Wino.Core.UWP.Selectors; +namespace Wino.Core.WinUI.Selectors; public partial class NavigationMenuTemplateSelector : DataTemplateSelector { diff --git a/Wino.Core.WinUI/Services/ApplicationResourceManager.cs b/Wino.Core.WinUI/Services/ApplicationResourceManager.cs index d2996d10..c47e74b0 100644 --- a/Wino.Core.WinUI/Services/ApplicationResourceManager.cs +++ b/Wino.Core.WinUI/Services/ApplicationResourceManager.cs @@ -1,7 +1,7 @@ using System.Linq; using Microsoft.UI.Xaml; using Wino.Core.Domain.Interfaces; -using Wino.Core.UWP; +using Wino.Core.WinUI; namespace Wino.Services; diff --git a/Wino.Core.WinUI/Services/ClipboardService.cs b/Wino.Core.WinUI/Services/ClipboardService.cs index bbfb94dc..55ff635f 100644 --- a/Wino.Core.WinUI/Services/ClipboardService.cs +++ b/Wino.Core.WinUI/Services/ClipboardService.cs @@ -2,7 +2,7 @@ using Windows.ApplicationModel.DataTransfer; using Wino.Core.Domain.Interfaces; -namespace Wino.Core.UWP.Services; +namespace Wino.Core.WinUI.Services; public class ClipboardService : IClipboardService { diff --git a/Wino.Core.WinUI/Services/ConfigurationService.cs b/Wino.Core.WinUI/Services/ConfigurationService.cs index 83d5c744..49bdae81 100644 --- a/Wino.Core.WinUI/Services/ConfigurationService.cs +++ b/Wino.Core.WinUI/Services/ConfigurationService.cs @@ -5,7 +5,7 @@ using Windows.Foundation.Collections; using Windows.Storage; using Wino.Core.Domain.Interfaces; -namespace Wino.Core.UWP.Services; +namespace Wino.Core.WinUI.Services; public class ConfigurationService : IConfigurationService { diff --git a/Wino.Core.WinUI/Services/DialogServiceBase.cs b/Wino.Core.WinUI/Services/DialogServiceBase.cs index 0159ba0c..68055773 100644 --- a/Wino.Core.WinUI/Services/DialogServiceBase.cs +++ b/Wino.Core.WinUI/Services/DialogServiceBase.cs @@ -14,12 +14,12 @@ using Wino.Core.Domain.Enums; using Wino.Core.Domain.Interfaces; using Wino.Core.Domain.Models.Accounts; using Wino.Core.Domain.Models.Common; -using Wino.Core.UWP.Dialogs; -using Wino.Core.UWP.Extensions; +using Wino.Core.WinUI.Dialogs; +using Wino.Core.WinUI.Extensions; using Wino.Dialogs; using Wino.Messaging.Client.Shell; -namespace Wino.Core.UWP.Services; +namespace Wino.Core.WinUI.Services; public class DialogServiceBase : IDialogServiceBase { diff --git a/Wino.Core.WinUI/Services/FileService.cs b/Wino.Core.WinUI/Services/FileService.cs index 6a635363..45988825 100644 --- a/Wino.Core.WinUI/Services/FileService.cs +++ b/Wino.Core.WinUI/Services/FileService.cs @@ -6,7 +6,7 @@ using Windows.Storage; using Wino.Core.Domain; using Wino.Core.Domain.Interfaces; -namespace Wino.Core.UWP.Services; +namespace Wino.Core.WinUI.Services; public class FileService : IFileService { diff --git a/Wino.Core.WinUI/Services/KeyPressService.cs b/Wino.Core.WinUI/Services/KeyPressService.cs index 5fe3e3f1..869d1679 100644 --- a/Wino.Core.WinUI/Services/KeyPressService.cs +++ b/Wino.Core.WinUI/Services/KeyPressService.cs @@ -3,7 +3,7 @@ using Windows.UI.Core; using Microsoft.UI.Xaml; using Wino.Core.Domain.Interfaces; -namespace Wino.Core.UWP.Services; +namespace Wino.Core.WinUI.Services; public class KeyPressService : IKeyPressService { diff --git a/Wino.Core.WinUI/Services/NavigationServiceBase.cs b/Wino.Core.WinUI/Services/NavigationServiceBase.cs index f476c561..1032cbeb 100644 --- a/Wino.Core.WinUI/Services/NavigationServiceBase.cs +++ b/Wino.Core.WinUI/Services/NavigationServiceBase.cs @@ -3,7 +3,7 @@ using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media.Animation; using Wino.Core.Domain.Models.Navigation; -namespace Wino.Core.UWP.Services; +namespace Wino.Core.WinUI.Services; public class NavigationServiceBase { diff --git a/Wino.Core.WinUI/Services/NotificationBuilder.cs b/Wino.Core.WinUI/Services/NotificationBuilder.cs index 73d3d7d2..9609b88a 100644 --- a/Wino.Core.WinUI/Services/NotificationBuilder.cs +++ b/Wino.Core.WinUI/Services/NotificationBuilder.cs @@ -15,7 +15,7 @@ using Wino.Core.Domain.Interfaces; using Wino.Core.Domain.Models.MailItem; using Wino.Messaging.UI; -namespace Wino.Core.UWP.Services; +namespace Wino.Core.WinUI.Services; // TODO: Refactor this thing. It's garbage. diff --git a/Wino.Core.WinUI/Services/PreferencesService.cs b/Wino.Core.WinUI/Services/PreferencesService.cs index 153cf504..8d14f168 100644 --- a/Wino.Core.WinUI/Services/PreferencesService.cs +++ b/Wino.Core.WinUI/Services/PreferencesService.cs @@ -11,7 +11,7 @@ using Wino.Core.Domain.Models.Reader; using Wino.Core.Domain.Translations; using Wino.Services; -namespace Wino.Core.UWP.Services; +namespace Wino.Core.WinUI.Services; public class PreferencesService(IConfigurationService configurationService) : ObservableObject, IPreferencesService { diff --git a/Wino.Core.WinUI/Services/PrintService.cs b/Wino.Core.WinUI/Services/PrintService.cs index b1c9a12f..92add32d 100644 --- a/Wino.Core.WinUI/Services/PrintService.cs +++ b/Wino.Core.WinUI/Services/PrintService.cs @@ -12,7 +12,7 @@ using Wino.Core.Domain.Enums; using Wino.Core.Domain.Interfaces; using Wino.Core.Domain.Models.Printing; -namespace Wino.Core.UWP.Services; +namespace Wino.Core.WinUI.Services; /// /// Printer service that uses WinRT APIs to print PDF files. diff --git a/Wino.Core.WinUI/Services/StartupBehaviorService.cs b/Wino.Core.WinUI/Services/StartupBehaviorService.cs index c637699a..144e320a 100644 --- a/Wino.Core.WinUI/Services/StartupBehaviorService.cs +++ b/Wino.Core.WinUI/Services/StartupBehaviorService.cs @@ -4,9 +4,9 @@ using Serilog; using Windows.ApplicationModel; using Wino.Core.Domain.Enums; using Wino.Core.Domain.Interfaces; -using Wino.Core.UWP.Extensions; +using Wino.Core.WinUI.Extensions; -namespace Wino.Core.UWP.Services; +namespace Wino.Core.WinUI.Services; public class StartupBehaviorService : IStartupBehaviorService { diff --git a/Wino.Core.WinUI/Services/StatePersistenceService.cs b/Wino.Core.WinUI/Services/StatePersistenceService.cs index c47d6bd1..d202c994 100644 --- a/Wino.Core.WinUI/Services/StatePersistenceService.cs +++ b/Wino.Core.WinUI/Services/StatePersistenceService.cs @@ -3,7 +3,7 @@ using System.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel; using Wino.Core.Domain.Enums; using Wino.Core.Domain.Interfaces; -using Wino.Core.UWP; +using Wino.Core.WinUI; namespace Wino.Services; diff --git a/Wino.Core.WinUI/Services/StoreManagementService.cs b/Wino.Core.WinUI/Services/StoreManagementService.cs index 91fb9504..fff0aa53 100644 --- a/Wino.Core.WinUI/Services/StoreManagementService.cs +++ b/Wino.Core.WinUI/Services/StoreManagementService.cs @@ -5,7 +5,7 @@ using Windows.Services.Store; using Wino.Core.Domain.Interfaces; using Wino.Core.Domain.Models.Store; -namespace Wino.Core.UWP.Services; +namespace Wino.Core.WinUI.Services; public class StoreManagementService : IStoreManagementService { diff --git a/Wino.Core.WinUI/Services/StoreRatingService.cs b/Wino.Core.WinUI/Services/StoreRatingService.cs index adbd20ef..652cb92d 100644 --- a/Wino.Core.WinUI/Services/StoreRatingService.cs +++ b/Wino.Core.WinUI/Services/StoreRatingService.cs @@ -7,7 +7,7 @@ using Windows.System; using Wino.Core.Domain; using Wino.Core.Domain.Interfaces; -namespace Wino.Core.UWP.Services; +namespace Wino.Core.WinUI.Services; public class StoreRatingService : IStoreRatingService { diff --git a/Wino.Core.WinUI/Services/ThemeService.cs b/Wino.Core.WinUI/Services/ThemeService.cs index 91bf8465..5a8bfbc0 100644 --- a/Wino.Core.WinUI/Services/ThemeService.cs +++ b/Wino.Core.WinUI/Services/ThemeService.cs @@ -21,10 +21,10 @@ using Wino.Core.Domain.Exceptions; using Wino.Core.Domain.Interfaces; using Wino.Core.Domain.Models; using Wino.Core.Domain.Models.Personalization; -using Wino.Core.UWP; -using Wino.Core.UWP.Extensions; -using Wino.Core.UWP.Models.Personalization; -using Wino.Core.UWP.Services; +using Wino.Core.WinUI; +using Wino.Core.WinUI.Extensions; +using Wino.Core.WinUI.Models.Personalization; +using Wino.Core.WinUI.Services; using Wino.Messaging.Client.Shell; namespace Wino.Services; diff --git a/Wino.Core.WinUI/Services/ThumbnailService.cs b/Wino.Core.WinUI/Services/ThumbnailService.cs index 7598252a..c6020039 100644 --- a/Wino.Core.WinUI/Services/ThumbnailService.cs +++ b/Wino.Core.WinUI/Services/ThumbnailService.cs @@ -13,7 +13,7 @@ using Wino.Core.Domain.Interfaces; using Wino.Messaging.UI; using Wino.Services; -namespace Wino.Core.UWP.Services; +namespace Wino.Core.WinUI.Services; public class ThumbnailService(IPreferencesService preferencesService, IDatabaseService databaseService) : IThumbnailService { diff --git a/Wino.Core.WinUI/Services/UnderlyingThemeService.cs b/Wino.Core.WinUI/Services/UnderlyingThemeService.cs index 264f7709..bc16a523 100644 --- a/Wino.Core.WinUI/Services/UnderlyingThemeService.cs +++ b/Wino.Core.WinUI/Services/UnderlyingThemeService.cs @@ -2,7 +2,7 @@ using Wino.Core.Domain.Enums; using Wino.Core.Domain.Interfaces; -namespace Wino.Core.UWP.Services; +namespace Wino.Core.WinUI.Services; public class UnderlyingThemeService : IUnderlyingThemeService { diff --git a/Wino.Core.WinUI/Services/WinoServerConnectionManager.cs b/Wino.Core.WinUI/Services/WinoServerConnectionManager.cs index 49309940..cc11c47b 100644 --- a/Wino.Core.WinUI/Services/WinoServerConnectionManager.cs +++ b/Wino.Core.WinUI/Services/WinoServerConnectionManager.cs @@ -22,7 +22,7 @@ using Wino.Messaging.Enums; using Wino.Messaging.Server; using Wino.Messaging.UI; -namespace Wino.Core.UWP.Services; +namespace Wino.Core.WinUI.Services; public class WinoServerConnectionManager : IWinoServerConnectionManager, diff --git a/Wino.Core.WinUI/Styles/ContentPresenters.xaml b/Wino.Core.WinUI/Styles/ContentPresenters.xaml index 3b1b4422..e586ff0d 100644 --- a/Wino.Core.WinUI/Styles/ContentPresenters.xaml +++ b/Wino.Core.WinUI/Styles/ContentPresenters.xaml @@ -1,7 +1,7 @@  + xmlns:controls="using:Wino.Core.WinUI.Controls"> diff --git a/Wino.Core.WinUI/Styles/CustomMessageDialogStyles.xaml b/Wino.Core.WinUI/Styles/CustomMessageDialogStyles.xaml index d37a275d..fdf7baa1 100644 --- a/Wino.Core.WinUI/Styles/CustomMessageDialogStyles.xaml +++ b/Wino.Core.WinUI/Styles/CustomMessageDialogStyles.xaml @@ -1,13 +1,13 @@ + xmlns:selectors="using:Wino.Core.WinUI.Selectors"> diff --git a/Wino.Core.WinUI/Styles/CustomMessageDialogStyles.xaml.cs b/Wino.Core.WinUI/Styles/CustomMessageDialogStyles.xaml.cs index ae121634..98be9c00 100644 --- a/Wino.Core.WinUI/Styles/CustomMessageDialogStyles.xaml.cs +++ b/Wino.Core.WinUI/Styles/CustomMessageDialogStyles.xaml.cs @@ -1,6 +1,6 @@ using Microsoft.UI.Xaml; -namespace Wino.Core.UWP.Styles; +namespace Wino.Core.WinUI.Styles; partial class CustomMessageDialogStyles : ResourceDictionary { diff --git a/Wino.Core.WinUI/Styles/DataTemplates.xaml b/Wino.Core.WinUI/Styles/DataTemplates.xaml index 2c2d8bf3..ec1f72a0 100644 --- a/Wino.Core.WinUI/Styles/DataTemplates.xaml +++ b/Wino.Core.WinUI/Styles/DataTemplates.xaml @@ -1,18 +1,18 @@ diff --git a/Wino.Core.WinUI/Styles/DataTemplates.xaml.cs b/Wino.Core.WinUI/Styles/DataTemplates.xaml.cs index 1179966d..d57cff20 100644 --- a/Wino.Core.WinUI/Styles/DataTemplates.xaml.cs +++ b/Wino.Core.WinUI/Styles/DataTemplates.xaml.cs @@ -1,6 +1,6 @@ using Microsoft.UI.Xaml; -namespace Wino.Core.UWP.Styles; +namespace Wino.Core.WinUI.Styles; public partial class DataTemplates : ResourceDictionary { diff --git a/Wino.Core.WinUI/Styles/IconTemplates.xaml b/Wino.Core.WinUI/Styles/IconTemplates.xaml index 89dad769..67172286 100644 --- a/Wino.Core.WinUI/Styles/IconTemplates.xaml +++ b/Wino.Core.WinUI/Styles/IconTemplates.xaml @@ -1,48 +1,48 @@  + xmlns:selectors="using:Wino.Core.WinUI.Selectors"> - + - + - + - + - + - + - + - + - + - + + xmlns:local="using:Wino.Core.WinUI.Styles">