Contact and settings updates.

Wino.Mail.WinUI/Views/Settings/AboutPage.xaml

@@ -17,9 +17,12 @@
                 </TransitionCollection>
             </StackPanel.ChildrenTransitions>
             <Image
-                Width="50"
-                Height="50"
-                Source="ms-appx:///Images/StoreLogo.png" />
+                Width="128"
+                Height="128"
+                Margin="0,0,0,12"
+                HorizontalAlignment="Center"
+                Source="ms-appx:///Assets/AppEntries/MailAssets/Square150x150Logo.scale-100.png"
+                Stretch="Uniform" />
             <TextBlock
                 Margin="0,6,0,4"
                 HorizontalAlignment="Center"
@@ -32,6 +35,26 @@
                 Style="{StaticResource BodyTextBlockStyle}"
                 Text="{x:Bind domain:Translator.SettingsAboutWinoDescription}" />
 
+            <controls:SettingsCard
+                Command="{x:Bind ViewModel.NavigateCommand}"
+                CommandParameter="{x:Bind ViewModel.WebsiteUrl}"
+                Description="{x:Bind domain:Translator.SettingsWebsite_Description}"
+                Header="{x:Bind domain:Translator.SettingsWebsite_Title}"
+                IsClickEnabled="True">
+                <controls:SettingsCard.HeaderIcon>
+                    <FontIcon
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Glyph="&#xE774;" />
+                </controls:SettingsCard.HeaderIcon>
+                <controls:SettingsCard.ActionIcon>
+                    <PathIcon
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Data="{StaticResource OpenInNewWindowPathIcon}" />
+                </controls:SettingsCard.ActionIcon>
+            </controls:SettingsCard>
+
             <controls:SettingsCard
                 Command="{x:Bind ViewModel.NavigateCommand}"
                 CommandParameter="{x:Bind ViewModel.GitHubUrl}"
@@ -174,7 +197,7 @@
 
             <controls:SettingsCard Header="Wino Mail">
                 <controls:SettingsCard.HeaderIcon>
-                    <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Images/StoreLogo.png" />
+                    <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/AppEntries/MailAssets/Square150x150Logo.scale-100.png" />
                 </controls:SettingsCard.HeaderIcon>
                 <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" IsTextSelectionEnabled="True">
                     <Run Text="{x:Bind domain:Translator.SettingsAboutVersion}" /><Run Text="{x:Bind ViewModel.VersionName}" />

Wino.Mail.WinUI/Views/Settings/ContactsPage.xaml

@@ -3,18 +3,20 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:abstract="using:Wino.Views.Abstract"
+    xmlns:controls="using:Wino.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:entities="using:Wino.Core.Domain.Entities.Shared"
     xmlns:helpers="using:Wino.Helpers"
     xmlns:listview="using:Wino.Mail.WinUI.Controls.ListView"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:viewModels="using:Wino.Mail.ViewModels.Data"
     xmlns:toolkitExt="using:CommunityToolkit.WinUI"
     x:Name="root"
     mc:Ignorable="d">
 
     <Page.Resources>
-        <DataTemplate x:Key="ContactTemplate" x:DataType="entities:AccountContact">
+        <DataTemplate x:Key="ContactTemplate" x:DataType="viewModels:AccountContactViewModel">
             <Grid Margin="0,0,0,8" Padding="0,4">
                 <Border
                     Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
@@ -29,12 +31,11 @@
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
 
-                    <PersonPicture
+                    <controls:ImagePreviewControl
                         Grid.Column="0"
                         Width="40"
                         Height="40"
-                        DisplayName="{x:Bind Name, Mode=OneTime, TargetNullValue=''}"
-                        ProfilePicture="{x:Bind helpers:XamlHelpers.Base64ToBitmapImage(Base64ContactPicture), Mode=OneWay}" />
+                        MailItemInformation="{x:Bind Mode=OneWay}" />
 
                     <StackPanel
                         Grid.Column="1"

Wino.Mail.WinUI/Views/Settings/ContactsPage.xaml.cs

@@ -2,8 +2,8 @@ using System;
 using System.ComponentModel;
 using System.Linq;
 using Microsoft.UI.Xaml.Controls;
-using Wino.Core.Domain.Entities.Shared;
 using Wino.Mail.ViewModels;
+using Wino.Mail.ViewModels.Data;
 using Wino.Views.Abstract;
 
 namespace Wino.Views.Settings;
@@ -20,7 +20,7 @@ public sealed partial class ContactsPage : ContactsPageAbstract
 
     private void EditContact_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
     {
-        if (sender is Button button && button.CommandParameter is AccountContact contact)
+        if (sender is Button button && button.CommandParameter is AccountContactViewModel contact)
         {
             ViewModel.EditContactCommand.Execute(contact);
         }
@@ -28,7 +28,7 @@ public sealed partial class ContactsPage : ContactsPageAbstract
 
     private void PickContactPhoto_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
     {
-        if (sender is Button button && button.CommandParameter is AccountContact contact)
+        if (sender is Button button && button.CommandParameter is AccountContactViewModel contact)
         {
             ViewModel.PickContactPhotoCommand.Execute(contact);
         }
@@ -36,7 +36,7 @@ public sealed partial class ContactsPage : ContactsPageAbstract
 
     private void DeleteContact_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
     {
-        if (sender is Button button && button.CommandParameter is AccountContact contact)
+        if (sender is Button button && button.CommandParameter is AccountContactViewModel contact)
         {
             ViewModel.DeleteContactCommand.Execute(contact);
         }
@@ -53,7 +53,7 @@ public sealed partial class ContactsPage : ContactsPageAbstract
             return;
         }
 
-        foreach (var removedItem in e.RemovedItems.OfType<AccountContact>())
+        foreach (var removedItem in e.RemovedItems.OfType<AccountContactViewModel>())
         {
             var selectedContact = ViewModel.SelectedContacts.FirstOrDefault(c =>
                 string.Equals(c.Address, removedItem.Address, StringComparison.OrdinalIgnoreCase));
@@ -64,7 +64,7 @@ public sealed partial class ContactsPage : ContactsPageAbstract
             }
         }
 
-        foreach (var addedItem in e.AddedItems.OfType<AccountContact>())
+        foreach (var addedItem in e.AddedItems.OfType<AccountContactViewModel>())
         {
             var alreadySelected = ViewModel.SelectedContacts.Any(c =>
                 string.Equals(c.Address, addedItem.Address, StringComparison.OrdinalIgnoreCase));