Fix tests

Author: VladislavAntonyuk

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

@@ -266,7 +266,7 @@ async void DisplayPopup(object sender, EventArgs e)
 			}
 		};
 
-		await Navigation.ShowPopup(popup, new PopupOptions());
+		await Navigation.ShowPopup(popup, new PopupOptions<Popup>());
 		popupMediaElement.Stop();
 		popupMediaElement.Handler?.DisconnectHandler();
 	}

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

@@ -19,48 +19,48 @@ public MultiplePopupPage(MultiplePopupViewModel multiplePopupViewModel, IPopupSe
 
 	async void HandleSimplePopupButtonClicked(object sender, EventArgs e)
 	{
-		await popupService.ShowPopupAsync<SimplePopup>(new PopupOptions(), CancellationToken.None);
+		await popupService.ShowPopupAsync(new PopupOptions<SimplePopup>(), CancellationToken.None);
 	}
 
 	async void HandleButtonPopupButtonClicked(object sender, EventArgs e)
 	{
-		await popupService.ShowPopupAsync< ButtonPopup>(new PopupOptions(), CancellationToken.None);
+		await popupService.ShowPopupAsync(new PopupOptions<ButtonPopup>(), CancellationToken.None);
 	}
 
 	async void HandleMultipleButtonPopupButtonClicked(object sender, EventArgs e)
 	{
-		await popupService.ShowPopupAsync<MultipleButtonPopup>(new PopupOptions(), CancellationToken.None);
+		await popupService.ShowPopupAsync(new PopupOptions<MultipleButtonPopup>(), CancellationToken.None);
 	}
 
 	async void HandleNoOutsideTapDismissPopupClicked(object sender, EventArgs e)
 	{
-		await popupService.ShowPopupAsync<NoOutsideTapDismissPopup>(new PopupOptions(){CanBeDismissedByTappingOutsideOfPopup = false}, CancellationToken.None);
+		await popupService.ShowPopupAsync(new PopupOptions<NoOutsideTapDismissPopup>(){CanBeDismissedByTappingOutsideOfPopup = false}, CancellationToken.None);
 	}
 
 	async void HandleToggleSizePopupButtonClicked(object sender, EventArgs e)
 	{
-		await popupService.ShowPopupAsync<ToggleSizePopup>(new PopupOptions(), CancellationToken.None);
+		await popupService.ShowPopupAsync(new PopupOptions<ToggleSizePopup>(), CancellationToken.None);
 	}
 
 	async void HandleTransparentPopupButtonClicked(object sender, EventArgs e)
 	{
-		await popupService.ShowPopupAsync<TransparentPopup>(new PopupOptions(), CancellationToken.None);
+		await popupService.ShowPopupAsync(new PopupOptions<TransparentPopup>(), CancellationToken.None);
 	}
 
 	async void HandleOpenedEventSimplePopupButtonClicked(object sender, EventArgs e)
 	{
-		await popupService.ShowPopupAsync<OpenedEventSimplePopup>(new PopupOptions(), CancellationToken.None);
+		await popupService.ShowPopupAsync(new PopupOptions<OpenedEventSimplePopup>(), CancellationToken.None);
 	}
 
 	async void HandleReturnResultPopupButtonClicked(object sender, EventArgs e)
 	{
-		var result = await popupService.ShowPopupAsync< ReturnResultPopup, bool>(new PopupOptions(), CancellationToken.None);
+		var result = await popupService.ShowPopupAsync<ReturnResultPopup, bool>(new PopupOptions<ReturnResultPopup>(), CancellationToken.None);
 
 		await DisplayAlert("Pop Result Returned", $"Result: {result.Result}", "OK");
 	}
 
 	async void HandleXamlBindingPopupPopupButtonClicked(object sender, EventArgs e)
 	{
-		await popupService.ShowPopupAsync<XamlBindingPopup>(new PopupOptions(), CancellationToken.None);
+		await popupService.ShowPopupAsync(new PopupOptions<XamlBindingPopup>(), CancellationToken.None);
 	}
 }

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

@@ -20,6 +20,6 @@ async void ShowPopupButtonClicked(object sender, EventArgs e)
 			HeightRequest = double.Parse(heightEntry.Text)
 		};
 
-		await Navigation.ShowPopup(redBlueBoxPopup, new PopupOptions());
+		await Navigation.ShowPopup(redBlueBoxPopup, new PopupOptions<RedBlueBoxPopup>());
 	}
 }

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

@@ -23,6 +23,6 @@ protected override async void OnAppearing()
 	{
 		var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
 		// Proves that we now support showing a popup before the platform is even ready.
-		await popupService.ShowPopupAsync<ReturnResultPopup>(new PopupOptions(), cts.Token);
+		await popupService.ShowPopupAsync(new PopupOptions<ReturnResultPopup>(), cts.Token);
 	}
 }

samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/CustomSizeAndPositionPopupViewModel.cs

@@ -98,7 +98,7 @@ public Task ExecuteShowButton(CancellationToken token)
 			HeightRequest = Height
 		};
 
-		return Shell.Current.Navigation.ShowPopup(popup, new PopupOptions());
+		return Shell.Current.Navigation.ShowPopup(popup, new PopupOptions<FlowDirectionPopup>());
 	}
 
 	static bool IsFlowDirectionSelectionValid(int flowDirectionSelection, int flowDirectionOptionsCount)

samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupAnchorViewModel.cs

@@ -16,6 +16,6 @@ static async Task ShowPopup(View anchor)
 		{
 
 		};
-		await MainPage.Navigation.ShowPopup(popup, new PopupOptions());
+		await MainPage.Navigation.ShowPopup(popup, new PopupOptions<TransparentPopup>());
 	}
 }

samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupPositionViewModel.cs

@@ -15,7 +15,7 @@ static async Task DisplayPopup(PopupPosition position)
 	{
 		var popup = new TransparentPopup();
 
-		await Page.Navigation.ShowPopup(popup, new PopupOptions());
+		await Page.Navigation.ShowPopup(popup, new PopupOptions<TransparentPopup>());
 	}
 
 	public enum PopupPosition

samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/PopupSizingIssuesViewModel.cs

@@ -63,7 +63,7 @@ async Task OnShowPopup(Page page)
 
 		popup.Content = container;
 
-		await page.Navigation.ShowPopup(popup, new PopupOptions());
+		await page.Navigation.ShowPopup(popup, new PopupOptions<Popup>());
 	}
 
 	static Label GetContentLabel(in string text) => new()

samples/CommunityToolkit.Maui.Sample/ViewModels/Views/Popup/StylePopupViewModel.cs

@@ -13,48 +13,48 @@ public partial class StylePopupViewModel : BaseViewModel
 	static async Task DisplayImplicitStylePopup()
 	{
 		var popup = new ImplicitStylePopup();
-		await MainPage.Navigation.ShowPopup(popup, new PopupOptions());
+		await MainPage.Navigation.ShowPopup(popup, new PopupOptions<ImplicitStylePopup>());
 	}
 
 	[RelayCommand]
 	static async Task DisplayExplicitStylePopup()
 	{
 		var popup = new ExplicitStylePopup();
-		await MainPage.Navigation.ShowPopup(popup, new PopupOptions());
+		await MainPage.Navigation.ShowPopup(popup, new PopupOptions<ExplicitStylePopup>());
 	}
 
 	[RelayCommand]
 	static async Task DisplayDynamicStylePopup()
 	{
 		var popup = new DynamicStylePopup();
-		await MainPage.Navigation.ShowPopup(popup, new PopupOptions());
+		await MainPage.Navigation.ShowPopup(popup, new PopupOptions<DynamicStylePopup>());
 	}
 
 	[RelayCommand]
 	static async Task DisplayApplyToDerivedTypesPopup()
 	{
 		var popup = new ApplyToDerivedTypesPopup();
-		await MainPage.Navigation.ShowPopup(popup, new PopupOptions());
+		await MainPage.Navigation.ShowPopup(popup, new PopupOptions<ApplyToDerivedTypesPopup>());
 	}
 
 	[RelayCommand]
 	static async Task DisplayStyleInheritancePopup()
 	{
 		var popup = new StyleInheritancePopup();
-		await MainPage.Navigation.ShowPopup(popup, new PopupOptions());
+		await MainPage.Navigation.ShowPopup(popup, new PopupOptions<StyleInheritancePopup>());
 	}
 
 	[RelayCommand]
 	static async Task DisplayDynamicStyleInheritancePopup()
 	{
 		var popup = new DynamicStyleInheritancePopup();
-		await MainPage.Navigation.ShowPopup(popup, new PopupOptions());
+		await MainPage.Navigation.ShowPopup(popup, new PopupOptions<DynamicStyleInheritancePopup>());
 	}
 
 	[RelayCommand]
 	static async Task DisplayStyleClassPopup()
 	{
 		var popup = new StyleClassPopup();
-		await MainPage.Navigation.ShowPopup(popup, new PopupOptions());
+		await MainPage.Navigation.ShowPopup(popup, new PopupOptions<StyleClassPopup>());
 	}
 }

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

@@ -9,7 +9,7 @@ public partial class OpenedEventSimplePopup
 	public OpenedEventSimplePopup()
 	{
 		InitializeComponent();
-		OnOpened = async () =>
+		OnOpened += async (s,e) =>
 		{
 			await Task.Delay(TimeSpan.FromSeconds(1));