javier/Wino-Mail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplified compoper and rendering logic through messages.

Browse Source
This commit is contained in:
Burak Kaan Köse
2026-02-25 01:41:48 +01:00
parent 5d46ea73db
commit 3a39266121
14 changed files with 157 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Wino.Mail.WinUI/Controls/ImagePreviewControl.cs
+37 -38
View File
@@ -1,6 +1,6 @@
using System;
using System.IO;
using System.Net.Mail;
using System.ComponentModel;
using System.Threading;
using System.Threading.Tasks;
using CommunityToolkit.WinUI;
@@ -30,20 +30,9 @@ public sealed partial class ImagePreviewControl : PersonPicture
[GeneratedDependencyProperty]
public partial IMailItemDisplayInformation? MailItemInformation { get; set; }
[GeneratedDependencyProperty]
public partial string? FromName { get; set; }
[GeneratedDependencyProperty]
public partial string? FromAddress { get; set; }
[GeneratedDependencyProperty]
public partial string? SenderContactPicture { get; set; }
[GeneratedDependencyProperty(DefaultValue = false)]
public partial bool ThumbnailUpdatedEvent { get; set; }
private readonly IThumbnailService? _thumbnailService;
private readonly IPreferencesService? _preferencesService;
private INotifyPropertyChanged? _mailItemInformationPropertySource;
private CancellationTokenSource? _refreshCancellationTokenSource;
private CancellationTokenSource? _scheduledRefreshCancellationTokenSource;
private long _refreshVersion;
@@ -68,17 +57,21 @@ public sealed partial class ImagePreviewControl : PersonPicture
partial void OnMailItemInformationPropertyChanged(DependencyPropertyChangedEventArgs e)
{
if (_mailItemInformationPropertySource != null)
{
_mailItemInformationPropertySource.PropertyChanged -= MailItemInformationPropertyChanged;
_mailItemInformationPropertySource = null;
}
if (e.NewValue is INotifyPropertyChanged observableMailItemInformation)
{
_mailItemInformationPropertySource = observableMailItemInformation;
_mailItemInformationPropertySource.PropertyChanged += MailItemInformationPropertyChanged;
}
RequestRefresh();
}
partial void OnFromNameChanged(string? newValue) => RequestRefresh();
partial void OnFromAddressChanged(string? newValue) => RequestRefresh();
partial void OnSenderContactPictureChanged(string? newValue) => RequestRefresh();
partial void OnThumbnailUpdatedEventChanged(bool newValue) => RequestRefresh();
private void OnLoaded(object sender, RoutedEventArgs e)
{
RequestRefresh();
@@ -86,10 +79,28 @@ public sealed partial class ImagePreviewControl : PersonPicture
private void OnUnloaded(object sender, RoutedEventArgs e)
{
if (_mailItemInformationPropertySource != null)
{
_mailItemInformationPropertySource.PropertyChanged -= MailItemInformationPropertyChanged;
_mailItemInformationPropertySource = null;
}
CancelScheduledRefresh();
CancelActiveRefresh();
}
private void MailItemInformationPropertyChanged(object? sender, PropertyChangedEventArgs e)
{
// Refresh only for fields that affect avatar image or initials.
if (string.IsNullOrEmpty(e.PropertyName)
|| e.PropertyName == nameof(IMailItemDisplayInformation.Base64ContactPicture)
|| e.PropertyName == nameof(IMailItemDisplayInformation.SenderContact)
|| e.PropertyName == nameof(IMailItemDisplayInformation.ThumbnailUpdatedEvent))
{
RequestRefresh();
}
}
private void RequestRefresh()
{
if (DispatcherQueue == null || DispatcherQueue.HasThreadAccess)
@@ -236,6 +247,9 @@ public sealed partial class ImagePreviewControl : PersonPicture
private string ResolveAddress()
{
if (MailItemInformation == null)
return string.Empty;
var contactAddress = MailItemInformation?.SenderContact?.Address;
if (!string.IsNullOrWhiteSpace(contactAddress))
return contactAddress.Trim();
@@ -243,7 +257,7 @@ public sealed partial class ImagePreviewControl : PersonPicture
if (!string.IsNullOrWhiteSpace(MailItemInformation?.FromAddress))
return MailItemInformation.FromAddress.Trim();
return FromAddress?.Trim() ?? string.Empty;
return string.Empty;
}
private string ResolveDisplayName(string resolvedAddress)
@@ -255,9 +269,6 @@ public sealed partial class ImagePreviewControl : PersonPicture
if (!string.IsNullOrWhiteSpace(MailItemInformation?.FromName))
return MailItemInformation.FromName.Trim();
if (!string.IsNullOrWhiteSpace(FromName))
return FromName.Trim();
return resolvedAddress.Trim();
}
@@ -269,7 +280,7 @@ public sealed partial class ImagePreviewControl : PersonPicture
if (!string.IsNullOrWhiteSpace(MailItemInformation?.Base64ContactPicture))
return MailItemInformation.Base64ContactPicture;
return SenderContactPicture ?? string.Empty;
return string.Empty;
}
private async Task ApplyInitialVisualStateAsync(string displayName, long refreshVersion, CancellationToken cancellationToken)
@@ -387,16 +398,4 @@ public sealed partial class ImagePreviewControl : PersonPicture
}).ConfigureAwait(false);
}
private static bool IsValidEmail(string email)
{
try
{
_ = new MailAddress(email);
return true;
}
catch
{
return false;
}
}
}
Wino.Mail.WinUI/Services/NavigationService.cs
+2 -2
View File
@@ -212,7 +212,7 @@ public class NavigationService : NavigationServiceBase, INavigationService
&& parameter is MailItemViewModel mailItemViewModel
&& page != WinoPage.ComposePage)
{
WeakReferenceMessenger.Default.Send(new NewMailItemRenderingRequestedEvent(mailItemViewModel));
WeakReferenceMessenger.Default.Send(new ReaderItemRefreshRequestedEvent(mailItemViewModel));
}
else if (listingFrame.Content != null
&& listingFrame.Content.GetType() == GetPageType(WinoPage.ComposePage)
@@ -221,7 +221,7 @@ public class NavigationService : NavigationServiceBase, INavigationService
{
// ComposePage is already active and we're switching to another draft.
// Reuse existing ComposePage and WebView2 instead of navigating.
WeakReferenceMessenger.Default.Send(new NewComposeDraftItemRequestedEvent(composeDraftViewModel));
WeakReferenceMessenger.Default.Send(new ReaderItemRefreshRequestedEvent(composeDraftViewModel));
}
else if (listingFrame.Content != null
&& listingFrame.Content.GetType() == GetPageType(WinoPage.IdlePage)
Wino.Mail.WinUI/Views/Mail/ComposePage.xaml
+4 -10
View File
@@ -43,10 +43,7 @@
</Grid.ContextFlyout>-->
<Viewbox Width="24">
<controls:ImagePreviewControl
FromAddress="{x:Bind Address}"
FromName="{x:Bind Name}"
SenderContactPicture="{x:Bind Base64ContactPicture}" />
<PersonPicture DisplayName="{x:Bind Name, Mode=OneTime}" />
</Viewbox>
<TextBlock
@@ -62,10 +59,7 @@
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<controls:ImagePreviewControl
FromAddress="{x:Bind Address}"
FromName="{x:Bind Name}"
SenderContactPicture="{x:Bind Base64ContactPicture}" />
<PersonPicture DisplayName="{x:Bind Name, Mode=OneTime}" />
<TextBlock Grid.Column="1">
<Run FontWeight="SemiBold" Text="{x:Bind Name}" /><LineBreak /><Run Text="{x:Bind Address}" />
</TextBlock>
@@ -485,8 +479,8 @@
<TextBlock FontWeight="SemiBold" Text="{x:Bind Subject}" />
<TextBlock FontSize="12" Text="{x:Bind Issuer}" />
<TextBlock>
<Run Text="{x:Bind domain:Translator.Composer_CertificateExpires}" />
<Run Text="{x:Bind NotAfter, Mode=OneWay}" />
<Run Text="{x:Bind domain:Translator.Composer_CertificateExpires, Mode=OneTime}" />
<Run Text="{x:Bind NotAfter, Mode=OneTime}" />
</TextBlock>
</StackPanel>
</DataTemplate>
Wino.Mail.WinUI/Views/Mail/ComposePage.xaml.cs
+6 -4
View File
@@ -32,7 +32,7 @@ namespace Wino.Views.Mail;
public sealed partial class ComposePage : ComposePageAbstract,
IRecipient<CreateNewComposeMailRequested>,
IRecipient<ApplicationThemeChanged>,
IRecipient<NewComposeDraftItemRequestedEvent>
IRecipient<ReaderItemRefreshRequestedEvent>
{
public WebView2 GetWebView() => WebViewEditor.GetUnderlyingWebView();
@@ -302,8 +302,10 @@ public sealed partial class ComposePage : ComposePageAbstract,
WebViewEditor.IsEditorDarkMode = message.IsUnderlyingThemeDark;
}
void IRecipient<NewComposeDraftItemRequestedEvent>.Receive(NewComposeDraftItemRequestedEvent message)
void IRecipient<ReaderItemRefreshRequestedEvent>.Receive(ReaderItemRefreshRequestedEvent message)
{
if (message.MailItemViewModel == null || !message.MailItemViewModel.IsDraft) return;
// Reset the initial focus flag so ToBox gets focus for the new draft.
isInitialFocusHandled = false;
}
@@ -423,7 +425,7 @@ public sealed partial class ComposePage : ComposePageAbstract,
WeakReferenceMessenger.Default.Register<CreateNewComposeMailRequested>(this);
WeakReferenceMessenger.Default.Register<ApplicationThemeChanged>(this);
WeakReferenceMessenger.Default.Register<NewComposeDraftItemRequestedEvent>(this);
WeakReferenceMessenger.Default.Register<ReaderItemRefreshRequestedEvent>(this);
}
protected override void UnregisterRecipients()
@@ -432,7 +434,7 @@ public sealed partial class ComposePage : ComposePageAbstract,
WeakReferenceMessenger.Default.Unregister<CreateNewComposeMailRequested>(this);
WeakReferenceMessenger.Default.Unregister<ApplicationThemeChanged>(this);
WeakReferenceMessenger.Default.Unregister<NewComposeDraftItemRequestedEvent>(this);
WeakReferenceMessenger.Default.Unregister<ReaderItemRefreshRequestedEvent>(this);
}
// TODO: Save mime on closing the app.
Wino.Mail.WinUI/Views/Mail/MailListPage.xaml.cs
+36 -9
View File
@@ -47,6 +47,8 @@ public sealed partial class MailListPage : MailListPageAbstract,
IRecipient<DisposeRenderingFrameRequested>
{
private const double RENDERING_COLUMN_MIN_WIDTH = 375;
private const int IDLE_NAVIGATION_DELAY_MS = 120;
private int _idleNavigationRequestVersion = 0;
private IStatePersistanceService StatePersistenceService { get; } = WinoApplication.Current.Services.GetService<IStatePersistanceService>() ?? throw new Exception($"Can't resolve {nameof(KeyPressService)}");
private IKeyPressService KeyPressService { get; } = WinoApplication.Current.Services.GetService<IKeyPressService>() ?? throw new Exception($"Can't resolve {nameof(KeyPressService)}");
@@ -80,6 +82,8 @@ public sealed partial class MailListPage : MailListPageAbstract,
{
base.OnNavigatedFrom(e);
InvalidatePendingIdleNavigation();
this.Bindings.StopTracking();
ViewModel.MailCollection.ItemSelectionChanged -= WinoMailCollectionSelectionChanged;
@@ -280,17 +284,12 @@ public sealed partial class MailListPage : MailListPageAbstract,
// No active mail item. Go to empty page.
if (message.SelectedMailItemViewModel == null)
{
if (IsRenderingPageActive())
{
WeakReferenceMessenger.Default.Send(new CancelRenderingContentRequested());
}
// Ensure rendering frame actually navigates away from Compose/Rendering pages.
// Otherwise those pages keep their messenger registrations alive.
ViewModel.NavigationService.Navigate(WinoPage.IdlePage, null, NavigationReferenceFrame.RenderingFrame, NavigationTransitionType.DrillIn);
_ = NavigateIdleWhenSelectionSettlesAsync();
}
else
{
InvalidatePendingIdleNavigation();
// Navigate to composing page.
if (message.SelectedMailItemViewModel.IsDraft)
{
@@ -309,7 +308,7 @@ public sealed partial class MailListPage : MailListPageAbstract,
{
// Composer is already active. Skip connected animation since the page
// will be reused in-place (no navigation occurs).
// NavigationService will send NewComposeDraftItemRequestedEvent instead.
// NavigationService will send ReaderItemRefreshRequestedEvent instead.
}
else
composerPageTransition = NavigationTransitionType.DrillIn;
@@ -337,6 +336,34 @@ public sealed partial class MailListPage : MailListPageAbstract,
private bool IsRenderingPageActive() => RenderingFrame.Content is MailRenderingPage;
private bool IsComposingPageActive() => RenderingFrame.Content is ComposePage;
private void InvalidatePendingIdleNavigation()
{
unchecked
{
_idleNavigationRequestVersion++;
}
}
private async Task NavigateIdleWhenSelectionSettlesAsync()
{
int requestVersion = ++_idleNavigationRequestVersion;
await Task.Delay(IDLE_NAVIGATION_DELAY_MS);
if (requestVersion != _idleNavigationRequestVersion) return;
if (ViewModel.MailCollection.SelectedItemsCount != 0) return;
if (IsRenderingPageActive())
{
WeakReferenceMessenger.Default.Send(new CancelRenderingContentRequested());
}
// Ensure rendering frame actually navigates away from Compose/Rendering pages.
// Otherwise those pages keep their messenger registrations alive.
ViewModel.NavigationService.Navigate(WinoPage.IdlePage, null, NavigationReferenceFrame.RenderingFrame, NavigationTransitionType.DrillIn);
UpdateAdaptiveness();
}
private void PrepareComposePageWebViewTransition()
{
var webView = GetComposerPageWebView();
Wino.Mail.WinUI/Views/Mail/MailRenderingPage.xaml
+2 -7
View File
@@ -46,10 +46,7 @@
Grid.RowSpan="2"
Width="36"
Height="36"
FromAddress="{x:Bind Address}"
FromName="{x:Bind Name}"
SenderContactPicture="{x:Bind Base64ContactPicture}"
ThumbnailUpdatedEvent="{x:Bind ThumbnailUpdatedEvent, Mode=OneWay}" />
MailItemInformation="{x:Bind}" />
<TextBlock Grid.Column="1" Text="{x:Bind Name}" />
@@ -291,9 +288,7 @@
Width="36"
Height="36"
FontSize="16"
FromAddress="{x:Bind ViewModel.FromAddress, Mode=OneWay}"
FromName="{x:Bind ViewModel.FromName, Mode=OneWay}"
SenderContactPicture="{x:Bind ViewModel.ContactPicture, Mode=OneWay}" />
MailItemInformation="{x:Bind ViewModel.CurrentMailItemDisplayInformation, Mode=OneWay}" />
<Grid
Grid.Column="1"
Wino.Mail.WinUI/Views/Mail/MailRenderingPage.xaml.cs
+7 -5
View File
@@ -164,16 +164,18 @@ public sealed partial class MailRenderingPage : MailRenderingPageAbstract,
protected override void OnNavigatedTo(NavigationEventArgs e)
{
// Initialize WebView2 wiring before base navigation invokes ViewModel rendering.
// Base.OnNavigatedTo triggers VM.OnNavigatedTo, which can send HtmlRenderingRequested.
DOMLoadedTask = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
Chromium.CoreWebView2Initialized -= CoreWebViewInitialized;
Chromium.CoreWebView2Initialized += CoreWebViewInitialized;
_ = Chromium.EnsureCoreWebView2Async();
base.OnNavigatedTo(e);
var anim = ConnectedAnimationService.GetForCurrentView().GetAnimation("WebViewConnectedAnimation");
anim?.TryStart(Chromium);
Chromium.CoreWebView2Initialized -= CoreWebViewInitialized;
Chromium.CoreWebView2Initialized += CoreWebViewInitialized;
_ = Chromium.EnsureCoreWebView2Async();
// We don't have shell initialized here. It's only standalone EML viewing.
// Shift command bar from top to adjust the design.