Account colors + edit account details. (#592)

* Remove account rename dialog. Implement edit account details page. * Remove unused folder definition. * Adressing theming issues and adding reset button. Changing the UI a bit. * Enable auto indent in initializer. Use service from the application. * Adding color picker to acc setup dialog. Changing UI of edit acc details page.
2025-03-01 01:17:04 +01:00
parent 6080646e89
commit 8ecf301eb8
29 changed files with 464 additions and 135 deletions
--- a/Wino.Mail/App.xaml.cs
+++ b/Wino.Mail/App.xaml.cs
@@ -112,6 +112,7 @@ public sealed partial class App : WinoApplication,
        services.AddTransient(typeof(ComposePageViewModel));
        services.AddTransient(typeof(IdlePageViewModel));

+        services.AddTransient(typeof(EditAccountDetailsPageViewModel));
        services.AddTransient(typeof(AccountDetailsPageViewModel));
        services.AddTransient(typeof(SignatureManagementPageViewModel));
        services.AddTransient(typeof(MessageListPageViewModel));
--- a/Wino.Mail/AppShell.xaml
+++ b/Wino.Mail/AppShell.xaml
@@ -9,6 +9,7 @@
    xmlns:controls="using:Wino.Controls"
    xmlns:controls1="using:CommunityToolkit.WinUI.Controls"
    xmlns:coreControls="using:Wino.Core.UWP.Controls"
+    xmlns:coreConverters="using:Wino.Core.UWP.Converters"
    xmlns:coreSelectors="using:Wino.Core.UWP.Selectors"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:domain="using:Wino.Core.Domain"
@@ -23,6 +24,8 @@

    <Page.Resources>

+        <coreConverters:HexToColorBrushConverter x:Key="HexToColorBrushConverter" />
+
        <!--  Clickable New Style Account Template  -->
        <DataTemplate x:Key="ClickableAccountMenuTemplate" x:DataType="menu:AccountMenuItem">
            <controls:AccountNavigationItem
@@ -41,7 +44,10 @@
                    </TransitionCollection>
                </coreControls:WinoNavigationViewItem.ContentTransitions>
                <muxc:NavigationViewItem.Icon>
-                    <coreControls:WinoFontIcon FontSize="12" Icon="{x:Bind helpers:XamlHelpers.GetProviderIcon(Parameter)}" />
+                    <coreControls:WinoFontIcon
+                        FontSize="12"
+                        Foreground="{x:Bind AccountColorHex, Converter={StaticResource HexToColorBrushConverter}, Mode=OneWay}"
+                        Icon="{x:Bind helpers:XamlHelpers.GetProviderIcon(Parameter)}" />
                </muxc:NavigationViewItem.Icon>
                <muxc:NavigationViewItem.InfoBadge>
                    <muxc:InfoBadge
@@ -252,7 +258,7 @@
                    </TransitionCollection>
                </coreControls:WinoNavigationViewItem.ContentTransitions>
                <coreControls:WinoNavigationViewItem.Icon>
-                    <PathIcon Data="F1 M 8.613281 17.5 C 8.75 17.942709 8.945312 18.359375 9.199219 18.75 L 4.921875 18.75 C 4.433594 18.75 3.966471 18.650717 3.520508 18.452148 C 3.074544 18.25358 2.683919 17.986654 2.348633 17.651367 C 2.013346 17.31608 1.746419 16.925455 1.547852 16.479492 C 1.349284 16.033529 1.25 15.566406 1.25 15.078125 L 1.25 4.921875 C 1.25 4.433594 1.349284 3.966473 1.547852 3.520508 C 1.746419 3.074545 2.013346 2.68392 2.348633 2.348633 C 2.683919 2.013348 3.074544 1.74642 3.520508 1.547852 C 3.966471 1.349285 4.433594 1.25 4.921875 1.25 L 15.078125 1.25 C 15.566406 1.25 16.033527 1.349285 16.479492 1.547852 C 16.925455 1.74642 17.31608 2.013348 17.651367 2.348633 C 17.986652 2.68392 18.25358 3.074545 18.452148 3.520508 C 18.650715 3.966473 18.75 4.433594 18.75 4.921875 L 18.75 6.572266 C 18.580729 6.344402 18.390299 6.132813 18.178711 5.9375 C 17.967121 5.742188 17.740885 5.566407 17.5 5.410156 L 17.5 4.951172 C 17.5 4.625651 17.433268 4.314779 17.299805 4.018555 C 17.16634 3.722332 16.987305 3.461914 16.762695 3.237305 C 16.538086 3.012695 16.277668 2.83366 15.981445 2.700195 C 15.685221 2.566732 15.374349 2.5 15.048828 2.5 L 4.951172 2.5 C 4.619141 2.5 4.303385 2.568359 4.003906 2.705078 C 3.704427 2.841797 3.44401 3.02409 3.222656 3.251953 C 3.001302 3.479818 2.825521 3.745117 2.695312 4.047852 C 2.565104 4.350587 2.5 4.66797 2.5 5 L 13.310547 5 C 12.60091 5.266928 11.998697 5.683594 11.503906 6.25 L 2.5 6.25 L 2.5 15.048828 C 2.5 15.38737 2.568359 15.704753 2.705078 16.000977 C 2.841797 16.297201 3.024088 16.55599 3.251953 16.777344 C 3.479818 16.998697 3.745117 17.174479 4.047852 17.304688 C 4.350586 17.434896 4.667969 17.5 5 17.5 Z M 18.125 9.443359 C 18.125 9.866537 18.040363 10.263672 17.871094 10.634766 C 17.701822 11.005859 17.473957 11.329753 17.1875 11.606445 C 16.901041 11.883139 16.56901 12.101237 16.191406 12.260742 C 15.813802 12.420248 15.416666 12.5 15 12.5 C 14.563802 12.5 14.1569 12.41862 13.779297 12.255859 C 13.401691 12.0931 13.071288 11.870117 12.788086 11.586914 C 12.504882 11.303711 12.2819 10.973308 12.119141 10.595703 C 11.95638 10.2181 11.875 9.811198 11.875 9.375 C 11.875 8.938803 11.95638 8.531901 12.119141 8.154297 C 12.2819 7.776693 12.504882 7.446289 12.788086 7.163086 C 13.071288 6.879883 13.401691 6.656901 13.779297 6.494141 C 14.1569 6.331381 14.563802 6.25 15 6.25 C 15.449218 6.25 15.864257 6.333008 16.245117 6.499023 C 16.625977 6.665039 16.956379 6.892904 17.236328 7.182617 C 17.516275 7.472331 17.734375 7.810873 17.890625 8.198242 C 18.046875 8.585612 18.125 9.000651 18.125 9.443359 Z M 20 16.25 C 20 16.666666 19.926758 17.049154 19.780273 17.397461 C 19.633789 17.745768 19.435221 18.058268 19.18457 18.334961 C 18.933918 18.611654 18.642578 18.854166 18.310547 19.0625 C 17.978516 19.270834 17.626953 19.444986 17.255859 19.584961 C 16.884766 19.724936 16.505533 19.829102 16.118164 19.897461 C 15.730794 19.96582 15.358072 20 15 20 C 14.654947 20 14.291992 19.96582 13.911133 19.897461 C 13.530273 19.829102 13.154297 19.726562 12.783203 19.589844 C 12.412109 19.453125 12.058919 19.282227 11.723633 19.077148 C 11.388346 18.87207 11.092122 18.632812 10.834961 18.359375 C 10.577799 18.085938 10.374349 17.779947 10.224609 17.441406 C 10.074869 17.102865 10 16.731771 10 16.328125 L 10 15.78125 C 10 15.501303 10.052083 15.237631 10.15625 14.990234 C 10.260416 14.742839 10.405273 14.526367 10.59082 14.34082 C 10.776367 14.155273 10.991211 14.010417 11.235352 13.90625 C 11.479492 13.802084 11.744791 13.75 12.03125 13.75 L 17.96875 13.75 C 18.248697 13.75 18.512369 13.803711 18.759766 13.911133 C 19.00716 14.018555 19.222004 14.163412 19.404297 14.345703 C 19.586588 14.527995 19.731445 14.742839 19.838867 14.990234 C 19.946289 15.237631 20 15.501303 20 15.78125 Z " />
+                    <PathIcon Data="F1 M 8.613281 17.5 C 8.75 17.942709 8.945312 18.359375 9.199219 18.75 L 4.921875 18.75 C 4.433594 18.75 3.966471 18.650717 3.520508 18.452148 C 3.074544 18.25358 2.683919 17.986654 2.348633 17.651367 C 2.013346 17.31608 1.746419 16.925455 1.547852 16.479492 C 1.349284 16.033529 1.25 15.566406 1.25 15.078125 L 1.25 4.921875 C 1.25 4.433594 1.349284 3.966473 1.547852 3.520508 C 1.746419 3.074545 2.013346 2.68392 2.348633 2.348633 C 2.683919 2.013348 3.074544 1.74642 3.520508 1.547852 C 3.966471 1.349285 4.433594 1.25 4.921875 1.25 L 15.078125 1.25 C 15.566406 1.25 16.033527 1.349285 16.479492 1.547852 C 16.925455 1.74642 17.31608 2.013348 17.651367 2.348633 C 17.986652 2.68392 18.25358 3.074545 18.452148 3.520508 C 18.650715 3.966473 18.75 4.433594 18.75 4.921875 L 18.75 6.572266 C 18.580729 6.344402 18.390299 6.132813 18.178711 5.9375 C 17.967121 5.742188 17.740885 5.566407 17.5 5.410156 L 17.5 4.951172 C 17.5 4.625651 17.433268 4.314779 17.299805 4.018555 C 17.16634 3.722332 16.987305 3.461914 16.762695 3.237305 C 16.538086 3.012695 16.277668 2.83366 15.981445 2.700195 C 15.685221 2.566732 15.374349 2.5 15.048828 2.5 L 4.951172 2.5 C 4.619141 2.5 4.303385 2.568359 4.003906 2.705078 C 3.704427 2.841797 3.44401 3.02409 3.222656 3.251953 C 3.001302 3.479818 2.825521 3.745117 2.695312 4.047852 C 2.565104 4.350587 2.5 4.66797 2.5 5 L 13.310547 5 C 12.60091 5.266928 11.998697 5.683594 11.503906 6.25 L 2.5 6.25 L 2.5 15.048828 C 2.5 15.38737 2.568359 15.704753 2.705078 16.000977 C 2.841797 16.297201 3.024088 16.55599 3.251953 16.777344 C 3.479818 16.998697 3.745117 17.174479 4.047852 17.304688 C 4.350586 17.434896 4.667969 17.5 5 17.5 Z" />
                </coreControls:WinoNavigationViewItem.Icon>

                <Grid MinHeight="50">
--- a/Wino.Mail/Controls/WebViewEditorControl.cs
+++ b/Wino.Mail/Controls/WebViewEditorControl.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Text.Json;
 using System.Threading.Tasks;
 using CommunityToolkit.WinUI;
@@ -10,12 +9,11 @@ using Microsoft.Web.WebView2.Core;
 using Windows.UI.ViewManagement.Core;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Markup;
-using Windows.UI.Xaml.Media;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models;
 using Wino.Core.Domain.Models.Reader;
+using Wino.Core.UWP;
 using Wino.Core.UWP.Extensions;

 namespace Wino.Mail.Controls;
@@ -24,7 +22,6 @@ public sealed partial class WebViewEditorControl : Control, IDisposable
    private readonly INativeAppService _nativeAppService = App.Current.Services.GetService<INativeAppService>();
    private readonly IFontService _fontService = App.Current.Services.GetService<IFontService>();
    private readonly IPreferencesService _preferencesService = App.Current.Services.GetService<IPreferencesService>();
-    private readonly IUnderlyingThemeService _underlyingThemeService = App.Current.Services.GetService<IUnderlyingThemeService>();

    [GeneratedDependencyProperty]
    public partial bool IsEditorDarkMode { get; set; }
@@ -99,7 +96,7 @@ public sealed partial class WebViewEditorControl : Control, IDisposable
        }
    }

-    [GeneratedDependencyProperty]
+    [GeneratedDependencyProperty(DefaultValue = true)]
    public partial bool IsEditorIndentEnabled { get; private set; }

    [GeneratedDependencyProperty]
@@ -142,9 +139,7 @@ public sealed partial class WebViewEditorControl : Control, IDisposable
    {
        this.DefaultStyleKey = typeof(WebViewEditorControl);

-        IsEditorIndentEnabled = true;
-
-        IsEditorDarkMode = _underlyingThemeService.IsUnderlyingThemeDark();
+        IsEditorDarkMode = WinoApplication.Current.UnderlyingThemeService.IsUnderlyingThemeDark();
    }

    protected override async void OnApplyTemplate()
--- a/Wino.Mail/Services/DialogService.cs
+++ b/Wino.Mail/Services/DialogService.cs
@@ -55,17 +55,6 @@ public class DialogService : DialogServiceBase, IMailDialogService
        }
    }

-    public async Task<MailAccount> ShowEditAccountDialogAsync(MailAccount account)
-    {
-        var editAccountDialog = new AccountEditDialog(account)
-        {
-            RequestedTheme = ThemeService.RootTheme.ToWindowsElementTheme()
-        };
-
-        await HandleDialogPresentationAsync(editAccountDialog);
-
-        return editAccountDialog.IsSaved ? editAccountDialog.Account : null;
-    }

    public async Task<ICreateAccountAliasDialog> ShowCreateAccountAliasDialogAsync()
    {
@@ -190,7 +179,7 @@ public class DialogService : DialogServiceBase, IMailDialogService

        await HandleDialogPresentationAsync(dialog);

-        if(dialog.Copied)
+        if (dialog.Copied)
            InfoBarMessage(Translator.ClipboardTextCopied_Title, string.Format(Translator.ClipboardTextCopied_Message, Translator.MessageSourceDialog_Title), InfoBarMessageType.Information);
    }

--- a/Wino.Mail/Services/NavigationService.cs
+++ b/Wino.Mail/Services/NavigationService.cs
@@ -56,6 +56,7 @@ public class NavigationService : NavigationServiceBase, INavigationService
            WinoPage.AppPreferencesPage => typeof(AppPreferencesPage),
            WinoPage.AliasManagementPage => typeof(AliasManagementPage),
            WinoPage.LanguageTimePage => typeof(LanguageTimePage),
+            WinoPage.EditAccountDetailsPage => typeof(EditAccountDetailsPage),
            _ => null,
        };
    }
--- a/Wino.Mail/Views/Abstract/EditAccountDetailsPageAbstract.cs
+++ b/Wino.Mail/Views/Abstract/EditAccountDetailsPageAbstract.cs
@@ -0,0 +1,5 @@
+using Wino.Core.UWP;
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract;
+public partial class EditAccountDetailsPageAbstract : BasePage<EditAccountDetailsPageViewModel> { }
--- a/Wino.Mail/Views/Account/AccountDetailsPage.xaml
+++ b/Wino.Mail/Views/Account/AccountDetailsPage.xaml
--- a/Wino.Mail/Views/Settings/EditAccountDetailsPage.xaml
+++ b/Wino.Mail/Views/Settings/EditAccountDetailsPage.xaml
--- a/Wino.Mail/Views/Settings/EditAccountDetailsPage.xaml.cs
+++ b/Wino.Mail/Views/Settings/EditAccountDetailsPage.xaml.cs
@@ -0,0 +1,11 @@
+using Wino.Views.Abstract;
+
+namespace Wino.Views;
+
+public sealed partial class EditAccountDetailsPage : EditAccountDetailsPageAbstract
+{
+    public EditAccountDetailsPage()
+    {
+        InitializeComponent();
+    }
+}