Fixed controls sample navigation crash

kubaflo · rmarinho · commit 6846c59b536a · 2025-03-13T11:18:24.000Z
diff --git a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/Android/AndroidTabbedPageSwipePage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/Android/AndroidTabbedPageSwipePage.xaml.cs
@@ -8,20 +8,11 @@ namespace Maui.Controls.Sample.Pages
 {
 	public partial class AndroidTabbedPageSwipePage : Microsoft.Maui.Controls.TabbedPage
 	{
-		ICommand? _returnToPlatformSpecificsPage;
-
 		public AndroidTabbedPageSwipePage()
 		{
 			InitializeComponent();
 		}
 
-		public AndroidTabbedPageSwipePage(ICommand restore)
-		{
-			InitializeComponent();
-
-			_returnToPlatformSpecificsPage = restore;
-		}
-
 		void OnSwipePagingButtonClicked(object sender, EventArgs e)
 		{
 			On<Microsoft.Maui.Controls.PlatformConfiguration.Android>().SetIsSwipePagingEnabled(!On<Microsoft.Maui.Controls.PlatformConfiguration.Android>().IsSwipePagingEnabled());
@@ -34,7 +25,7 @@ void OnSmoothScrollButtonClicked(object sender, EventArgs e)
 
 		void OnReturnButtonClicked(object sender, EventArgs e)
 		{
-			_returnToPlatformSpecificsPage?.Execute(null);
+			Navigation.PopAsync();
 		}
 	}
 }
diff --git a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/Android/AndroidTitleViewPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/Android/AndroidTitleViewPage.xaml.cs
@@ -6,25 +6,14 @@ namespace Maui.Controls.Sample.Pages
 {
 	public partial class AndroidTitleViewPage : ContentPage
 	{
-		readonly ICommand? _returnToPlatformSpecificsPage;
-
 		public AndroidTitleViewPage()
 		{
 			InitializeComponent();
 		}
 
-		public AndroidTitleViewPage(ICommand restore)
-		{
-			InitializeComponent();
-			_returnToPlatformSpecificsPage = restore;
-		}
-
 		void OnReturnButtonClicked(object sender, EventArgs e)
 		{
-			if (_returnToPlatformSpecificsPage == null)
-				return;
-
-			_returnToPlatformSpecificsPage.Execute(null);
+			Navigation.PopAsync();
 		}
 	}
 }
diff --git a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSLargeTitlePage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSLargeTitlePage.xaml.cs
@@ -8,12 +8,9 @@ namespace Maui.Controls.Sample.Pages
 {
 	public partial class iOSLargeTitlePage : ContentPage
 	{
-		ICommand _returnToPlatformSpecificsPage;
-
-		public iOSLargeTitlePage(ICommand restore)
+		public iOSLargeTitlePage()
 		{
 			InitializeComponent();
-			_returnToPlatformSpecificsPage = restore;
 		}
 
 		void OnButtonClicked(object sender, EventArgs e)
@@ -34,7 +31,7 @@ void OnButtonClicked(object sender, EventArgs e)
 
 		void OnReturnButtonClicked(object sender, EventArgs e)
 		{
-			_returnToPlatformSpecificsPage.Execute(null);
+			Navigation.PopAsync();
 		}
 	}
 }
diff --git a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSScrollViewPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSScrollViewPage.xaml.cs
@@ -7,12 +7,9 @@ namespace Maui.Controls.Sample.Pages
 {
 	public partial class iOSScrollViewPage : Microsoft.Maui.Controls.FlyoutPage
 	{
-		ICommand _returnToPlatformSpecificsPage;
-
-		public iOSScrollViewPage(ICommand restore)
+		public iOSScrollViewPage()
 		{
 			InitializeComponent();
-			_returnToPlatformSpecificsPage = restore;
 		}
 
 		void OnButtonClicked(object sender, EventArgs e)
@@ -22,7 +19,7 @@ void OnButtonClicked(object sender, EventArgs e)
 
 		void OnReturnButtonClicked(object sender, EventArgs e)
 		{
-			_returnToPlatformSpecificsPage.Execute(null);
+			Navigation.PopAsync();
 		}
 	}
 }
diff --git a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSTitleViewPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSTitleViewPage.xaml.cs
@@ -6,19 +6,15 @@ namespace Maui.Controls.Sample.Pages
 {
 	public partial class iOSTitleViewPage : ContentPage
 	{
-		ICommand _returnToPlatformSpecificsPage;
-
-		public iOSTitleViewPage(ICommand restore)
+		public iOSTitleViewPage()
 		{
 			InitializeComponent();
-
-			_returnToPlatformSpecificsPage = restore;
 			_searchBar.Effects.Add(Effect.Resolve("XamarinDocs.SearchBarEffect"));
 		}
 
 		void OnReturnButtonClicked(object sender, EventArgs e)
 		{
-			_returnToPlatformSpecificsPage.Execute(null);
+			Navigation.PopAsync();
 		}
 	}
 }
diff --git a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSTranslucentNavigationBarPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSTranslucentNavigationBarPage.xaml.cs
@@ -8,12 +8,9 @@ namespace Maui.Controls.Sample.Pages
 {
 	public partial class iOSTranslucentNavigationBarPage : ContentPage
 	{
-		ICommand _returnToPlatformSpecificsPage;
-
-		public iOSTranslucentNavigationBarPage(ICommand restore)
+		public iOSTranslucentNavigationBarPage()
 		{
 			InitializeComponent();
-			_returnToPlatformSpecificsPage = restore;
 		}
 
 		void OnTranslucentNavigationBarButtonClicked(object sender, EventArgs e)
@@ -23,7 +20,7 @@ void OnTranslucentNavigationBarButtonClicked(object sender, EventArgs e)
 
 		void OnReturnButtonClicked(object sender, EventArgs e)
 		{
-			_returnToPlatformSpecificsPage.Execute(null);
+			Navigation.PopAsync();
 		}
 	}
 }
diff --git a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSTranslucentTabbedPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSTranslucentTabbedPage.xaml.cs
@@ -2,17 +2,13 @@
 using System.Windows.Input;
 using Microsoft.Maui.Controls.PlatformConfiguration;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
-
 namespace Maui.Controls.Sample.Pages
 {
 	public partial class iOSTranslucentTabbedPage : Microsoft.Maui.Controls.TabbedPage
 	{
-		ICommand returnToPlatformSpecificsPage;
-
-		public iOSTranslucentTabbedPage(ICommand restore)
+		public iOSTranslucentTabbedPage()
 		{
 			InitializeComponent();
-			returnToPlatformSpecificsPage = restore;
 		}
 
 		void OnToggleButtonClicked(object sender, EventArgs e)
@@ -33,7 +29,7 @@ void OnToggleButtonClicked(object sender, EventArgs e)
 
 		void OnReturnButtonClicked(object sender, EventArgs e)
 		{
-			returnToPlatformSpecificsPage.Execute(null);
+			Navigation.PopAsync();
 		}
 	}
 }
diff --git a/src/Controls/samples/Controls.Sample/ViewModels/PlatformSpecificsViewModel.cs b/src/Controls/samples/Controls.Sample/ViewModels/PlatformSpecificsViewModel.cs
@@ -111,7 +111,7 @@ protected override IEnumerable<SectionModel> CreateItems()
 				new SectionModel(typeof(iOSTranslucentNavigationBarPage), "NavigationPage Translucent TabBar",
 					"This iOS platform-specific is used to set the translucency mode of the tab bar on a NavigationPage."),
 
-				new SectionModel(typeof(MainPage), "TabbedPage Translucent TabBar",
+				new SectionModel(typeof(iOSTranslucentTabbedPage), "TabbedPage Translucent TabBar",
 					"This iOS platform-specific is used to set the translucency mode of the tab bar on a TabbedPage."),
 
 #if MACCATALYST

Original file line number	Diff line number	Diff line change
`@@ -8,20 +8,11 @@ namespace Maui.Controls.Sample.Pages`
`8`	`8`	`{`
`9`	`9`	`public partial class AndroidTabbedPageSwipePage : Microsoft.Maui.Controls.TabbedPage`
`10`	`10`	`{`
`11`		`- ICommand? _returnToPlatformSpecificsPage;`
`12`		`-`
`13`	`11`	`public AndroidTabbedPageSwipePage()`
`14`	`12`	`{`
`15`	`13`	`InitializeComponent();`
`16`	`14`	`}`
`17`	`15`
`18`		`- public AndroidTabbedPageSwipePage(ICommand restore)`
`19`		`- {`
`20`		`- InitializeComponent();`
`21`		`-`
`22`		`- _returnToPlatformSpecificsPage = restore;`
`23`		`- }`
`24`		`-`
`25`	`16`	`void OnSwipePagingButtonClicked(object sender, EventArgs e)`
`26`	`17`	`{`
`27`	`18`	`On<Microsoft.Maui.Controls.PlatformConfiguration.Android>().SetIsSwipePagingEnabled(!On<Microsoft.Maui.Controls.PlatformConfiguration.Android>().IsSwipePagingEnabled());`
`@@ -34,7 +25,7 @@ void OnSmoothScrollButtonClicked(object sender, EventArgs e)`
`34`	`25`
`35`	`26`	`void OnReturnButtonClicked(object sender, EventArgs e)`
`36`	`27`	`{`
`37`		`- _returnToPlatformSpecificsPage?.Execute(null);`
	`28`	`+ Navigation.PopAsync();`
`38`	`29`	`}`
`39`	`30`	`}`
`40`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,25 +6,14 @@ namespace Maui.Controls.Sample.Pages`
`6`	`6`	`{`
`7`	`7`	`public partial class AndroidTitleViewPage : ContentPage`
`8`	`8`	`{`
`9`		`- readonly ICommand? _returnToPlatformSpecificsPage;`
`10`		`-`
`11`	`9`	`public AndroidTitleViewPage()`
`12`	`10`	`{`
`13`	`11`	`InitializeComponent();`
`14`	`12`	`}`
`15`	`13`
`16`		`- public AndroidTitleViewPage(ICommand restore)`
`17`		`- {`
`18`		`- InitializeComponent();`
`19`		`- _returnToPlatformSpecificsPage = restore;`
`20`		`- }`
`21`		`-`
`22`	`14`	`void OnReturnButtonClicked(object sender, EventArgs e)`
`23`	`15`	`{`
`24`		`- if (_returnToPlatformSpecificsPage == null)`
`25`		`- return;`
`26`		`-`
`27`		`- _returnToPlatformSpecificsPage.Execute(null);`
	`16`	`+ Navigation.PopAsync();`
`28`	`17`	`}`
`29`	`18`	`}`
`30`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,9 @@ namespace Maui.Controls.Sample.Pages`
`8`	`8`	`{`
`9`	`9`	`public partial class iOSLargeTitlePage : ContentPage`
`10`	`10`	`{`
`11`		`- ICommand _returnToPlatformSpecificsPage;`
`12`		`-`
`13`		`- public iOSLargeTitlePage(ICommand restore)`
	`11`	`+ public iOSLargeTitlePage()`
`14`	`12`	`{`
`15`	`13`	`InitializeComponent();`
`16`		`- _returnToPlatformSpecificsPage = restore;`
`17`	`14`	`}`
`18`	`15`
`19`	`16`	`void OnButtonClicked(object sender, EventArgs e)`
`@@ -34,7 +31,7 @@ void OnButtonClicked(object sender, EventArgs e)`
`34`	`31`
`35`	`32`	`void OnReturnButtonClicked(object sender, EventArgs e)`
`36`	`33`	`{`
`37`		`- _returnToPlatformSpecificsPage.Execute(null);`
	`34`	`+ Navigation.PopAsync();`
`38`	`35`	`}`
`39`	`36`	`}`
`40`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,9 @@ namespace Maui.Controls.Sample.Pages`
`7`	`7`	`{`
`8`	`8`	`public partial class iOSScrollViewPage : Microsoft.Maui.Controls.FlyoutPage`
`9`	`9`	`{`
`10`		`- ICommand _returnToPlatformSpecificsPage;`
`11`		`-`
`12`		`- public iOSScrollViewPage(ICommand restore)`
	`10`	`+ public iOSScrollViewPage()`
`13`	`11`	`{`
`14`	`12`	`InitializeComponent();`
`15`		`- _returnToPlatformSpecificsPage = restore;`
`16`	`13`	`}`
`17`	`14`
`18`	`15`	`void OnButtonClicked(object sender, EventArgs e)`
`@@ -22,7 +19,7 @@ void OnButtonClicked(object sender, EventArgs e)`
`22`	`19`
`23`	`20`	`void OnReturnButtonClicked(object sender, EventArgs e)`
`24`	`21`	`{`
`25`		`- _returnToPlatformSpecificsPage.Execute(null);`
	`22`	`+ Navigation.PopAsync();`
`26`	`23`	`}`
`27`	`24`	`}`
`28`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,19 +6,15 @@ namespace Maui.Controls.Sample.Pages`
`6`	`6`	`{`
`7`	`7`	`public partial class iOSTitleViewPage : ContentPage`
`8`	`8`	`{`
`9`		`- ICommand _returnToPlatformSpecificsPage;`
`10`		`-`
`11`		`- public iOSTitleViewPage(ICommand restore)`
	`9`	`+ public iOSTitleViewPage()`
`12`	`10`	`{`
`13`	`11`	`InitializeComponent();`
`14`		`-`
`15`		`- _returnToPlatformSpecificsPage = restore;`
`16`	`12`	`_searchBar.Effects.Add(Effect.Resolve("XamarinDocs.SearchBarEffect"));`
`17`	`13`	`}`
`18`	`14`
`19`	`15`	`void OnReturnButtonClicked(object sender, EventArgs e)`
`20`	`16`	`{`
`21`		`- _returnToPlatformSpecificsPage.Execute(null);`
	`17`	`+ Navigation.PopAsync();`
`22`	`18`	`}`
`23`	`19`	`}`
`24`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,9 @@ namespace Maui.Controls.Sample.Pages`
`8`	`8`	`{`
`9`	`9`	`public partial class iOSTranslucentNavigationBarPage : ContentPage`
`10`	`10`	`{`
`11`		`- ICommand _returnToPlatformSpecificsPage;`
`12`		`-`
`13`		`- public iOSTranslucentNavigationBarPage(ICommand restore)`
	`11`	`+ public iOSTranslucentNavigationBarPage()`
`14`	`12`	`{`
`15`	`13`	`InitializeComponent();`
`16`		`- _returnToPlatformSpecificsPage = restore;`
`17`	`14`	`}`
`18`	`15`
`19`	`16`	`void OnTranslucentNavigationBarButtonClicked(object sender, EventArgs e)`
`@@ -23,7 +20,7 @@ void OnTranslucentNavigationBarButtonClicked(object sender, EventArgs e)`
`23`	`20`
`24`	`21`	`void OnReturnButtonClicked(object sender, EventArgs e)`
`25`	`22`	`{`
`26`		`- _returnToPlatformSpecificsPage.Execute(null);`
	`23`	`+ Navigation.PopAsync();`
`27`	`24`	`}`
`28`	`25`	`}`
`29`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,17 +2,13 @@`
`2`	`2`	`using System.Windows.Input;`
`3`	`3`	`using Microsoft.Maui.Controls.PlatformConfiguration;`
`4`	`4`	`using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;`
`5`		`-`
`6`	`5`	`namespace Maui.Controls.Sample.Pages`
`7`	`6`	`{`
`8`	`7`	`public partial class iOSTranslucentTabbedPage : Microsoft.Maui.Controls.TabbedPage`
`9`	`8`	`{`
`10`		`- ICommand returnToPlatformSpecificsPage;`
`11`		`-`
`12`		`- public iOSTranslucentTabbedPage(ICommand restore)`
	`9`	`+ public iOSTranslucentTabbedPage()`
`13`	`10`	`{`
`14`	`11`	`InitializeComponent();`
`15`		`- returnToPlatformSpecificsPage = restore;`
`16`	`12`	`}`
`17`	`13`
`18`	`14`	`void OnToggleButtonClicked(object sender, EventArgs e)`
`@@ -33,7 +29,7 @@ void OnToggleButtonClicked(object sender, EventArgs e)`
`33`	`29`
`34`	`30`	`void OnReturnButtonClicked(object sender, EventArgs e)`
`35`	`31`	`{`
`36`		`- returnToPlatformSpecificsPage.Execute(null);`
	`32`	`+ Navigation.PopAsync();`
`37`	`33`	`}`
`38`	`34`	`}`
`39`	`35`	`}`