From dc7bc7e35dab6ee44c57ea54ffca4eec1039a90b Mon Sep 17 00:00:00 2001 From: qhy040404 Date: Mon, 8 Apr 2024 10:07:07 +0800 Subject: [PATCH] fix compile error --- .../Notification/InfoBarOptionsBuilderExtension.cs | 8 ++++++++ .../Service/Notification/InfoBarServiceExtension.cs | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Notification/InfoBarOptionsBuilderExtension.cs b/src/Snap.Hutao/Snap.Hutao/Service/Notification/InfoBarOptionsBuilderExtension.cs index 10f13fc1..5e24dfbd 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Notification/InfoBarOptionsBuilderExtension.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Notification/InfoBarOptionsBuilderExtension.cs @@ -47,6 +47,14 @@ internal static class InfoBarOptionsBuilderExtension return builder; } + public static IInfoBarOptionsBuilder SetActionButton(this TBuilder builder, Action configureButton) + where TBuilder : IInfoBarOptionsBuilder + { + ButtonBuilder buttonBaseBuilder = new ButtonBuilder().Configure(configureButton); + builder.Configure(builder => builder.Options.ActionButton = buttonBaseBuilder.Button); + return builder; + } + public static IInfoBarOptionsBuilder SetDelay(this TBuilder builder, int milliSeconds) where TBuilder : IInfoBarOptionsBuilder { diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Notification/InfoBarServiceExtension.cs b/src/Snap.Hutao/Snap.Hutao/Service/Notification/InfoBarServiceExtension.cs index e3422fbd..659a76bd 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Notification/InfoBarServiceExtension.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Notification/InfoBarServiceExtension.cs @@ -2,6 +2,7 @@ // Licensed under the MIT license. using Microsoft.UI.Xaml.Controls; +using Snap.Hutao.Control.Builder.ButtonBase; using Snap.Hutao.Core.Abstraction.Extension; namespace Snap.Hutao.Service.Notification; @@ -20,7 +21,7 @@ internal static class InfoBarServiceExtension public static void Information(this IInfoBarService infoBarService, string title, string message, string buttonContent, ICommand buttonCommand, int milliSeconds = 5000) { - infoBarService.Information(builder => builder.SetTitle(title).SetMessage(message).SetActionButton(buttonBuilder => buttonBuilder.SetContent(buttonContent).SetCommand(buttonCommand)).SetDelay(delay)); + infoBarService.Information(builder => builder.SetTitle(title).SetMessage(message).SetActionButton(buttonBuilder => buttonBuilder.SetContent(buttonContent).SetCommand(buttonCommand)).SetDelay(milliSeconds)); } public static void Information(this IInfoBarService infoBarService, Action configure) @@ -55,7 +56,7 @@ internal static class InfoBarServiceExtension public static void Warning(this IInfoBarService infoBarService, string title, string message, string buttonContent, ICommand buttonCommand, int milliSeconds = 30000) { - infoBarService.Warning(builder => builder.SetTitle(title).SetMessage(message).SetActionButton(buttonBuilder => buttonBuilder.SetContent(buttonContent).SetCommand(buttonCommand)).SetDelay(delay)); + infoBarService.Warning(builder => builder.SetTitle(title).SetMessage(message).SetActionButton(buttonBuilder => buttonBuilder.SetContent(buttonContent).SetCommand(buttonCommand)).SetDelay(milliSeconds)); } public static void Warning(this IInfoBarService infoBarService, Action configure) @@ -75,7 +76,7 @@ internal static class InfoBarServiceExtension public static void Error(this IInfoBarService infoBarService, string title, string message, string buttonContent, ICommand buttonCommand, int milliSeconds = 0) { - infoBarService.Error(builder => builder.SetTitle(title).SetMessage(message).SetActionButton(buttonBuilder => buttonBuilder.SetContent(buttonContent).SetCommand(buttonCommand)).SetDelay(delay)); + infoBarService.Error(builder => builder.SetTitle(title).SetMessage(message).SetActionButton(buttonBuilder => buttonBuilder.SetContent(buttonContent).SetCommand(buttonCommand)).SetDelay(milliSeconds)); } public static void Error(this IInfoBarService infoBarService, Exception ex, int milliSeconds = 0)