From d43e2b269a2215f281cf5b8ced0777abf93aacf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Burak=20Kaan=20K=C3=B6se?= Date: Sun, 8 Mar 2026 16:26:06 +0100 Subject: [PATCH] Fix tailored notification images issue. --- .../profile.png} | Bin .../scale-100/calendar-join.png} | Bin .../scale-100/calendar-snooze.png} | Bin .../scale-100/dismiss.png} | Bin .../scale-100/mail-archive.png} | Bin .../scale-100/mail-delete.png} | Bin .../scale-100/mail-markread.png} | Bin .../scale-125/calendar-join.png} | Bin .../scale-125/calendar-snooze.png} | Bin .../scale-125/dismiss.png} | Bin .../scale-125/mail-archive.png} | Bin .../scale-125/mail-delete.png} | Bin .../scale-125/mail-markread.png} | Bin .../scale-150/calendar-join.png} | Bin .../scale-150/calendar-snooze.png} | Bin .../scale-150/dismiss.png} | Bin .../scale-150/mail-archive.png} | Bin .../scale-150/mail-delete.png} | Bin .../scale-150/mail-markread.png} | Bin .../scale-200/calendar-join.png} | Bin .../scale-200/calendar-snooze.png} | Bin .../scale-200/dismiss.png} | Bin .../scale-200/mail-archive.png} | Bin .../scale-200/mail-delete.png} | Bin .../scale-200/mail-markread.png} | Bin .../scale-400/calendar-join.png} | Bin .../scale-400/calendar-snooze.png} | Bin .../scale-400/dismiss.png} | Bin .../scale-400/mail-archive.png} | Bin .../scale-400/mail-delete.png} | Bin .../scale-400/mail-markread.png} | Bin .../profile.png} | Bin .../scale-100/calendar-join.png} | Bin .../scale-100/calendar-snooze.png} | Bin .../scale-100/dismiss.png} | Bin .../scale-100/mail-archive.png} | Bin .../scale-100/mail-delete.png} | Bin .../scale-100/mail-markread.png} | Bin .../scale-125/calendar-join.png} | Bin .../scale-125/calendar-snooze.png} | Bin .../scale-125/dismiss.png} | Bin .../scale-125/mail-archive.png} | Bin .../scale-125/mail-delete.png} | Bin .../scale-125/mail-markread.png} | Bin .../scale-150/calendar-join.png} | Bin .../scale-150/calendar-snooze.png} | Bin .../scale-150/dismiss.png} | Bin .../scale-150/mail-archive.png} | Bin .../scale-150/mail-delete.png} | Bin .../scale-150/mail-markread.png} | Bin .../scale-200/calendar-join.png} | Bin .../scale-200/calendar-snooze.png} | Bin .../scale-200/dismiss.png} | Bin .../scale-200/mail-archive.png} | Bin .../scale-200/mail-delete.png} | Bin .../scale-200/mail-markread.png} | Bin .../scale-400/calendar-join.png} | Bin .../scale-400/calendar-snooze.png} | Bin .../scale-400/dismiss.png} | Bin .../scale-400/mail-archive.png} | Bin .../scale-400/mail-delete.png} | Bin .../scale-400/mail-markread.png} | Bin .../Services/NotificationBuilder.cs | 26 +------- Wino.Mail.WinUI/Wino.Mail.WinUI.csproj | 60 ------------------ 64 files changed, 3 insertions(+), 83 deletions(-) rename Wino.Mail.WinUI/Assets/NotificationIcons/{profile-dark.png => theme-dark/profile.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{calendar-join.theme-dark.scale-100.png => theme-dark/scale-100/calendar-join.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{calendar-snooze.theme-dark.scale-100.png => theme-dark/scale-100/calendar-snooze.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{dismiss.theme-dark.scale-100.png => theme-dark/scale-100/dismiss.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-archive.theme-dark.scale-100.png => theme-dark/scale-100/mail-archive.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-delete.theme-dark.scale-100.png => theme-dark/scale-100/mail-delete.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-markread.theme-dark.scale-100.png => theme-dark/scale-100/mail-markread.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{calendar-join.theme-dark.scale-125.png => theme-dark/scale-125/calendar-join.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{calendar-snooze.theme-dark.scale-125.png => theme-dark/scale-125/calendar-snooze.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{dismiss.theme-dark.scale-125.png => theme-dark/scale-125/dismiss.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-archive.theme-dark.scale-125.png => theme-dark/scale-125/mail-archive.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-delete.theme-dark.scale-125.png => theme-dark/scale-125/mail-delete.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-markread.theme-dark.scale-125.png => theme-dark/scale-125/mail-markread.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{calendar-join.theme-dark.scale-150.png => theme-dark/scale-150/calendar-join.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{calendar-snooze.theme-dark.scale-150.png => theme-dark/scale-150/calendar-snooze.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{dismiss.theme-dark.scale-150.png => theme-dark/scale-150/dismiss.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-archive.theme-dark.scale-150.png => theme-dark/scale-150/mail-archive.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-delete.theme-dark.scale-150.png => theme-dark/scale-150/mail-delete.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-markread.theme-dark.scale-150.png => theme-dark/scale-150/mail-markread.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{calendar-join.theme-dark.scale-200.png => theme-dark/scale-200/calendar-join.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{calendar-snooze.theme-dark.scale-200.png => theme-dark/scale-200/calendar-snooze.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{dismiss.theme-dark.scale-200.png => theme-dark/scale-200/dismiss.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-archive.theme-dark.scale-200.png => theme-dark/scale-200/mail-archive.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-delete.theme-dark.scale-200.png => theme-dark/scale-200/mail-delete.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-markread.theme-dark.scale-200.png => theme-dark/scale-200/mail-markread.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{calendar-join.theme-dark.scale-400.png => theme-dark/scale-400/calendar-join.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{calendar-snooze.theme-dark.scale-400.png => theme-dark/scale-400/calendar-snooze.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{dismiss.theme-dark.scale-400.png => theme-dark/scale-400/dismiss.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-archive.theme-dark.scale-400.png => theme-dark/scale-400/mail-archive.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-delete.theme-dark.scale-400.png => theme-dark/scale-400/mail-delete.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-markread.theme-dark.scale-400.png => theme-dark/scale-400/mail-markread.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{profile-light.png => theme-light/profile.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{calendar-join.theme-light.scale-100.png => theme-light/scale-100/calendar-join.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{calendar-snooze.theme-light.scale-100.png => theme-light/scale-100/calendar-snooze.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{dismiss.theme-light.scale-100.png => theme-light/scale-100/dismiss.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-archive.theme-light.scale-100.png => theme-light/scale-100/mail-archive.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-delete.theme-light.scale-100.png => theme-light/scale-100/mail-delete.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-markread.theme-light.scale-100.png => theme-light/scale-100/mail-markread.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{calendar-join.theme-light.scale-125.png => theme-light/scale-125/calendar-join.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{calendar-snooze.theme-light.scale-125.png => theme-light/scale-125/calendar-snooze.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{dismiss.theme-light.scale-125.png => theme-light/scale-125/dismiss.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-archive.theme-light.scale-125.png => theme-light/scale-125/mail-archive.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-delete.theme-light.scale-125.png => theme-light/scale-125/mail-delete.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-markread.theme-light.scale-125.png => theme-light/scale-125/mail-markread.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{calendar-join.theme-light.scale-150.png => theme-light/scale-150/calendar-join.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{calendar-snooze.theme-light.scale-150.png => theme-light/scale-150/calendar-snooze.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{dismiss.theme-light.scale-150.png => theme-light/scale-150/dismiss.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-archive.theme-light.scale-150.png => theme-light/scale-150/mail-archive.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-delete.theme-light.scale-150.png => theme-light/scale-150/mail-delete.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-markread.theme-light.scale-150.png => theme-light/scale-150/mail-markread.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{calendar-join.theme-light.scale-200.png => theme-light/scale-200/calendar-join.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{calendar-snooze.theme-light.scale-200.png => theme-light/scale-200/calendar-snooze.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{dismiss.theme-light.scale-200.png => theme-light/scale-200/dismiss.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-archive.theme-light.scale-200.png => theme-light/scale-200/mail-archive.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-delete.theme-light.scale-200.png => theme-light/scale-200/mail-delete.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-markread.theme-light.scale-200.png => theme-light/scale-200/mail-markread.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{calendar-join.theme-light.scale-400.png => theme-light/scale-400/calendar-join.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{calendar-snooze.theme-light.scale-400.png => theme-light/scale-400/calendar-snooze.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{dismiss.theme-light.scale-400.png => theme-light/scale-400/dismiss.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-archive.theme-light.scale-400.png => theme-light/scale-400/mail-archive.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-delete.theme-light.scale-400.png => theme-light/scale-400/mail-delete.png} (100%) rename Wino.Mail.WinUI/Assets/NotificationIcons/{mail-markread.theme-light.scale-400.png => theme-light/scale-400/mail-markread.png} (100%) diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/profile-dark.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/profile.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/profile-dark.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/profile.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/calendar-join.theme-dark.scale-100.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/calendar-join.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/calendar-join.theme-dark.scale-100.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/calendar-join.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/calendar-snooze.theme-dark.scale-100.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/calendar-snooze.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/calendar-snooze.theme-dark.scale-100.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/calendar-snooze.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/dismiss.theme-dark.scale-100.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/dismiss.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/dismiss.theme-dark.scale-100.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/dismiss.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-archive.theme-dark.scale-100.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/mail-archive.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-archive.theme-dark.scale-100.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/mail-archive.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-delete.theme-dark.scale-100.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/mail-delete.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-delete.theme-dark.scale-100.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/mail-delete.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-markread.theme-dark.scale-100.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/mail-markread.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-markread.theme-dark.scale-100.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/mail-markread.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/calendar-join.theme-dark.scale-125.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/calendar-join.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/calendar-join.theme-dark.scale-125.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/calendar-join.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/calendar-snooze.theme-dark.scale-125.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/calendar-snooze.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/calendar-snooze.theme-dark.scale-125.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/calendar-snooze.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/dismiss.theme-dark.scale-125.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/dismiss.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/dismiss.theme-dark.scale-125.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/dismiss.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-archive.theme-dark.scale-125.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/mail-archive.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-archive.theme-dark.scale-125.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/mail-archive.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-delete.theme-dark.scale-125.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/mail-delete.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-delete.theme-dark.scale-125.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/mail-delete.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-markread.theme-dark.scale-125.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/mail-markread.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-markread.theme-dark.scale-125.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/mail-markread.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/calendar-join.theme-dark.scale-150.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/calendar-join.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/calendar-join.theme-dark.scale-150.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/calendar-join.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/calendar-snooze.theme-dark.scale-150.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/calendar-snooze.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/calendar-snooze.theme-dark.scale-150.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/calendar-snooze.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/dismiss.theme-dark.scale-150.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/dismiss.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/dismiss.theme-dark.scale-150.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/dismiss.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-archive.theme-dark.scale-150.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/mail-archive.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-archive.theme-dark.scale-150.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/mail-archive.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-delete.theme-dark.scale-150.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/mail-delete.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-delete.theme-dark.scale-150.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/mail-delete.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-markread.theme-dark.scale-150.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/mail-markread.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-markread.theme-dark.scale-150.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/mail-markread.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/calendar-join.theme-dark.scale-200.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/calendar-join.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/calendar-join.theme-dark.scale-200.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/calendar-join.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/calendar-snooze.theme-dark.scale-200.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/calendar-snooze.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/calendar-snooze.theme-dark.scale-200.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/calendar-snooze.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/dismiss.theme-dark.scale-200.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/dismiss.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/dismiss.theme-dark.scale-200.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/dismiss.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-archive.theme-dark.scale-200.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/mail-archive.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-archive.theme-dark.scale-200.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/mail-archive.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-delete.theme-dark.scale-200.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/mail-delete.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-delete.theme-dark.scale-200.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/mail-delete.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-markread.theme-dark.scale-200.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/mail-markread.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-markread.theme-dark.scale-200.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/mail-markread.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/calendar-join.theme-dark.scale-400.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/calendar-join.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/calendar-join.theme-dark.scale-400.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/calendar-join.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/calendar-snooze.theme-dark.scale-400.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/calendar-snooze.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/calendar-snooze.theme-dark.scale-400.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/calendar-snooze.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/dismiss.theme-dark.scale-400.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/dismiss.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/dismiss.theme-dark.scale-400.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/dismiss.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-archive.theme-dark.scale-400.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/mail-archive.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-archive.theme-dark.scale-400.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/mail-archive.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-delete.theme-dark.scale-400.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/mail-delete.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-delete.theme-dark.scale-400.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/mail-delete.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-markread.theme-dark.scale-400.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/mail-markread.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-markread.theme-dark.scale-400.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/mail-markread.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/profile-light.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/profile.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/profile-light.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/profile.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/calendar-join.theme-light.scale-100.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/calendar-join.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/calendar-join.theme-light.scale-100.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/calendar-join.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/calendar-snooze.theme-light.scale-100.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/calendar-snooze.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/calendar-snooze.theme-light.scale-100.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/calendar-snooze.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/dismiss.theme-light.scale-100.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/dismiss.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/dismiss.theme-light.scale-100.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/dismiss.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-archive.theme-light.scale-100.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/mail-archive.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-archive.theme-light.scale-100.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/mail-archive.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-delete.theme-light.scale-100.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/mail-delete.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-delete.theme-light.scale-100.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/mail-delete.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-markread.theme-light.scale-100.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/mail-markread.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-markread.theme-light.scale-100.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/mail-markread.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/calendar-join.theme-light.scale-125.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/calendar-join.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/calendar-join.theme-light.scale-125.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/calendar-join.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/calendar-snooze.theme-light.scale-125.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/calendar-snooze.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/calendar-snooze.theme-light.scale-125.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/calendar-snooze.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/dismiss.theme-light.scale-125.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/dismiss.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/dismiss.theme-light.scale-125.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/dismiss.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-archive.theme-light.scale-125.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/mail-archive.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-archive.theme-light.scale-125.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/mail-archive.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-delete.theme-light.scale-125.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/mail-delete.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-delete.theme-light.scale-125.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/mail-delete.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-markread.theme-light.scale-125.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/mail-markread.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-markread.theme-light.scale-125.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/mail-markread.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/calendar-join.theme-light.scale-150.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/calendar-join.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/calendar-join.theme-light.scale-150.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/calendar-join.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/calendar-snooze.theme-light.scale-150.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/calendar-snooze.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/calendar-snooze.theme-light.scale-150.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/calendar-snooze.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/dismiss.theme-light.scale-150.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/dismiss.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/dismiss.theme-light.scale-150.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/dismiss.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-archive.theme-light.scale-150.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/mail-archive.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-archive.theme-light.scale-150.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/mail-archive.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-delete.theme-light.scale-150.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/mail-delete.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-delete.theme-light.scale-150.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/mail-delete.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-markread.theme-light.scale-150.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/mail-markread.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-markread.theme-light.scale-150.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/mail-markread.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/calendar-join.theme-light.scale-200.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/calendar-join.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/calendar-join.theme-light.scale-200.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/calendar-join.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/calendar-snooze.theme-light.scale-200.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/calendar-snooze.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/calendar-snooze.theme-light.scale-200.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/calendar-snooze.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/dismiss.theme-light.scale-200.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/dismiss.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/dismiss.theme-light.scale-200.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/dismiss.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-archive.theme-light.scale-200.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/mail-archive.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-archive.theme-light.scale-200.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/mail-archive.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-delete.theme-light.scale-200.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/mail-delete.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-delete.theme-light.scale-200.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/mail-delete.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-markread.theme-light.scale-200.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/mail-markread.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-markread.theme-light.scale-200.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/mail-markread.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/calendar-join.theme-light.scale-400.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/calendar-join.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/calendar-join.theme-light.scale-400.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/calendar-join.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/calendar-snooze.theme-light.scale-400.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/calendar-snooze.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/calendar-snooze.theme-light.scale-400.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/calendar-snooze.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/dismiss.theme-light.scale-400.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/dismiss.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/dismiss.theme-light.scale-400.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/dismiss.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-archive.theme-light.scale-400.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/mail-archive.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-archive.theme-light.scale-400.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/mail-archive.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-delete.theme-light.scale-400.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/mail-delete.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-delete.theme-light.scale-400.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/mail-delete.png diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/mail-markread.theme-light.scale-400.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/mail-markread.png similarity index 100% rename from Wino.Mail.WinUI/Assets/NotificationIcons/mail-markread.theme-light.scale-400.png rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/mail-markread.png diff --git a/Wino.Mail.WinUI/Services/NotificationBuilder.cs b/Wino.Mail.WinUI/Services/NotificationBuilder.cs index 8651b4d5..b30b6d12 100644 --- a/Wino.Mail.WinUI/Services/NotificationBuilder.cs +++ b/Wino.Mail.WinUI/Services/NotificationBuilder.cs @@ -5,7 +5,6 @@ using System.Linq; using System.Threading.Tasks; using CommunityToolkit.Mvvm.Messaging; using Microsoft.Toolkit.Uwp.Notifications; -using Microsoft.UI.Xaml; using Serilog; using Windows.Data.Xml.Dom; using Windows.UI.Notifications; @@ -24,28 +23,24 @@ public class NotificationBuilder : INotificationBuilder { private const string MailApplicationId = "App"; private const string NotificationIconRootUri = "ms-appx:///Assets/NotificationIcons/"; - private static readonly int[] SupportedIconScales = [100, 125, 150, 200, 400]; private readonly IAccountService _accountService; private readonly IFolderService _folderService; private readonly IMailService _mailService; private readonly IThumbnailService _thumbnailService; private readonly IPreferencesService _preferencesService; - private readonly IUnderlyingThemeService _underlyingThemeService; public NotificationBuilder(IAccountService accountService, IFolderService folderService, IMailService mailService, IThumbnailService thumbnailService, - IPreferencesService preferencesService, - IUnderlyingThemeService underlyingThemeService) + IPreferencesService preferencesService) { _accountService = accountService; _folderService = folderService; _mailService = mailService; _thumbnailService = thumbnailService; _preferencesService = preferencesService; - _underlyingThemeService = underlyingThemeService; WeakReferenceMessenger.Default.Register(this, (r, msg) => { @@ -431,23 +426,8 @@ public class NotificationBuilder : INotificationBuilder private Uri GetNotificationIconUri(string iconName) { - var theme = _underlyingThemeService.IsUnderlyingThemeDark() ? "dark" : "light"; - var scale = GetClosestAvailableScale(); - return new($"{NotificationIconRootUri}{iconName}.theme-{theme}.scale-{scale}.png"); - } - - private static int GetClosestAvailableScale() - { - var rasterScale = 1.0; - - if (WinoApplication.MainWindow?.Content is FrameworkElement rootElement && - rootElement.XamlRoot != null) - { - rasterScale = rootElement.XamlRoot.RasterizationScale; - } - - var requestedScale = (int)Math.Round(rasterScale * 100); - return SupportedIconScales.OrderBy(s => Math.Abs(s - requestedScale)).First(); + // Keep the URI unqualified so Windows resolves the best matching theme/scale asset from the package. + return new($"{NotificationIconRootUri}{iconName}.png"); } } diff --git a/Wino.Mail.WinUI/Wino.Mail.WinUI.csproj b/Wino.Mail.WinUI/Wino.Mail.WinUI.csproj index 3bb0c0bc..9eca0c61 100644 --- a/Wino.Mail.WinUI/Wino.Mail.WinUI.csproj +++ b/Wino.Mail.WinUI/Wino.Mail.WinUI.csproj @@ -99,66 +99,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -