Popup V2

samples/CommunityToolkit.Maui.Sample/App.xaml

@@ -10,42 +10,34 @@
             </ResourceDictionary.MergedDictionaries>
 
             <Style TargetType="{x:Type popups:ImplicitStylePopup}">
-                <Setter Property="Size" Value="100,100" />
-                <Setter Property="Color" Value="Red" />
-                <Setter Property="HorizontalOptions" Value="Start" />
-                <Setter Property="VerticalOptions" Value="Start" />
-                <Setter Property="CanBeDismissedByTappingOutsideOfPopup" Value="True" />
+                <Setter Property="WidthRequest" Value="100" />
+                <Setter Property="HeightRequest" Value="100" />
+                <Setter Property="BackgroundColor" Value="Red" />
             </Style>
 
             <Style x:Key="ExplicitPopupStyle" TargetType="{x:Type popups:ExplicitStylePopup}">
-                <Setter Property="Size" Value="200,100" />
-                <Setter Property="Color" Value="Yellow" />
-                <Setter Property="HorizontalOptions" Value="End" />
-                <Setter Property="VerticalOptions" Value="Start" />
-                <Setter Property="CanBeDismissedByTappingOutsideOfPopup" Value="True" />
+                <Setter Property="WidthRequest" Value="200" />
+                <Setter Property="HeightRequest" Value="100" />
+                <Setter Property="BackgroundColor" Value="Yellow" />
             </Style>
 
             <Style x:Key="BasePopupStyle" TargetType="{x:Type popups:StyleInheritancePopup}">
-                <Setter Property="Size" Value="200,200" />
+                <Setter Property="WidthRequest" Value="200" />
+                <Setter Property="HeightRequest" Value="200" />
             </Style>
             <Style x:Key="InheritancePopupStyle" TargetType="{x:Type popups:StyleInheritancePopup}" BasedOn="{StaticResource BasePopupStyle}">
-                <Setter Property="Color" Value="SkyBlue" />
-                <Setter Property="HorizontalOptions" Value="End" />
-                <Setter Property="VerticalOptions" Value="End" />
-                <Setter Property="CanBeDismissedByTappingOutsideOfPopup" Value="True" />
+                <Setter Property="BackgroundColor" Value="SkyBlue" />
             </Style>
 
             <Style x:Key="DynamicBasePopupStyle" TargetType="{x:Type popups:DynamicStyleInheritancePopup}">
-                <Setter Property="Size" Value="150,150" />
+                <Setter Property="WidthRequest" Value="150" />
+                <Setter Property="HeightRequest" Value="150" />
             </Style>
             <Style x:Key="DynamicInheritancePopupStyle1" TargetType="{x:Type popups:DynamicStyleInheritancePopup}" BasedOn="{StaticResource DynamicBasePopupStyle}">
-                <Setter Property="Color" Value="Purple" />
-                <Setter Property="VerticalOptions" Value="End" />
+                <Setter Property="BackgroundColor" Value="Purple" />
             </Style>
             <Style x:Key="DynamicInheritancePopupStyle2" TargetType="{x:Type popups:DynamicStyleInheritancePopup}" BaseResourceKey="DynamicInheritancePopupStyle1">
-                <Setter Property="Color" Value="Orange" />
-                <Setter Property="HorizontalOptions" Value="End" />
-                <Setter Property="CanBeDismissedByTappingOutsideOfPopup" Value="True" />
+                <Setter Property="BackgroundColor" Value="Orange" />
             </Style>
 
         </ResourceDictionary>

samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs

@@ -121,7 +121,6 @@ public partial class AppShell : Shell
 		CreateViewModelMapping<AvatarViewSizesPage, AvatarViewSizesViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<BasicMapsPage, BasicMapsViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<CameraViewPage, CameraViewViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
-		CreateViewModelMapping<CustomSizeAndPositionPopupPage, CustomSizeAndPositionPopupViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<DrawingViewPage, DrawingViewViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<ExpanderPage, ExpanderViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<LazyViewPage, LazyViewViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
@@ -130,17 +129,18 @@ public partial class AppShell : Shell
 		CreateViewModelMapping<MediaElementCarouselViewPage, MediaElementCarouselViewViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<MediaElementCollectionViewPage, MediaElementCollectionViewViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<MediaElementMultipleWindowsPage, MediaElementMultipleWindowsViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
+		CreateViewModelMapping<SemanticOrderViewPage, SemanticOrderViewPageViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<MultiplePopupPage, MultiplePopupViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<PopupAnchorPage, PopupAnchorViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<PopupLayoutAlignmentPage, PopupLayoutAlignmentViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<PopupPositionPage, PopupPositionViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<PopupSizingIssuesPage, PopupSizingIssuesViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
-		CreateViewModelMapping<RatingViewCsharpPage, RatingViewCsharpViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
+		CreateViewModelMapping<ShowPopupInOnAppearingPage, ShowPopupInOnAppearingPageViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
+		CreateViewModelMapping<StylePopupPage, StylePopupViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
+    CreateViewModelMapping<RatingViewCsharpPage, RatingViewCsharpViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<RatingViewShowcasePage, RatingViewShowcaseViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<RatingViewXamlPage, RatingViewXamlViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 		CreateViewModelMapping<SemanticOrderViewPage, SemanticOrderViewPageViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
-		CreateViewModelMapping<ShowPopupInOnAppearingPage, ShowPopupInOnAppearingPageViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
-		CreateViewModelMapping<StylePopupPage, StylePopupViewModel, ViewsGalleryPage, ViewsGalleryViewModel>(),
 
 		// Add PlatformSpecific View Models
 		CreateViewModelMapping<NavigationBarPage, NavigationBarAndroidViewModel, PlatformSpecificGalleryPage, PlatformSpecificGalleryViewModel>()

samples/CommunityToolkit.Maui.Sample/MauiProgram.cs

@@ -121,7 +121,6 @@ public static MauiApp CreateMauiApp()
 						.AddStandardResilienceHandler(static options => options.Retry = new MobileHttpRetryStrategyOptions());
 
 		builder.Services.AddSingleton<AppShell>();
-		builder.Services.AddSingleton<PopupSizeConstants>();
 
 		RegisterViewsAndViewModels(builder.Services);
 		RegisterEssentials(builder.Services);
@@ -246,7 +245,6 @@ static void RegisterViewsAndViewModels(in IServiceCollection services)
 		// Add Views Pages + ViewModels
 		services.AddTransientWithShellRoute<BasicMapsPage, BasicMapsViewModel>();
 		services.AddTransientWithShellRoute<CameraViewPage, CameraViewViewModel>();
-		services.AddTransientWithShellRoute<CustomSizeAndPositionPopupPage, CustomSizeAndPositionPopupViewModel>();
 		services.AddTransientWithShellRoute<DrawingViewPage, DrawingViewViewModel>();
 		services.AddTransientWithShellRoute<ExpanderPage, ExpanderViewModel>();
 		services.AddTransientWithShellRoute<LazyViewPage, LazyViewViewModel>();
@@ -268,9 +266,27 @@ static void RegisterViewsAndViewModels(in IServiceCollection services)
 		services.AddTransientWithShellRoute<PopupSizingIssuesPage, PopupSizingIssuesViewModel>();
 
 		// Add Popups
-		services.AddTransientPopup<CsharpBindingPopup, CsharpBindingPopupViewModel>();
-		services.AddTransientPopup<UpdatingPopup, UpdatingPopupViewModel>();
-		services.AddTransientPopup<XamlBindingPopup, XamlBindingPopupViewModel>();
+		services.AddPopup<ApplyToDerivedTypesPopup>();
+		services.AddPopup<ButtonPopup>();
+		services.AddPopup<CsharpBindingPopup, CsharpBindingPopupViewModel>();
+		services.AddPopup<DynamicStyleInheritancePopup>();
+		services.AddPopup<DynamicStylePopup>();
+		services.AddPopup<ExplicitStylePopup>();
+		services.AddPopup<ImplicitStylePopup>();
+		services.AddPopup<MultipleButtonPopup>();
+		services.AddPopup<NoOutsideTapDismissPopup>();
+		services.AddPopup<OpenedEventSimplePopup>();
+		services.AddPopup<RedBlueBoxPopup>();
+		services.AddPopup<ReturnResultPopup>();
+		services.AddPopup<SimplePopup>();
+		services.AddPopup<StyleClassPopup>();
+		services.AddPopup<StyleInheritancePopup>();
+		services.AddPopup<ToggleSizePopup>();
+		services.AddPopup<TransparentPopup>();
+		services.AddPopup<UpdatingPopup, UpdatingPopupViewModel>();
+		services.AddPopup<XamlBindingPopup, XamlBindingPopupViewModel>();
+
+		services.AddPopup<PopupContentView, PopupContentViewModel>();
 	}
 
 	static void RegisterEssentials(in IServiceCollection services)

samples/CommunityToolkit.Maui.Sample/Pages/Views/MediaElement/MediaElementPage.xaml.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using CommunityToolkit.Maui.Core;
 using CommunityToolkit.Maui.Core.Primitives;
 using CommunityToolkit.Maui.Sample.ViewModels.Views;
 using CommunityToolkit.Maui.Views;
@@ -243,7 +244,7 @@ async void ChangeAspectClicked(object? sender, EventArgs e)
 		MediaElement.Aspect = (Aspect)aspectEnum;
 	}
 
-	void DisplayPopup(object sender, EventArgs e)
+	async void DisplayPopup(object sender, EventArgs e)
 	{
 		MediaElement.Pause();
 		var popupMediaElement = new MediaElement
@@ -256,8 +257,6 @@ void DisplayPopup(object sender, EventArgs e)
 		};
 		var popup = new Popup
 		{
-			VerticalOptions = LayoutAlignment.Center,
-			HorizontalOptions = LayoutAlignment.Center,
 			Content = new StackLayout
 			{
 				Children =
@@ -267,11 +266,8 @@ void DisplayPopup(object sender, EventArgs e)
 			}
 		};
 
-		this.ShowPopup(popup);
-		popup.Closed += (s, e) =>
-		{
-			popupMediaElement.Stop();
-			popupMediaElement.Handler?.DisconnectHandler();
-		};
+		await this.ShowPopup(popup, new PopupOptions());
+		popupMediaElement.Stop();
+		popupMediaElement.Handler?.DisconnectHandler();
 	}
 }