From e42ebb49aedce0a25d572dcb874005ac60402015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Burak=20Kaan=20K=C3=B6se?= Date: Fri, 3 Oct 2025 21:17:41 +0200 Subject: [PATCH] Remove old theme service completely. --- Wino.Core.WinUI/CoreUWPContainerSetup.cs | 3 +-- Wino.Core.WinUI/Dialogs/CustomThemeBuilderDialog.xaml.cs | 4 ++-- Wino.Core.WinUI/Dialogs/NewAccountDialog.xaml.cs | 4 ++-- Wino.Core.WinUI/Models/Personalization/CustomAppTheme.cs | 2 +- Wino.Core.WinUI/Services/DialogServiceBase.cs | 8 ++++---- Wino.Core.WinUI/WinoApplication.cs | 2 -- Wino.Mail.ViewModels/EditAccountDetailsPageViewModel.cs | 4 ++-- Wino.Mail.ViewModels/MailListPageViewModel.cs | 4 ++-- Wino.Mail.WinUI/Services/DialogService.cs | 2 +- 9 files changed, 15 insertions(+), 18 deletions(-) diff --git a/Wino.Core.WinUI/CoreUWPContainerSetup.cs b/Wino.Core.WinUI/CoreUWPContainerSetup.cs index 57de36ba..3460f473 100644 --- a/Wino.Core.WinUI/CoreUWPContainerSetup.cs +++ b/Wino.Core.WinUI/CoreUWPContainerSetup.cs @@ -2,8 +2,8 @@ using Microsoft.UI.Xaml; using Windows.ApplicationModel.AppService; using Wino.Core.Domain.Interfaces; -using Wino.Core.WinUI.Services; using Wino.Core.ViewModels; +using Wino.Core.WinUI.Services; using Wino.Services; namespace Wino.Core.WinUI; @@ -22,7 +22,6 @@ public static class CoreUWPContainerSetup services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); diff --git a/Wino.Core.WinUI/Dialogs/CustomThemeBuilderDialog.xaml.cs b/Wino.Core.WinUI/Dialogs/CustomThemeBuilderDialog.xaml.cs index 5810ab4f..339474eb 100644 --- a/Wino.Core.WinUI/Dialogs/CustomThemeBuilderDialog.xaml.cs +++ b/Wino.Core.WinUI/Dialogs/CustomThemeBuilderDialog.xaml.cs @@ -13,13 +13,13 @@ public sealed partial class CustomThemeBuilderDialog : ContentDialog public byte[] WallpaperData { get; private set; } public string AccentColor { get; private set; } - private IThemeService _themeService; + private INewThemeService _themeService; public CustomThemeBuilderDialog() { InitializeComponent(); - _themeService = WinoApplication.Current.Services.GetService(); + _themeService = WinoApplication.Current.Services.GetService(); } private async void ApplyClicked(ContentDialog sender, ContentDialogButtonClickEventArgs args) diff --git a/Wino.Core.WinUI/Dialogs/NewAccountDialog.xaml.cs b/Wino.Core.WinUI/Dialogs/NewAccountDialog.xaml.cs index 9891688d..613e8e12 100644 --- a/Wino.Core.WinUI/Dialogs/NewAccountDialog.xaml.cs +++ b/Wino.Core.WinUI/Dialogs/NewAccountDialog.xaml.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using Windows.System; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; +using Windows.System; using Wino.Core.Domain.Enums; using Wino.Core.Domain.Interfaces; using Wino.Core.Domain.Models.Accounts; @@ -67,7 +67,7 @@ public sealed partial class NewAccountDialog : ContentDialog { InitializeComponent(); - var themeService = WinoApplication.Current.ThemeService.GetAvailableAccountColors(); + var themeService = WinoApplication.Current.NewThemeService.GetAvailableAccountColors(); AvailableColors = themeService.Select(a => new AppColorViewModel(a)).ToList(); UpdateSelectedColor(); diff --git a/Wino.Core.WinUI/Models/Personalization/CustomAppTheme.cs b/Wino.Core.WinUI/Models/Personalization/CustomAppTheme.cs index a0ce1d4f..4f3350b2 100644 --- a/Wino.Core.WinUI/Models/Personalization/CustomAppTheme.cs +++ b/Wino.Core.WinUI/Models/Personalization/CustomAppTheme.cs @@ -20,7 +20,7 @@ public class CustomAppTheme : AppThemeBase public override AppThemeType AppThemeType => AppThemeType.Custom; public override string GetBackgroundPreviewImagePath() - => $"ms-appdata:///local/{ThemeService.CustomThemeFolderName}/{Id}_preview.jpg"; + => $"ms-appdata:///local/{NewThemeService.CustomThemeFolderName}/{Id}_preview.jpg"; public override async Task GetThemeResourceDictionaryContentAsync() { diff --git a/Wino.Core.WinUI/Services/DialogServiceBase.cs b/Wino.Core.WinUI/Services/DialogServiceBase.cs index 68055773..9e917f72 100644 --- a/Wino.Core.WinUI/Services/DialogServiceBase.cs +++ b/Wino.Core.WinUI/Services/DialogServiceBase.cs @@ -3,12 +3,12 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; using CommunityToolkit.Mvvm.Messaging; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; using Serilog; using Windows.Storage; using Windows.Storage.AccessCache; using Windows.Storage.Pickers; -using Microsoft.UI.Xaml; -using Microsoft.UI.Xaml.Controls; using Wino.Core.Domain; using Wino.Core.Domain.Enums; using Wino.Core.Domain.Interfaces; @@ -25,12 +25,12 @@ public class DialogServiceBase : IDialogServiceBase { private SemaphoreSlim _presentationSemaphore = new SemaphoreSlim(1); - protected IThemeService ThemeService { get; } + protected INewThemeService ThemeService { get; } protected IConfigurationService ConfigurationService { get; } protected IApplicationResourceManager ApplicationResourceManager { get; } - public DialogServiceBase(IThemeService themeService, IConfigurationService configurationService, IApplicationResourceManager applicationResourceManager) + public DialogServiceBase(INewThemeService themeService, IConfigurationService configurationService, IApplicationResourceManager applicationResourceManager) { ThemeService = themeService; ConfigurationService = configurationService; diff --git a/Wino.Core.WinUI/WinoApplication.cs b/Wino.Core.WinUI/WinoApplication.cs index 5d59a51f..e5a9e045 100644 --- a/Wino.Core.WinUI/WinoApplication.cs +++ b/Wino.Core.WinUI/WinoApplication.cs @@ -33,7 +33,6 @@ public abstract class WinoApplication : Application, IRecipient protected IWinoLogger LogInitializer { get; } protected IApplicationConfiguration AppConfiguration { get; } protected IWinoServerConnectionManager AppServiceConnectionManager { get; } - public IThemeService ThemeService { get; } public INewThemeService NewThemeService { get; } public IUnderlyingThemeService UnderlyingThemeService { get; } public IThumbnailService ThumbnailService { get; } @@ -56,7 +55,6 @@ public abstract class WinoApplication : Application, IRecipient AppConfiguration = Services.GetService(); AppServiceConnectionManager = Services.GetService>(); - ThemeService = Services.GetService(); NewThemeService = Services.GetService(); DatabaseService = Services.GetService(); TranslationService = Services.GetService(); diff --git a/Wino.Mail.ViewModels/EditAccountDetailsPageViewModel.cs b/Wino.Mail.ViewModels/EditAccountDetailsPageViewModel.cs index 9878d71e..1cefc7c1 100644 --- a/Wino.Mail.ViewModels/EditAccountDetailsPageViewModel.cs +++ b/Wino.Mail.ViewModels/EditAccountDetailsPageViewModel.cs @@ -18,7 +18,7 @@ namespace Wino.Mail.ViewModels; public partial class EditAccountDetailsPageViewModel : MailBaseViewModel { private readonly IAccountService _accountService; - private readonly IThemeService _themeService; + private readonly INewThemeService _themeService; private readonly IImapTestService _imapTestService; private readonly IMailDialogService _mailDialogService; @@ -76,7 +76,7 @@ public partial class EditAccountDetailsPageViewModel : MailBaseViewModel public bool IsImapServer => ServerInformation != null; public EditAccountDetailsPageViewModel(IAccountService accountService, - IThemeService themeService, + INewThemeService themeService, IImapTestService imapTestService, IMailDialogService mailDialogService) { diff --git a/Wino.Mail.ViewModels/MailListPageViewModel.cs b/Wino.Mail.ViewModels/MailListPageViewModel.cs index b4fd27ad..739fe24d 100644 --- a/Wino.Mail.ViewModels/MailListPageViewModel.cs +++ b/Wino.Mail.ViewModels/MailListPageViewModel.cs @@ -71,7 +71,7 @@ public partial class MailListPageViewModel : MailBaseViewModel, public INavigationService NavigationService { get; } public IStatePersistanceService StatePersistenceService { get; } public IPreferencesService PreferencesService { get; } - public IThemeService ThemeService { get; } + public INewThemeService ThemeService { get; } private readonly IAccountService _accountService; private readonly IMailDialogService _mailDialogService; @@ -160,7 +160,7 @@ public partial class MailListPageViewModel : MailBaseViewModel, IWinoRequestDelegator winoRequestDelegator, IKeyPressService keyPressService, IPreferencesService preferencesService, - IThemeService themeService, + INewThemeService themeService, IWinoLogger winoLogger, IWinoServerConnectionManager winoServerConnectionManager) { diff --git a/Wino.Mail.WinUI/Services/DialogService.cs b/Wino.Mail.WinUI/Services/DialogService.cs index 506c5dbd..5ca49e69 100644 --- a/Wino.Mail.WinUI/Services/DialogService.cs +++ b/Wino.Mail.WinUI/Services/DialogService.cs @@ -24,7 +24,7 @@ namespace Wino.Services; public class DialogService : DialogServiceBase, IMailDialogService { - public DialogService(IThemeService themeService, + public DialogService(INewThemeService themeService, IConfigurationService configurationService, IApplicationResourceManager applicationResourceManager) : base(themeService, configurationService, applicationResourceManager) {