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

Merge branch 'main' of https://github.com/bkaankose/Wino-Mail

Browse Source
This commit is contained in:
Burak Kaan Köse
2024-09-27 01:26:19 +02:00
parent 11ab579de9 9aa1de11af
commit 56329f02b6
4 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Wino.Core.Domain/Entities/AccountContact.cs
View File

@@ -36,7 +36,7 @@ namespace Wino.Core.Domain.Entities
/// </summary> /// </summary>
public bool IsRootContact { get; set; } public bool IsRootContact { get; set; }
public string DisplayName => Address == Name ? Address : $"{Name} <{Address}>"; public string DisplayName => Address == Name || string.IsNullOrWhiteSpace(Name) ? Address.ToLowerInvariant() : $"{Name} <{Address.ToLowerInvariant()}>";
public override bool Equals(object obj) public override bool Equals(object obj)
{ {

16
Wino.Mail/Controls/MailItemDisplayInformationControl.xaml
View File

@@ -108,10 +108,19 @@
<!-- Sender --> <!-- Sender -->
<TextBlock <TextBlock
x:Name="SenderText" x:Name="SenderTextFromName"
Grid.Column="1" Grid.Column="1"
Text="{x:Bind MailItem.FromName}" Text="{x:Bind MailItem.FromName}"
TextTrimming="WordEllipsis" /> TextTrimming="WordEllipsis"
Visibility="{x:Bind helpers:XamlHelpers.StringToVisibilityConverter(MailItem.FromName)}" />
<!-- Sender -->
<TextBlock
x:Name="SenderTextFromAddress"
Grid.Column="1"
Text="{x:Bind MailItem.FromAddress}"
TextTrimming="WordEllipsis"
Visibility="{x:Bind helpers:XamlHelpers.StringToVisibilityReversedConverter(MailItem.FromName)}" />
<!-- Hover button --> <!-- Hover button -->
<StackPanel <StackPanel
@@ -252,7 +261,8 @@
<VisualState.Setters> <VisualState.Setters>
<Setter Target="TitleText.Foreground" Value="{ThemeResource SystemAccentColor}" /> <Setter Target="TitleText.Foreground" Value="{ThemeResource SystemAccentColor}" />
<Setter Target="TitleText.FontWeight" Value="Semibold" /> <Setter Target="TitleText.FontWeight" Value="Semibold" />
<Setter Target="SenderText.FontWeight" Value="Semibold" /> <Setter Target="SenderTextFromName.FontWeight" Value="Semibold" />
<Setter Target="SenderTextFromAddress.FontWeight" Value="Semibold" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="Read" /> <VisualState x:Name="Read" />

5
Wino.Mail/Helpers/XamlHelpers.cs
View File

@@ -44,9 +44,8 @@ namespace Wino.Helpers
public static Visibility IsSelectionModeMultiple(ListViewSelectionMode mode) => mode == ListViewSelectionMode.Multiple ? Visibility.Visible : Visibility.Collapsed; public static Visibility IsSelectionModeMultiple(ListViewSelectionMode mode) => mode == ListViewSelectionMode.Multiple ? Visibility.Visible : Visibility.Collapsed;
public static FontWeight GetFontWeightBySyncState(bool isSyncing) => isSyncing ? FontWeights.SemiBold : FontWeights.Normal; public static FontWeight GetFontWeightBySyncState(bool isSyncing) => isSyncing ? FontWeights.SemiBold : FontWeights.Normal;
public static FontWeight GetFontWeightByChildSelectedState(bool isChildSelected) => isChildSelected ? FontWeights.SemiBold : FontWeights.Normal; public static FontWeight GetFontWeightByChildSelectedState(bool isChildSelected) => isChildSelected ? FontWeights.SemiBold : FontWeights.Normal;
public static Geometry GetPathIcon(string resourceName) => GetPathGeometry(Application.Current.Resources[$"{resourceName}"] as string); public static Visibility StringToVisibilityConverter(string value) => string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible;
public static GridLength GetGridLength(double width) => new GridLength(width, GridUnitType.Pixel); public static Visibility StringToVisibilityReversedConverter(string value) => string.IsNullOrWhiteSpace(value) ? Visibility.Visible : Visibility.Collapsed;
public static double MailListAdaptivityConverter(double mailListPaneLength) => mailListPaneLength + 300d;
public static string GetMailItemDisplaySummaryForListing(bool isDraft, DateTime receivedDate, bool prefer24HourTime) public static string GetMailItemDisplaySummaryForListing(bool isDraft, DateTime receivedDate, bool prefer24HourTime)
{ {
if (isDraft) if (isDraft)

13
Wino.Mail/Views/MailRenderingPage.xaml
View File

@@ -208,10 +208,15 @@
Command="{Binding ElementName=root, Path=ViewModel.CopyClipboardCommand}" Command="{Binding ElementName=root, Path=ViewModel.CopyClipboardCommand}"
CommandParameter="{x:Bind ViewModel.FromAddress, Mode=OneWay}" CommandParameter="{x:Bind ViewModel.FromAddress, Mode=OneWay}"
FontWeight="SemiBold"> FontWeight="SemiBold">
<TextBlock> <Grid>
<Run Text="{x:Bind ViewModel.FromName, Mode=OneWay}" /> <TextBlock Visibility="{x:Bind helpers:XamlHelpers.StringToVisibilityConverter(ViewModel.FromName), Mode=OneWay}">
<Run Text="&lt;" /><Run Text="{x:Bind ViewModel.FromAddress, Mode=OneWay}" /><Run Text="&gt;" /> <Run Text="{x:Bind ViewModel.FromName, Mode=OneWay}" />
</TextBlock> <Run Text="&lt;" /><Run Text="{x:Bind ViewModel.FromAddress, Mode=OneWay}" /><Run Text="&gt;" />
</TextBlock>
<TextBlock Visibility="{x:Bind helpers:XamlHelpers.StringToVisibilityReversedConverter(ViewModel.FromName), Mode=OneWay}">
<Run Text="{x:Bind ViewModel.FromAddress, Mode=OneWay}" />
</TextBlock>
</Grid>
</HyperlinkButton> </HyperlinkButton>
<TextBlock FontSize="12" Text="{x:Bind helpers:XamlHelpers.GetCreationDateString(ViewModel.CreationDate, ViewModel.PreferencesService.Prefer24HourTimeFormat), Mode=OneWay}" /> <TextBlock FontSize="12" Text="{x:Bind helpers:XamlHelpers.GetCreationDateString(ViewModel.CreationDate, ViewModel.PreferencesService.Prefer24HourTimeFormat), Mode=OneWay}" />
</StackPanel> </StackPanel>