Contact and settings updates.

2026-03-06 12:31:37 +01:00
parent 51f64466c2
commit e1be644631
14 changed files with 119 additions and 54 deletions
@@ -73,7 +73,6 @@ public sealed partial class ImagePreviewControl : PersonPicture

        RequestRefresh();
    }
-
    private void OnLoaded(object sender, RoutedEventArgs e)
    {
        RequestRefresh();
@@ -306,7 +305,6 @@ public sealed partial class ImagePreviewControl : PersonPicture

        return string.Empty;
    }
-
    private async Task ApplyInitialVisualStateAsync(string displayName, long refreshVersion, CancellationToken cancellationToken)
    {
        await ExecuteOnUiThreadAsync(() =>
@@ -107,9 +107,6 @@
                    </controls:Segmented>
                </StackPanel>
            </TitleBar.RightHeader>
-            <TitleBar.IconSource>
-                <ImageIconSource ImageSource="/Assets/Wino_Icon.ico" />
-            </TitleBar.IconSource>
        </TitleBar>

        <Frame
@@ -127,6 +124,7 @@
            <notifyicon:TaskbarIcon.ContextFlyout>
                <MenuFlyout AreOpenCloseAnimationsEnabled="False">
                    <MenuFlyoutItem Command="{x:Bind ShowWinoCommand}" Text="{x:Bind domain:Translator.SystemTrayMenu_ShowWino}" />
+                    <MenuFlyoutItem Command="{x:Bind ShowWinoCalendarCommand}" Text="{x:Bind domain:Translator.SystemTrayMenu_ShowWinoCalendar}" />
                    <MenuFlyoutSeparator />
                    <MenuFlyoutItem Command="{x:Bind ExitWinoCommand}" Text="{x:Bind domain:Translator.SystemTrayMenu_ExitWino}" />
                </MenuFlyout>
@@ -34,6 +34,7 @@ public sealed partial class ShellWindow : WindowEx, IWinoShellWindow,
    public INavigationService NavigationService { get; } = WinoApplication.Current.Services.GetService<INavigationService>() ?? throw new Exception("NavigationService not registered in DI container.");

    public ICommand ShowWinoCommand { get; set; }
+    public ICommand ShowWinoCalendarCommand { get; set; }
    public ICommand ExitWinoCommand { get; set; }

    public ObservableCollection<SynchronizationActionItem> SyncActionItems { get; } = new();
@@ -60,7 +61,8 @@ public sealed partial class ShellWindow : WindowEx, IWinoShellWindow,
        // Register global mouse button listener for back button
        RegisterMouseBackButtonListener();

-        ShowWinoCommand = new RelayCommand(RestoreFromTray);
+        ShowWinoCommand = new RelayCommand(() => RestoreAndSwitchMode(WinoApplicationMode.Mail));
+        ShowWinoCalendarCommand = new RelayCommand(() => RestoreAndSwitchMode(WinoApplicationMode.Calendar));
        ExitWinoCommand = new RelayCommand(ForceClose);

        this.SetIcon("Assets/Wino_Icon.ico");
@@ -281,6 +283,18 @@ public sealed partial class ShellWindow : WindowEx, IWinoShellWindow,
        BringToFront();
    }

+    private void RestoreAndSwitchMode(WinoApplicationMode mode)
+    {
+        _currentMode = mode;
+
+        _isApplyingActivationMode = true;
+        AppModeSegmentedControl.SelectedIndex = mode == WinoApplicationMode.Mail ? 0 : 1;
+        _isApplyingActivationMode = false;
+
+        NavigationService.ChangeApplicationMode(mode);
+        RestoreFromTray();
+    }
+
    public void ForceClose()
    {
        // Unsubscribe from the closing event to avoid infinite loop
@@ -49,15 +49,12 @@ public sealed partial class AccountDetailsPage : AccountDetailsPageAbstract
    {
        base.OnNavigatedTo(e);

-        if (e.NavigationMode == NavigationMode.New)
+        var targetTabIndex = ViewModel.SelectedTabIndex;
+        if (targetTabIndex < 0 || targetTabIndex >= TabSelector.Items.Count)
        {
-            var targetTabIndex = ViewModel.SelectedTabIndex;
-            if (targetTabIndex < 0 || targetTabIndex >= TabSelector.Items.Count)
-            {
-                targetTabIndex = 1;
-            }
-
-            TabSelector.SelectedItem = TabSelector.Items[targetTabIndex];
+            targetTabIndex = 1;
        }
+
+        TabSelector.SelectedItem = TabSelector.Items[targetTabIndex];
    }
 }
@@ -33,19 +33,12 @@
                    <ColumnDefinition Width="*" />
                </Grid.ColumnDefinitions>

-                <!--  App Icon  -->
-                <Border
-                    Width="72"
-                    Height="72"
-                    Background="{ThemeResource AccentFillColorDefaultBrush}"
-                    CornerRadius="16">
-                    <FontIcon
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        FontSize="32"
-                        Foreground="{ThemeResource TextOnAccentFillColorPrimaryBrush}"
-                        Glyph="&#xE715;" />
-                </Border>
+                <Image
+                    Width="96"
+                    Height="96"
+                    VerticalAlignment="Center"
+                    Source="ms-appx:///Assets/AppEntries/MailAssets/Square150x150Logo.scale-100.png"
+                    Stretch="Uniform" />

                <!--  App Info  -->
                <StackPanel
@@ -65,6 +58,17 @@
                        Foreground="{ThemeResource TextFillColorTertiaryBrush}"
                        Style="{StaticResource CaptionTextBlockStyle}"
                        Text="{x:Bind ViewModel.VersionText, Mode=OneWay}" />
+                    <StackPanel
+                        Margin="0,8,0,0"
+                        Orientation="Horizontal"
+                        Spacing="8">
+                        <HyperlinkButton
+                            Content="{x:Bind ViewModel.WebsiteUrl, Mode=OneWay}"
+                            NavigateUri="{x:Bind ViewModel.WebsiteUrl, Mode=OneWay}" />
+                        <HyperlinkButton
+                            Content="{x:Bind domain:Translator.SettingsPaypal_Title}"
+                            NavigateUri="{x:Bind ViewModel.PaypalUrl, Mode=OneWay}" />
+                    </StackPanel>
                </StackPanel>
            </Grid>

@@ -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}" />
@@ -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"
@@ -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));