From c52db5ca10fc5eadd5556490dc195476353d26bd Mon Sep 17 00:00:00 2001
From: TheXamlGuy <dan_clark@outlook.com>
Date: Sat, 15 Jun 2024 20:27:46 +0100
Subject: [PATCH] Amend IPrimaryConfirmation

---
 Toolkit.Avalonia/ContentDialogHandler.cs   | 13 +------------
 Toolkit.Foundation/IConfirmation.cs        |  6 ++++++
 Toolkit.Foundation/IPrimaryConfirmation.cs |  7 +------
 3 files changed, 8 insertions(+), 18 deletions(-)
 create mode 100644 Toolkit.Foundation/IConfirmation.cs

diff --git a/Toolkit.Avalonia/ContentDialogHandler.cs b/Toolkit.Avalonia/ContentDialogHandler.cs
index 4ab92e0..5c6a1a6 100644
--- a/Toolkit.Avalonia/ContentDialogHandler.cs
+++ b/Toolkit.Avalonia/ContentDialogHandler.cs
@@ -22,7 +22,7 @@ public class ContentDialogHandler(IDispatcher dispatcher) :
                     if (content is IPrimaryConfirmation primaryConfirmation)
                     {
                         Deferral deferral = args.GetDeferral();
-                        if (!await primaryConfirmation.Confirm())
+                        if (!await primaryConfirmation.ConfirmPrimary())
                         {
                             args.Cancel = true;
                             contentDialog.PrimaryButtonClick += HandlePrimaryButtonClick;
@@ -64,13 +64,6 @@ public class ContentDialogHandler(IDispatcher dispatcher) :
                     {
                         if (content is IConfirmation confirmation)
                         {
-                            List<Action> postActions = [];
-                            if (content is IActivityIndicator activityIndicator)
-                            {
-                                activityIndicator.Active = true;
-                                postActions.Add(() => activityIndicator.Active = false);
-                            }
-
                             Deferral deferral = args.GetDeferral();
                             if (!await confirmation.Confirm())
                             {
@@ -79,10 +72,6 @@ public class ContentDialogHandler(IDispatcher dispatcher) :
                             }
 
                             deferral.Complete();
-                            foreach (Action action in postActions)
-                            {
-                                action.Invoke();
-                            }
                         }
                     }
                 }
diff --git a/Toolkit.Foundation/IConfirmation.cs b/Toolkit.Foundation/IConfirmation.cs
new file mode 100644
index 0000000..60a227d
--- /dev/null
+++ b/Toolkit.Foundation/IConfirmation.cs
@@ -0,0 +1,6 @@
+namespace Toolkit.Foundation;
+
+public interface IConfirmation
+{
+    Task<bool> Confirm();
+}
\ No newline at end of file
diff --git a/Toolkit.Foundation/IPrimaryConfirmation.cs b/Toolkit.Foundation/IPrimaryConfirmation.cs
index efce945..aabfe13 100644
--- a/Toolkit.Foundation/IPrimaryConfirmation.cs
+++ b/Toolkit.Foundation/IPrimaryConfirmation.cs
@@ -2,10 +2,5 @@
 
 public interface IPrimaryConfirmation
 {
-    Task<bool> Confirm();
+    Task<bool> ConfirmPrimary();
 }
-
-public interface IConfirmation
-{
-    Task<bool> Confirm();
-}
\ No newline at end of file