[Popup] Add DefaultPopupOptionsSettings and DefaultPopupSettings to .UseMauiCommunityToolkit(Options)

samples/CommunityToolkit.Maui.Sample/MauiProgram.cs

@@ -55,6 +55,8 @@ public static MauiApp CreateMauiApp()
 								.UseMauiCommunityToolkit(static options =>
 								{
 									options.SetShouldEnableSnackbarOnWindows(true);
+									options.SetPopupDefaults(new DefaultPopupSettings());
+									options.SetPopupOptionsDefaults(new DefaultPopupOptionsSettings());
 								})
 #else
 								.UseMauiCommunityToolkit(static options =>

src/CommunityToolkit.Maui.UnitTests/BaseTest.cs

@@ -84,6 +84,8 @@ protected virtual void Dispose(bool isDisposing)
 		options.SetShouldSuppressExceptionsInAnimations(false);
 		options.SetShouldSuppressExceptionsInBehaviors(false);
 		options.SetShouldSuppressExceptionsInConverters(false);
+		options.SetPopupDefaults(new DefaultPopupSettings());
+		options.SetPopupOptionsDefaults(new DefaultPopupOptionsSettings());
 
 		// Restore default MediaElementOptions
 		var mediaElementOptions = new MediaElementOptions();

src/CommunityToolkit.Maui.UnitTests/BaseViewTest.cs

@@ -74,7 +74,6 @@ static void InitializeServicesAndSetMockApplication(out IServiceProvider service
 		#endregion
 
 		#region Register Services for PopupServiceTests
-
 		appBuilder.Services.AddTransientPopup<LongLivedSelfClosingPopup, LongLivedMockPageViewModel>();
 		appBuilder.Services.AddTransientPopup<ShortLivedSelfClosingPopup, ShortLivedMockPageViewModel>();
 		appBuilder.Services.AddTransientPopup<GarbageCollectionHeavySelfClosingPopup, MockPageViewModel>();

src/CommunityToolkit.Maui.UnitTests/Extensions/AppBuilderExtensionsTests.cs

@@ -21,6 +21,8 @@ public void ConfirmOptionsDefaultValue()
 		Assert.False(Options.ShouldSuppressExceptionsInBehaviors);
 		Assert.False(Options.ShouldSuppressExceptionsInConverters);
 		Assert.False(isAndroidDialogFragmentServiceInitialized);
+		Assert.Equal(Options.DefaultPopupSettings, new DefaultPopupSettings());
+		Assert.Equal(Options.DefaultPopupOptionsSettings, new DefaultPopupOptionsSettings());
 
 		Core.AppBuilderExtensions.ShouldUseStatusBarBehaviorOnAndroidModalPageOptionCompleted -= HandleShouldUseStatusBarBehaviorOnAndroidModalPageOptionCompleted;
 
@@ -50,6 +52,8 @@ public void ConfirmDefaultValueRemainWhenOptionsNull()
 		Assert.False(Options.ShouldSuppressExceptionsInBehaviors);
 		Assert.False(Options.ShouldSuppressExceptionsInConverters);
 		Assert.True(isAndroidDialogFragmentServiceInitialized);
+		Assert.Equal(Options.DefaultPopupSettings, new DefaultPopupSettings());
+		Assert.Equal(Options.DefaultPopupOptionsSettings, new DefaultPopupOptionsSettings());
 
 		void HandleShouldUseStatusBarBehaviorOnAndroidModalPageOptionCompleted(object? sender, EventArgs e)
 		{
@@ -88,6 +92,25 @@ public void UseMauiCommunityToolkit_ShouldAssignValues()
 		// Arrange
 		var builder = MauiApp.CreateBuilder();
 		bool isAndroidDialogFragmentServiceInitialized = false;
+		var defaultPopupSettings = new DefaultPopupSettings
+		{
+			CanBeDismissedByTappingOutsideOfPopup = true,
+			BackgroundColor = Colors.Orange,
+			HorizontalOptions = LayoutOptions.End,
+			VerticalOptions = LayoutOptions.Start,
+			Margin = 72,
+			Padding = 4
+		};
+
+		var defaultPopupOptionsSettings = new DefaultPopupOptionsSettings
+		{
+			CanBeDismissedByTappingOutsideOfPopup = true,
+			OnTappingOutsideOfPopup = () => Console.WriteLine("Hello World"),
+			PageOverlayColor = Colors.Green,
+			Shadow = null,
+			Shape = null
+		};
+
 		Core.AppBuilderExtensions.ShouldUseStatusBarBehaviorOnAndroidModalPageOptionCompleted += HandleShouldUseStatusBarBehaviorOnAndroidModalPageOptionCompleted;
 
 		// Act
@@ -98,6 +121,8 @@ public void UseMauiCommunityToolkit_ShouldAssignValues()
 			options.SetShouldSuppressExceptionsInBehaviors(!Options.ShouldSuppressExceptionsInBehaviors);
 			options.SetShouldSuppressExceptionsInConverters(!Options.ShouldSuppressExceptionsInConverters);
 			options.SetShouldUseStatusBarBehaviorOnAndroidModalPage(!Core.Options.ShouldUseStatusBarBehaviorOnAndroidModalPage);
+			options.SetPopupDefaults(defaultPopupSettings);
+			options.SetPopupOptionsDefaults(defaultPopupOptionsSettings);
 		});
 
 		// Assert
@@ -107,6 +132,8 @@ public void UseMauiCommunityToolkit_ShouldAssignValues()
 		Assert.True(Options.ShouldSuppressExceptionsInBehaviors);
 		Assert.True(Options.ShouldSuppressExceptionsInConverters);
 		Assert.False(isAndroidDialogFragmentServiceInitialized);
+		Assert.Equal(defaultPopupSettings, Options.DefaultPopupSettings);
+		Assert.Equal(defaultPopupOptionsSettings, Options.DefaultPopupOptionsSettings);
 
 		Core.AppBuilderExtensions.ShouldUseStatusBarBehaviorOnAndroidModalPageOptionCompleted -= HandleShouldUseStatusBarBehaviorOnAndroidModalPageOptionCompleted;
 

src/CommunityToolkit.Maui.UnitTests/Extensions/PopupExtensionsTests.cs

@@ -184,6 +184,7 @@ public void ShowPopupAsync_WithViewType_ShowsPopup()
 	public void ShowPopupAsync_WithViewType_SetsCorrectDefaults()
 	{
 		// Arrange
+		Border popupBorder;
 		PopupPage popupPage;
 		Popup autogeneratedPopup;
 		var label = new Label();
@@ -192,13 +193,16 @@ public void ShowPopupAsync_WithViewType_SetsCorrectDefaults()
 		navigation.ShowPopup(label);
 
 		popupPage = (PopupPage)navigation.ModalStack[0];
+		popupBorder = popupPage.Content.PopupBorder;
 		autogeneratedPopup = (Popup)(popupPage.Content.PopupBorder.Content ?? throw new InvalidOperationException("Border Content cannot be null"));
 
 		// Assert
-		Assert.Equal(PopupDefaults.BackgroundColor, autogeneratedPopup.BackgroundColor);
-		Assert.Equal(PopupDefaults.HorizontalOptions, autogeneratedPopup.HorizontalOptions);
-		Assert.Equal(PopupDefaults.VerticalOptions, autogeneratedPopup.VerticalOptions);
-		Assert.Equal(PopupDefaults.Padding, autogeneratedPopup.Padding);
+		Assert.Equal(new Thickness(30), popupBorder.Margin);
+		Assert.Equal(LayoutOptions.Center, popupBorder.VerticalOptions);
+		Assert.Equal(LayoutOptions.Center, popupBorder.HorizontalOptions);
+		Assert.Equal(new Thickness(15), autogeneratedPopup.Padding);
+		Assert.Equal(Colors.White, autogeneratedPopup.BackgroundColor);
+		Assert.True(autogeneratedPopup.CanBeDismissedByTappingOutsideOfPopup);
 	}
 
 	[Fact]
@@ -465,7 +469,6 @@ public void ShowPopupAsync_WithCustomOptions_AppliesOptions()
 		// Verify Border Bindings to Border
 		Assert.Equal(popup.BindingContext, border.BindingContext);
 		Assert.Equal(popup.Margin, border.Margin);
-		Assert.Equal(((IPaddingElement)popup).Padding, border.Padding);
 		Assert.Equal(popup.Background, border.Background);
 		Assert.Equal(popup.BackgroundColor, border.BackgroundColor);
 		Assert.Equal(popup.HorizontalOptions, border.HorizontalOptions);
@@ -537,7 +540,6 @@ public void ShowPopupAsync_Shell_WithCustomOptions_AppliesOptions()
 		// Verify Border Bindings to Border
 		Assert.Equal(popup.BindingContext, border.BindingContext);
 		Assert.Equal(popup.Margin, border.Margin);
-		Assert.Equal(((IPaddingElement)popup).Padding, border.Padding);
 		Assert.Equal(popup.Background, border.Background);
 		Assert.Equal(popup.BackgroundColor, border.BackgroundColor);
 		Assert.Equal(popup.HorizontalOptions, border.HorizontalOptions);
@@ -563,6 +565,8 @@ public void ShowPopupAsyncWithView_WithCustomOptions_AppliesOptions()
 
 		var view = new Grid
 		{
+			Margin = 20,
+			BackgroundColor = Colors.Orange,
 			HorizontalOptions = LayoutOptions.End,
 			VerticalOptions = LayoutOptions.Start,
 		};
@@ -606,10 +610,9 @@ public void ShowPopupAsyncWithView_WithCustomOptions_AppliesOptions()
 		Assert.Equal(view.VerticalOptions, border.VerticalOptions);
 		Assert.Equal(view.HorizontalOptions, border.HorizontalOptions);
 
-		// Verify Border Bindings to Border
+		// Verify Popup Bindings to Border
 		Assert.Equal(popup.BindingContext, border.BindingContext);
 		Assert.Equal(popup.Margin, border.Margin);
-		Assert.Equal(((IPaddingElement)popup).Padding, border.Padding);
 		Assert.Equal(popup.Background, border.Background);
 		Assert.Equal(popup.BackgroundColor, border.BackgroundColor);
 		Assert.Equal(popup.HorizontalOptions, border.HorizontalOptions);
@@ -676,22 +679,17 @@ public void ShowPopupAsyncWithView_Shell_WithCustomOptions_AppliesOptions()
 		Assert.Equal(viewWithQueryable.Background, popup.Background);
 		Assert.Equal(viewWithQueryable.BackgroundColor, popup.BackgroundColor);
 		Assert.Equal(viewWithQueryable.Margin, popup.Margin);
-		Assert.Equal(viewWithQueryable.VerticalOptions, popup.VerticalOptions);
-		Assert.Equal(viewWithQueryable.HorizontalOptions, popup.HorizontalOptions);
 
 		// Verify View options Binding to Border
 		Assert.Equal(viewWithQueryable.BindingContext, border.BindingContext);
 		Assert.Equal(viewWithQueryable.Background, border.Background);
 		Assert.Equal(viewWithQueryable.BackgroundColor, border.BackgroundColor);
-		Assert.Equal(viewWithQueryable.Padding, border.Padding);
-		Assert.Equal(viewWithQueryable.Margin, border.Margin);
 		Assert.Equal(viewWithQueryable.VerticalOptions, border.VerticalOptions);
 		Assert.Equal(viewWithQueryable.HorizontalOptions, border.HorizontalOptions);
 
-		// Verify Border Bindings to Border
+		// Verify Border Bindings to Popup
 		Assert.Equal(popup.BindingContext, border.BindingContext);
 		Assert.Equal(popup.Margin, border.Margin);
-		Assert.Equal(((IPaddingElement)popup).Padding, border.Padding);
 		Assert.Equal(popup.Background, border.Background);
 		Assert.Equal(popup.BackgroundColor, border.BackgroundColor);
 		Assert.Equal(popup.HorizontalOptions, border.HorizontalOptions);