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.

Wino.Core.UWP/Dialogs/AccountEditDialog.xaml

@@ -1,19 +0,0 @@
-<ContentDialog
-    x:Class="Wino.Dialogs.AccountEditDialog"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:domain="using:Wino.Core.Domain"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    Title="{x:Bind domain:Translator.AccountEditDialog_Title}"
-    DefaultButton="Primary"
-    PrimaryButtonClick="SaveClicked"
-    PrimaryButtonText="{x:Bind domain:Translator.Buttons_Save}"
-    SecondaryButtonText="{x:Bind domain:Translator.Buttons_Discard}"
-    Style="{StaticResource WinoDialogStyle}"
-    mc:Ignorable="d">
-
-    <Grid>
-        <TextBox Header="{x:Bind domain:Translator.AccountEditDialog_Message}" Text="{x:Bind Account.Name, Mode=TwoWay}" />
-    </Grid>
-</ContentDialog>

Wino.Core.UWP/Dialogs/AccountEditDialog.xaml.cs

@@ -1,21 +0,0 @@
-using Windows.UI.Xaml.Controls;
-using Wino.Core.Domain.Entities.Shared;
-
-namespace Wino.Dialogs;
-
-public sealed partial class AccountEditDialog : ContentDialog
-{
-    public MailAccount Account { get; private set; }
-    public bool IsSaved { get; set; }
-
-    public AccountEditDialog(MailAccount account)
-    {
-        InitializeComponent();
-        Account = account;
-    }
-
-    private void SaveClicked(ContentDialog sender, ContentDialogButtonClickEventArgs args)
-    {
-        IsSaved = true;
-    }
-}

Wino.Core.UWP/Dialogs/NewAccountDialog.xaml

@@ -5,6 +5,7 @@
     xmlns:accounts="using:Wino.Core.Domain.Models.Accounts"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:domain="using:Wino.Core.Domain"
+    xmlns:helpers="using:Wino.Helpers"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     Title="{x:Bind domain:Translator.NewAccountDialog_Title}"
@@ -45,30 +46,47 @@
     <Grid MinWidth="400" RowSpacing="12">
         <Grid Visibility="{x:Bind IsProviderSelectionVisible, Mode=OneWay}">
             <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
 
             <!--  Account Name  -->
-            <TextBox
-                x:Name="AccountNameTextbox"
-                Header="{x:Bind domain:Translator.NewAccountDialog_AccountName}"
-                PlaceholderText="{x:Bind domain:Translator.NewAccountDialog_AccountNamePlaceholder}"
-                TextChanged="InputChanged" />
 
-            <!--
-                TODO: Move Name, Sender Name and Color Picker to another Frame.
-                Provider selection should be first, then account details.
-            -->
-            <!--<Grid Grid.Row="1">
-    <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="Auto" />
-        <ColumnDefinition Width="*" />
-    </Grid.ColumnDefinitions>
-    <TextBlock Text="Color" />
-    <muxc:ColorPicker x:Name="AccountColorPicker" Grid.Column="1" />
-</Grid>-->
+            <Grid ColumnSpacing="12">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+
+                <TextBox
+                    x:Name="AccountNameTextbox"
+                    Header="{x:Bind domain:Translator.NewAccountDialog_AccountName}"
+                    PlaceholderText="{x:Bind domain:Translator.NewAccountDialog_AccountNamePlaceholder}"
+                    TextChanged="InputChanged" />
+
+                <Button Grid.Column="1" VerticalAlignment="Bottom">
+                    <Grid>
+                        <Ellipse
+                            x:Name="SelectedColorEllipse"
+                            Width="16"
+                            Height="16" />
+
+                        <TextBlock x:Name="PickColorTextblock" Text="{x:Bind domain:Translator.CalendarDisplayOptions_Color}" />
+                    </Grid>
+
+                    <Button.Flyout>
+                        <Flyout Placement="TopEdgeAlignedLeft">
+                            <GridView
+                                Width="150"
+                                ItemTemplate="{StaticResource AccountColorTemplate}"
+                                ItemsSource="{x:Bind AvailableColors, Mode=OneWay}"
+                                SelectedItem="{x:Bind SelectedColor, Mode=TwoWay}" />
+                        </Flyout>
+                    </Button.Flyout>
+                </Button>
+
+            </Grid>
+
 
             <ListView
                 Grid.Row="2"

Wino.Core.UWP/Dialogs/NewAccountDialog.xaml.cs

@@ -1,11 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Windows.System;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Accounts;
+using Wino.Core.ViewModels.Data;
+using Wino.Helpers;
 
 namespace Wino.Core.UWP.Dialogs;
 
@@ -20,8 +23,15 @@ public sealed partial class NewAccountDialog : ContentDialog
     public static readonly DependencyProperty IsProviderSelectionVisibleProperty = DependencyProperty.Register(nameof(IsProviderSelectionVisible), typeof(bool), typeof(NewAccountDialog), new PropertyMetadata(true));
     public static readonly DependencyProperty IsSpecialImapServerPartVisibleProperty = DependencyProperty.Register(nameof(IsSpecialImapServerPartVisible), typeof(bool), typeof(NewAccountDialog), new PropertyMetadata(false));
     public static readonly DependencyProperty SelectedMailProviderProperty = DependencyProperty.Register(nameof(SelectedMailProvider), typeof(ProviderDetail), typeof(NewAccountDialog), new PropertyMetadata(null, new PropertyChangedCallback(OnSelectedProviderChanged)));
+    public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register(nameof(SelectedColor), typeof(AppColorViewModel), typeof(NewAccountDialog), new PropertyMetadata(null, new PropertyChangedCallback(OnSelectedColorChanged)));
 
 
+    public AppColorViewModel SelectedColor
+    {
+        get { return (AppColorViewModel)GetValue(SelectedColorProperty); }
+        set { SetValue(SelectedColorProperty, value); }
+    }
+
     /// <summary>
     /// Gets or sets current selected mail provider in the dialog.
     /// </summary>
@@ -48,13 +58,19 @@ public sealed partial class NewAccountDialog : ContentDialog
 
     public List<IProviderDetail> Providers { get; set; }
 
+    public List<AppColorViewModel> AvailableColors { get; set; }
+
+
     public AccountCreationDialogResult Result = null;
 
     public NewAccountDialog()
     {
         InitializeComponent();
 
-        // AccountColorPicker.Color = Colors.Blue;
+        var themeService = WinoApplication.Current.ThemeService.GetAvailableAccountColors();
+        AvailableColors = themeService.Select(a => new AppColorViewModel(a)).ToList();
+
+        UpdateSelectedColor();
     }
 
     private static void OnSelectedProviderChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
@@ -63,6 +79,19 @@ public sealed partial class NewAccountDialog : ContentDialog
             dialog.Validate();
     }
 
+    private static void OnSelectedColorChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
+    {
+        if (obj is NewAccountDialog dialog)
+            dialog.UpdateSelectedColor();
+    }
+
+    private void UpdateSelectedColor()
+    {
+        PickColorTextblock.Visibility = SelectedColor == null ? Visibility.Visible : Visibility.Collapsed;
+        SelectedColorEllipse.Fill = SelectedColor == null ? null : XamlHelpers.GetSolidColorBrushFromHex(SelectedColor.Hex);
+    }
+
+
     private void CancelClicked(ContentDialog sender, ContentDialogButtonClickEventArgs args)
     {
         Hide();
@@ -75,7 +104,7 @@ public sealed partial class NewAccountDialog : ContentDialog
             // Special imap detail input.
 
             var details = new SpecialImapProviderDetails(SpecialImapAddress.Text.Trim(), AppSpecificPassword.Password.Trim(), DisplayNameTextBox.Text.Trim(), SelectedMailProvider.SpecialImapProvider);
-            Result = new AccountCreationDialogResult(SelectedMailProvider.Type, AccountNameTextbox.Text.Trim(), details);
+            Result = new AccountCreationDialogResult(SelectedMailProvider.Type, AccountNameTextbox.Text.Trim(), details, SelectedColor?.Hex ?? string.Empty);
             Hide();
 
             return;
@@ -97,7 +126,7 @@ public sealed partial class NewAccountDialog : ContentDialog
             }
             else
             {
-                Result = new AccountCreationDialogResult(SelectedMailProvider.Type, AccountNameTextbox.Text.Trim(), null);
+                Result = new AccountCreationDialogResult(SelectedMailProvider.Type, AccountNameTextbox.Text.Trim(), null, SelectedColor?.Hex ?? string.Empty);
                 Hide();
             }
         }