From 89ea2b23a234e12eb8d883c6ad896ef5e98a7584 Mon Sep 17 00:00:00 2001 From: Victor Date: Sun, 15 Jun 2025 06:27:39 -0700 Subject: [PATCH] Replaced "Dismiss" button in notification popup with "Archive" button (#664) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * replaced "Dismiss" button in notification popup with "Archive" button fixes https://github.com/bkaankose/Wino-Mail/issues/40 * Fixed incorrect build action for the archive icon. --------- Co-authored-by: Burak Kaan Köse --- Wino.Core.UWP/Services/NotificationBuilder.cs | 14 +++++++++++--- Wino.Mail/Assets/NotificationIcons/archive.png | Bin 0 -> 12379 bytes Wino.Mail/Wino.Mail.csproj | 2 ++ 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 Wino.Mail/Assets/NotificationIcons/archive.png diff --git a/Wino.Core.UWP/Services/NotificationBuilder.cs b/Wino.Core.UWP/Services/NotificationBuilder.cs index 3cf76547..3504869e 100644 --- a/Wino.Core.UWP/Services/NotificationBuilder.cs +++ b/Wino.Core.UWP/Services/NotificationBuilder.cs @@ -114,9 +114,9 @@ public class NotificationBuilder : INotificationBuilder builder.AddArgument(Constants.ToastMailUniqueIdKey, mailItem.UniqueId.ToString()); builder.AddArgument(Constants.ToastActionKey, MailOperation.Navigate); - builder.AddButton(GetMarkedAsRead(mailItem.UniqueId)); + builder.AddButton(GetMarkAsReadButton(mailItem.UniqueId)); builder.AddButton(GetDeleteButton(mailItem.UniqueId)); - builder.AddButton(GetDismissButton()); + builder.AddButton(GetArchiveButton(mailItem.UniqueId)); builder.AddAudio(new ToastAudio() { Src = new Uri("ms-winsoundevent:Notification.Mail") @@ -139,6 +139,14 @@ public class NotificationBuilder : INotificationBuilder .SetDismissActivation() .SetImageUri(new Uri("ms-appx:///Assets/NotificationIcons/dismiss.png")); + private static ToastButton GetArchiveButton(Guid mailUniqueId) + => new ToastButton() + .SetContent(Translator.MailOperation_Archive) + .SetImageUri(new Uri("ms-appx:///Assets/NotificationIcons/archive.png")) + .AddArgument(Constants.ToastMailUniqueIdKey, mailUniqueId.ToString()) + .AddArgument(Constants.ToastActionKey, MailOperation.Archive) + .SetBackgroundActivation(); + private ToastButton GetDeleteButton(Guid mailUniqueId) => new ToastButton() .SetContent(Translator.MailOperation_Delete) @@ -147,7 +155,7 @@ public class NotificationBuilder : INotificationBuilder .AddArgument(Constants.ToastActionKey, MailOperation.SoftDelete) .SetBackgroundActivation(); - private ToastButton GetMarkedAsRead(Guid mailUniqueId) + private static ToastButton GetMarkAsReadButton(Guid mailUniqueId) => new ToastButton() .SetContent(Translator.MailOperation_MarkAsRead) .SetImageUri(new System.Uri("ms-appx:///Assets/NotificationIcons/markread.png")) diff --git a/Wino.Mail/Assets/NotificationIcons/archive.png b/Wino.Mail/Assets/NotificationIcons/archive.png new file mode 100644 index 0000000000000000000000000000000000000000..40dc3dd1e04fb08ad84a9911276f354c68e775d5 GIT binary patch literal 12379 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 W9=Mp;59o!HiS{ + @@ -51,6 +52,7 @@ +