From 7893777ab30113e86959a26f72aa3a412c205884 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Sat, 14 Nov 2026 22:44:23 +0000 Subject: [PATCH] Replace status bar with global notifications Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- CHANGELOG.md | 4 +- .../Helpers/ServiceCollectionHelpers.cs | 1 + .../PostIt/Services/NotificationService.cs | 25 +++ .../Layout/ActionStatusViewModelExtensions.cs | 17 +- .../PostIt/ViewModels/Settings/Settings.cs | 2 + src/PostIt/PostIt/ViewModels/StatusNotice.cs | 9 +- .../Views/ACL/AddCircleMemberDialog.axaml | 3 +- src/PostIt/PostIt/Views/ACL/CirclesPage.axaml | 3 +- .../PostIt/Views/ACL/PostAclDialog.axaml | 3 +- .../Views/Activity/ActivitiesPage.axaml | 3 +- .../Views/Activity/BillingQueriesPage.axaml | 3 +- .../Activity/BillingQueryDetailsPage.axaml | 3 +- .../Views/Activity/CommandFormsPage.axaml | 3 +- .../Views/Activity/EstimateEditionPage.axaml | 3 +- .../Views/Activity/EstimateListPage.axaml | 3 +- .../Activity/EstimateValidationPage.axaml | 2 +- .../ProviderOngoingRequestsPage.axaml | 3 +- src/PostIt/PostIt/Views/Blogs/BlogsPage.axaml | 5 +- .../PostIt/Views/Blogs/BlogsPage.axaml.cs | 2 - src/PostIt/PostIt/Views/Chat/ChatPage.axaml | 5 +- .../PostIt/Views/Commands/BrushPage.axaml | 3 +- .../PostIt/Views/Commands/RdvPage.axaml | 6 +- src/PostIt/PostIt/Views/Layout/MainView.axaml | 62 ++++++ .../PostIt/Views/Layout/MainView.axaml.cs | 178 +++++++++++++++++- .../PostIt/Views/Layout/SettingsPage.axaml | 2 - .../PostIt/Views/MyFiles/MyFilesPage.axaml | 3 +- .../Views/Signature/SignaturePage.axaml | 5 +- 27 files changed, 297 insertions(+), 64 deletions(-) create mode 100644 src/PostIt/PostIt/Services/NotificationService.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f44fb990..957f8b11b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,12 @@ # Changelog -## [1.0.8-rc38] - unstable +## [1.0.8-rc37] - unstable ### Added +* [PostIt] Replace the persistent status bar with a global notification service using ephemeral toasts for info/success and dismissible modal alerts for warnings/errors. + * [PostIt/Administration] Rechercher les utilisateurs côté serveur par login ou nom, par pages de 25 résultats maximum avec navigation précédente/suivante. * [PostIt] Telemetry diff --git a/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs b/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs index 0a4855b1d..4b39705b3 100644 --- a/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs +++ b/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs @@ -55,6 +55,7 @@ public static class ServiceCollectionHelpers services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(NotificationService.Instance); // Android activities need fresh controls; retain state in singleton VMs. void AddReusablePage() where TPage : class diff --git a/src/PostIt/PostIt/Services/NotificationService.cs b/src/PostIt/PostIt/Services/NotificationService.cs new file mode 100644 index 000000000..a3863d7c2 --- /dev/null +++ b/src/PostIt/PostIt/Services/NotificationService.cs @@ -0,0 +1,25 @@ +using System; +using PostIt.Models; + +namespace PostIt.Services; + +public sealed class NotificationService +{ + public static NotificationService Instance { get; } = new(); + + public event EventHandler? NotificationRequested; + + private NotificationService() + { + } + + public void Show(string message, StatusSeverity severity = StatusSeverity.Info, string? actionLabel = null, Action? action = null) + => NotificationRequested?.Invoke(this, new NotificationRequest(message, severity, actionLabel, action)); + + public void Hide() + { + NotificationRequested?.Invoke(this, new NotificationRequest(string.Empty, StatusSeverity.Info)); + } +} + +public sealed record NotificationRequest(string Message, StatusSeverity Severity, string? ActionLabel = null, Action? Action = null); diff --git a/src/PostIt/PostIt/ViewModels/Layout/ActionStatusViewModelExtensions.cs b/src/PostIt/PostIt/ViewModels/Layout/ActionStatusViewModelExtensions.cs index 9fe286ac0..11733a9b9 100644 --- a/src/PostIt/PostIt/ViewModels/Layout/ActionStatusViewModelExtensions.cs +++ b/src/PostIt/PostIt/ViewModels/Layout/ActionStatusViewModelExtensions.cs @@ -1,4 +1,6 @@ +using Microsoft.Extensions.DependencyInjection; using PostIt.Models; +using PostIt.Services; namespace PostIt.ViewModels; @@ -22,13 +24,22 @@ public static class ActionStatusViewModelExtensions public static void SetStatus(this IActionStatusViewModel viewModel, string message, StatusSeverity severity) { var normalizedMessage = string.IsNullOrWhiteSpace(message) ? "Pret." : message.Trim(); - - viewModel.StatusMessage = normalizedMessage; - viewModel.ActionStatus = severity switch + var statusNotice = severity switch { StatusSeverity.Error => StatusNotice.Error(normalizedMessage), StatusSeverity.Warning => StatusNotice.Warning(normalizedMessage), _ => StatusNotice.Info(normalizedMessage), }; + + viewModel.StatusMessage = normalizedMessage; + viewModel.ActionStatus = statusNotice; + + if (App.Current is App app && app.ServiceProvider is { } serviceProvider) + { + var settings = serviceProvider.GetRequiredService(); + settings.SetActionStatus(normalizedMessage, severity); + var notificationService = serviceProvider.GetRequiredService(); + notificationService.Show(normalizedMessage, severity); + } } } diff --git a/src/PostIt/PostIt/ViewModels/Settings/Settings.cs b/src/PostIt/PostIt/ViewModels/Settings/Settings.cs index 3ad9ddf46..81fd979bb 100644 --- a/src/PostIt/PostIt/ViewModels/Settings/Settings.cs +++ b/src/PostIt/PostIt/ViewModels/Settings/Settings.cs @@ -9,6 +9,8 @@ using System.Net.Http; using System.Text.Json; using System.Text.Json.Serialization; using System.Globalization; +using System.Threading; +using System.Threading.Tasks; using PostIt.Models; using PostIt.Services; diff --git a/src/PostIt/PostIt/ViewModels/StatusNotice.cs b/src/PostIt/PostIt/ViewModels/StatusNotice.cs index 404287dbe..152215687 100644 --- a/src/PostIt/PostIt/ViewModels/StatusNotice.cs +++ b/src/PostIt/PostIt/ViewModels/StatusNotice.cs @@ -11,11 +11,10 @@ public sealed class StatusNotice public string Background { get; } public string BorderBrush { get; } public string Foreground { get; } - - public bool HasCheckCommand { get => CheckCommand != null; } - + public bool HasCheckCommand => CheckCommand is not null; + public bool IsTransient => Severity == StatusSeverity.Info && CheckCommand is null; + public bool IsModal => !IsTransient; public ICommand? CheckCommand { get; } - public string CheckCommandLabel { get; } public StatusNotice(string message, StatusSeverity severity, ICommand? checkCommand) @@ -27,7 +26,7 @@ public sealed class StatusNotice { StatusSeverity.Error => ("!", "#7F1D1D", "#C62828", "#e1f0f6"), StatusSeverity.Warning => ("~", "#7C4A03", "#E6A700", "#eaeaea"), - _ => ("i", "#E8F0FE", "#5B8DEF", "#1E3A8A"), + _ => ("✓", "#E8F0FE", "#5B8DEF", "#1E3A8A"), }; CheckCommand = checkCommand; CheckCommandLabel = HasCheckCommand ? diff --git a/src/PostIt/PostIt/Views/ACL/AddCircleMemberDialog.axaml b/src/PostIt/PostIt/Views/ACL/AddCircleMemberDialog.axaml index a17f8574e..b2001917e 100644 --- a/src/PostIt/PostIt/Views/ACL/AddCircleMemberDialog.axaml +++ b/src/PostIt/PostIt/Views/ACL/AddCircleMemberDialog.axaml @@ -48,8 +48,7 @@ - +