diff --git a/GMCabsDriverAssistantSolution/ViewModels/AppShellViewModel.cs b/GMCabsDriverAssistantSolution/ViewModels/AppShellViewModel.cs index ce6923e..9ad6715 100644 --- a/GMCabsDriverAssistantSolution/ViewModels/AppShellViewModel.cs +++ b/GMCabsDriverAssistantSolution/ViewModels/AppShellViewModel.cs @@ -8,6 +8,7 @@ using Microsoft.Maui; using Microsoft.Maui.Controls; using GMCabsDriverAssistantSolution.ViewModels; using GMCabsDriverAssistant.Models; +using CommunityToolkit.Maui.Views; namespace GMCabsDriverAssistant.ViewModels { @@ -116,7 +117,8 @@ namespace GMCabsDriverAssistant.ViewModels private void OnPrivacyPolicyClicked(object obj) { Shell.Current.FlyoutIsPresented = false; - // _page.Navigation.ShowPopup(new PrivacyPolicyDialogPage()); + // _page.Navigation.ShowPopup(new PrivacyPolicyDialogPage()); + Shell.Current.ShowPopup(new PrivacyPolicyDialogPage()); } #endregion } diff --git a/GMCabsDriverAssistantSolution/Views/PrivacyPolicyDialogPage.xaml b/GMCabsDriverAssistantSolution/Views/PrivacyPolicyDialogPage.xaml index 7d69e4c..5021ff7 100644 --- a/GMCabsDriverAssistantSolution/Views/PrivacyPolicyDialogPage.xaml +++ b/GMCabsDriverAssistantSolution/Views/PrivacyPolicyDialogPage.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="GMCabsDriverAssistantSolution.Views.PrivacyPolicyDialogPage" xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit" - Size="300,300" + Size="{OnIdiom Phone='350,520',Tablet='800,500'}" Color="Transparent"> @@ -15,7 +15,7 @@ - + diff --git a/GMCabsDriverAssistantSolution/Views/PrivacyPolicyDialogPage.xaml.cs b/GMCabsDriverAssistantSolution/Views/PrivacyPolicyDialogPage.xaml.cs index 75412f7..80d3ac6 100644 --- a/GMCabsDriverAssistantSolution/Views/PrivacyPolicyDialogPage.xaml.cs +++ b/GMCabsDriverAssistantSolution/Views/PrivacyPolicyDialogPage.xaml.cs @@ -7,10 +7,11 @@ public partial class PrivacyPolicyDialogPage : Popup public PrivacyPolicyDialogPage() { InitializeComponent(); - } + privacyPolicyView.Source = "https://gmcabs.com.au/privacy-policy/"; + } private void lblClose_Tapped(object sender, EventArgs e) { //Dismiss(null); - Close(); + this.Close(); } } \ No newline at end of file