Add PopupExtensions.ClosePopup() (#2671)

* Add `Close()`

* Update PopupExtensions.shared.cs

* Add CancellationToken

* Add Unit Tests

* Add Support for Shell

* Add .NET 10 Compiler Error

This ensures we do not forget to remove the Obsolete Popup classes in our .NET 10 release

* Rename `Close()` -> `CloseAsync()`

* Add `[EditorBrowsable(EditorBrowsableState.Never)]` to Obsolete classes

* Update Samples

* Fix XML

Author: TheCodeTraveler

samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupLayoutAlignmentPage.xaml

@@ -6,6 +6,7 @@
              xmlns:viewModels="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Views"
              x:TypeArguments="viewModels:PopupLayoutAlignmentViewModel"
              x:DataType="viewModels:PopupLayoutAlignmentViewModel"
+             Padding="20"
              Title="Popup Layout Alignment">
 
     <Grid RowDefinitions="64,44,32,44,24,44,*"
@@ -41,7 +42,6 @@
 
         <Entry Grid.Row="1"
                Grid.Column="5"
-               Grid.ColumnSpan="2"
                Text="100"
                x:Name="heightEntry"
                Keyboard="Numeric"

samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupPositionPage.xaml

@@ -32,7 +32,7 @@
         <Label  Grid.Row="0"
                 Grid.ColumnSpan="3"
                 Style="{StaticResource Header}"
-                Text="Popup's can be positioned anywhere on the screen using VerticalOptions and HorizontalOptions. Tap the arrows below to see how this works." 
+                Text="Popups can be positioned anywhere on the screen using VerticalOptions and HorizontalOptions. Tap the arrows below to see how this works." 
                 HorizontalTextAlignment="Center"/>
 
         <Button Grid.Row="1"

samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupsPage.xaml

@@ -11,6 +11,8 @@
         <ScrollView>
             <VerticalStackLayout Spacing="12">
                 <Button Text="Simple Popup" Clicked="HandleSimplePopupButtonClicked" />
+                
+                <Button Text="Self Closing Popup" Clicked="HandleSelfClosingPopupButtonClicked"/>
 
                 <Button Text="Button Popup" Clicked="HandleButtonPopupButtonClicked" />
 
@@ -45,6 +47,7 @@
                 <Button Text="Popup Style Page" Clicked="HandleStylePopupButtonClicked" />
 
                 <Button Text="OnDisappearing Popup" Clicked="HandleOnDisappearingPopupClicked" />
+                
             </VerticalStackLayout>
         </ScrollView>
     </ContentPage.Content>

samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupsPage.xaml.cs

@@ -1,3 +1,5 @@
+using CommunityToolkit.Maui.Extensions;
+using CommunityToolkit.Maui.Markup;
 using CommunityToolkit.Maui.Sample.Pages.Views.Popup;
 using CommunityToolkit.Maui.Sample.ViewModels.Views;
 using CommunityToolkit.Maui.Sample.Views.Popups;
@@ -116,4 +118,16 @@ async void HandleOnDisappearingPopupClicked(object sender, EventArgs e)
 	{
 		await Navigation.PushModalAsync(new PopupOnDisappearingPage());
 	}
+
+	async void HandleSelfClosingPopupButtonClicked(object? sender, EventArgs e)
+	{
+		this.ShowPopup(new Label().Text("This Popup Will Close Automatically in 2 Seconds"), new PopupOptions
+		{
+			CanBeDismissedByTappingOutsideOfPopup = false
+		});
+		
+		await Task.Delay(TimeSpan.FromSeconds(2));
+		
+		await this.ClosePopupAsync();
+	}
 }

samples/CommunityToolkit.Maui.Sample/Resources/Styles/Styles.xaml

@@ -7,7 +7,7 @@
 
     <!-- Explicit styles -->
     <Style x:Key="PopupLayout" TargetType="Layout" ApplyToDerivedTypes="true">
-        <Setter Property="Padding" Value="{OnPlatform Android=20, WinUI=20, iOS=5, MacCatalyst=5, Tizen=20}" />
+        <Setter Property="Padding" Value="{OnPlatform Android=5, WinUI=20, iOS=5, MacCatalyst=5, Tizen=20}" />
     </Style>
 
     <!--  Implicit styles  -->

samples/CommunityToolkit.Maui.Sample/Views/Popups/ButtonPopup.xaml

@@ -4,7 +4,7 @@
 	xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
 	xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
 	xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
-    BackgroundColor="Red">
+    BackgroundColor="LightCoral">
 
 	<VerticalStackLayout Spacing="6">
 		<VerticalStackLayout.Resources>

samples/CommunityToolkit.Maui.Sample/Views/Popups/ButtonPopup.xaml.cs

@@ -9,6 +9,6 @@ public ButtonPopup()
 
 	void Button_Clicked(object? sender, EventArgs e)
 	{
-		Close();
+		CloseAsync();
 	}
 }

samples/CommunityToolkit.Maui.Sample/Views/Popups/MultipleButtonPopup.xaml

@@ -8,7 +8,7 @@
 	xmlns:system="clr-namespace:System;assembly=System.Runtime"
     BackgroundColor="White">
 
-	<VerticalStackLayout>
+	<VerticalStackLayout Spacing="6">
 		<VerticalStackLayout.Resources>
 			<ResourceDictionary>
 				<Style x:Key="Title" TargetType="Label">
@@ -37,6 +37,7 @@
 					<Setter Property="VerticalOptions" Value="End" />
 					<Setter Property="HorizontalOptions" Value="Center" />
 					<Setter Property="Spacing" Value="20" />
+                    <Setter Property="Margin" Value="8" />
 				</Style>
 			</ResourceDictionary>
 		</VerticalStackLayout.Resources>

samples/CommunityToolkit.Maui.Sample/Views/Popups/MultipleButtonPopup.xaml.cs

@@ -9,11 +9,11 @@ public MultipleButtonPopup()
 
 	async void Cancel_Clicked(object? sender, EventArgs e)
 	{
-		await Close(false);
+		await CloseAsync(false);
 	}
 
 	async void Okay_Clicked(object? sender, EventArgs e)
 	{
-		await Close(true);
+		await CloseAsync(true);
 	}
 }

samples/CommunityToolkit.Maui.Sample/Views/Popups/NoOutsideTapDismissPopup.xaml.cs

@@ -11,7 +11,7 @@ public NoOutsideTapDismissPopup()
 
 	async void Button_Clicked(object? sender, EventArgs e)
 	{
-		await Close();
+		await CloseAsync();
 		await Toast.Make("Popup Dismissed By Button").Show();
 	}
 }