From 5a9abe71e37c9c2e53f0c9cde223dacb9992d074 Mon Sep 17 00:00:00 2001
From: Kunal Shah <37922021+Kunal22shah@users.noreply.github.com>
Date: Tue, 18 Jun 2024 19:24:22 -0400
Subject: [PATCH] chore: remove platform specific, native commandBar styles
 (#1421)

(cherry picked from commit 9b440f00084218fa228ce60637e6b757e6c37309)
---
 .../Styles/Controls/v2/CommandBar.xaml        | 114 ++----------------
 .../Controls/CommandBarSamplePage.xaml        |  44 +++----
 .../Controls/CommandBarSamplePage.xaml.cs     |  11 +-
 .../CommandBarSample_NestedPage1.xaml         |  71 -----------
 .../CommandBarSample_NestedPage1.xaml.cs      |  59 ---------
 .../CommandBarSample_NestedPage2.xaml         |  42 -------
 .../CommandBarSample_NestedPage2.xaml.cs      |  11 --
 ...3MaterialCommandBarSample_NestedPage1.xaml |  70 -----------
 ...terialCommandBarSample_NestedPage1.xaml.cs |  59 ---------
 ...3MaterialCommandBarSample_NestedPage2.xaml |  41 -------
 ...terialCommandBarSample_NestedPage2.xaml.cs |  11 --
 .../Uno.Themes.Samples.Shared.projitems       |  28 -----
 12 files changed, 26 insertions(+), 535 deletions(-)
 delete mode 100644 src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage1.xaml
 delete mode 100644 src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage1.xaml.cs
 delete mode 100644 src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage2.xaml
 delete mode 100644 src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage2.xaml.cs
 delete mode 100644 src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage1.xaml
 delete mode 100644 src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage1.xaml.cs
 delete mode 100644 src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage2.xaml
 delete mode 100644 src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage2.xaml.cs

diff --git a/src/library/Uno.Material/Styles/Controls/v2/CommandBar.xaml b/src/library/Uno.Material/Styles/Controls/v2/CommandBar.xaml
index 8165931e2..e93428580 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/CommandBar.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/CommandBar.xaml
@@ -9,9 +9,11 @@
 					xmlns:uuc="using:Uno.UI.Controls"
 					mc:Ignorable="android ios">
 
+	<!-- Define Material properties for CommandBar -->
 	<x:Double x:Key="MaterialCommandBarElevation">4</x:Double>
 	<x:Double x:Key="MaterialCommandBarHeight">48</x:Double>
 
+	<!-- Define Material AppBarButton Style -->
 	<Style x:Key="MaterialAppBarButtonStyle"
 		   TargetType="AppBarButton">
 		<Setter Property="Height" Value="{StaticResource MaterialCommandBarHeight}" />
@@ -25,7 +27,7 @@
 			<Setter.Value>
 				<ControlTemplate TargetType="AppBarButton">
 					<um:Ripple Feedback="{TemplateBinding Foreground}"
-									 FeedbackOpacity="{StaticResource PressedOpacity}">
+							   FeedbackOpacity="{StaticResource PressedOpacity}">
 						<Viewbox x:Name="ContentViewbox"
 								 MaxHeight="{ThemeResource AppBarButtonContentHeight}"
 								 MaxWidth="{ThemeResource AppBarButtonContentHeight}"
@@ -42,126 +44,24 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-
-	<ios:ControlTemplate x:Key="NativeM3CommandBarTemplate"
-						 TargetType="CommandBar">
-		<!-- We use BorderBrush instead of Background to ensure that semi-transparent background of Grid and NativeCommandBarPresenter don't add up -->
-		<Border BorderBrush="{TemplateBinding Background}"
-				BorderThickness="{TemplateBinding Padding}"
-				Background="{TemplateBinding Background}">
-			<uuc:NativeCommandBarPresenter Height="44"/>
-		</Border>
-	</ios:ControlTemplate>
-	<android:ControlTemplate x:Key="NativeM3CommandBarTemplate"
-							 TargetType="CommandBar">
-		<uuc:NativeCommandBarPresenter />
-	</android:ControlTemplate>
-
-	<ControlTemplate x:Key="MaterialXamlCommandBarTemplate"
-					 TargetType="CommandBar">
-		<!-- Simplified CommandBar template that adds support for Uno.UI.CommandBarExtensions.NavigationCommand on Windows. -->
-		<Grid x:Name="LayoutRoot"
-			  win:Height="48"
-			  Background="{TemplateBinding Background}">
-
-			<Grid x:Name="ContentRoot"
-				  Margin="{TemplateBinding Padding}"
-				  Background="{TemplateBinding Background}"
-				  Opacity="{TemplateBinding Opacity}">
-
-				<Grid.ColumnDefinitions>
-					<ColumnDefinition Width="Auto" />
-					<ColumnDefinition Width="*" />
-					<ColumnDefinition Width="Auto" />
-				</Grid.ColumnDefinitions>
-
-				<!-- note: NavigationCommand is an AppBarButton, not ICommand -->
-				<ContentControl Content="{Binding (toolkit:CommandBarExtensions.NavigationCommand), RelativeSource={RelativeSource TemplatedParent}}"
-								Foreground="{TemplateBinding Foreground}"
-								Height="{StaticResource MaterialCommandBarHeight}"
-								Width="{StaticResource MaterialCommandBarHeight}"
-								IsTabStop="False" />
-
-				<!--
-					Use a ContentControl rather than a ContentPresenter so that IsEnabled can be set to false
-					in the Minimal/HiddenClosed states to remove it from being a tab-stop candidate.
-				-->
-				<ContentControl x:Name="ContentControl"
-								Grid.Column="1"
-								Margin="16,0"
-								Content="{TemplateBinding Content}"
-								ContentTemplate="{TemplateBinding ContentTemplate}"
-								ContentTransitions="{TemplateBinding ContentTransitions}"
-								Foreground="{TemplateBinding Foreground}"
-								HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-								VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-								HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-								VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-								IsTabStop="False" />
-
-				<ItemsControl x:Name="PrimaryItemsControl"
-							  HorizontalAlignment="Right"
-							  MinHeight="{ThemeResource AppBarThemeCompactHeight}"
-							  IsTabStop="False"
-							  Grid.Column="2">
-					<ItemsControl.ItemsPanel>
-						<ItemsPanelTemplate>
-							<StackPanel Orientation="Horizontal" />
-						</ItemsPanelTemplate>
-					</ItemsControl.ItemsPanel>
-				</ItemsControl>
-			</Grid>
-		</Grid>
-	</ControlTemplate>
-
+	<!-- Define the base style for Material CommandBar -->
 	<Style x:Key="MaterialBaseCommandBarStyle"
 		   TargetType="CommandBar">
-		<!-- Setting content to empty to avoid getting the datacontext -->
-		<Setter Property="Content" Value="" />
-		<Setter Property="ContentTemplate">
-			<Setter.Value>
-				<DataTemplate>
-					<TextBlock Text="{Binding}"
-							   Style="{StaticResource MaterialTitleLarge}" />
-				</DataTemplate>
-			</Setter.Value>
-		</Setter>
-
 		<Setter Property="Background" Value="{ThemeResource SurfaceBrush}" />
 		<Setter Property="Foreground" Value="{ThemeResource OnSurfaceBrush}" />
-
-		<android:Setter Property="(toolkit:UIElementExtensions.Elevation)"
-						Value="{StaticResource MaterialCommandBarElevation}" />
-		<Setter Property="Height" Value="{StaticResource MaterialCommandBarHeight}" />
-
 		<Setter Property="HorizontalAlignment" Value="Stretch" />
 		<Setter Property="VerticalAlignment" Value="Top" />
 		<Setter Property="HorizontalContentAlignment" Value="Left" />
 		<Setter Property="VerticalContentAlignment" Value="Center" />
-
-		<Setter Property="OverflowButtonVisibility" Value="Collapsed" />
-		<Setter Property="IsDynamicOverflowEnabled" Value="False" />
-		
-		<!-- Workaround for WinUI issue: https://github.com/microsoft/microsoft-ui-xaml/issues/6388 -->
-		<Setter Property="toolkit:CommandBarExtensions.NavigationCommand" Value="{x:Null}" />
-		
-		<Setter Property="Template" Value="{StaticResource MaterialXamlCommandBarTemplate}" />
 	</Style>
+	<!-- Define the main Material CommandBar Style -->
 	<Style x:Key="MaterialCommandBarStyle"
 		   TargetType="CommandBar"
-		   BasedOn="{StaticResource MaterialBaseCommandBarStyle}">
-		
-		<ios:Setter Property="Height" Value="NaN" />
-		<ios:Setter Property="Template"
-					Value="{StaticResource NativeM3CommandBarTemplate}" />
-		<android:Setter Property="Template"
-						Value="{StaticResource NativeM3CommandBarTemplate}" />
-	</Style>
-
+		   BasedOn="{StaticResource MaterialBaseCommandBarStyle}" />
+	<!-- Define default styles for AppBarButton and CommandBar -->
 	<Style x:Key="MaterialDefaultAppBarButtonStyle"
 		   TargetType="AppBarButton"
 		   BasedOn="{StaticResource MaterialAppBarButtonStyle}" />
-
 	<Style x:Key="MaterialDefaultCommandBarStyle"
 		   TargetType="CommandBar"
 		   BasedOn="{StaticResource MaterialCommandBarStyle}" />
diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/CommandBarSamplePage.xaml b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/CommandBarSamplePage.xaml
index 6a4bf8354..5f154f8e3 100644
--- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/CommandBarSamplePage.xaml
+++ b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/CommandBarSamplePage.xaml
@@ -6,39 +6,32 @@
 	  xmlns:sample="using:Uno.Themes.Samples"
 	  xmlns:android="http:/uno.ui/android"
 	  xmlns:ios="http:/uno.ui/ios"
+	  xmlns:smtx="using:ShowMeTheXAML"
 	  mc:Ignorable="d android ios"
 	  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
 	<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 		<sample:SamplePageLayout>
-			<sample:SamplePageLayout.MaterialTemplate>
-				<DataTemplate>
-					<StackPanel>
-						<Grid BorderBrush="{StaticResource MaterialOnSurfaceBrush}"
-							  BorderThickness="1"
-							  android:Margin="12"
-							  ios:Margin="12"
-							  Padding="12">
-
-							<Button Content="Show Sample"
-									Click="ShowSampleInNestedFrame" />
-
-						</Grid>
-					</StackPanel>
-				</DataTemplate>
-			</sample:SamplePageLayout.MaterialTemplate>
 			<sample:SamplePageLayout.M3MaterialTemplate>
 				<DataTemplate>
 					<StackPanel>
-						<Grid BorderBrush="{StaticResource OnSurfaceBrush}"
-							  BorderThickness="1"
-							  android:Margin="12"
-							  ios:Margin="12"
-							  Padding="12">
-
-							<Button Content="Show Sample"
-									Click="ShowM3SampleInNestedFrame" />
-
+						<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+							<StackPanel>
+								<smtx:XamlDisplay Margin="16"
+												  UniqueKey="CommandBarSamplePage">
+									<CommandBar Content="Command Bar Sample"
+												Style="{StaticResource MaterialCommandBarStyle}">
+										<CommandBar.PrimaryCommands>
+											<AppBarButton Icon="Add"
+														  Label="Add" />
+											<AppBarButton Icon="Edit"
+														  Label="Edit" />
+											<AppBarButton Icon="Delete"
+														  Label="Delete" />
+										</CommandBar.PrimaryCommands>
+									</CommandBar>
+								</smtx:XamlDisplay>
+							</StackPanel>
 						</Grid>
 					</StackPanel>
 				</DataTemplate>
@@ -46,4 +39,3 @@
 		</sample:SamplePageLayout>
 	</Grid>
 </Page>
-
diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/CommandBarSamplePage.xaml.cs b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/CommandBarSamplePage.xaml.cs
index 8180f0216..4a06ae75a 100644
--- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/CommandBarSamplePage.xaml.cs
+++ b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/CommandBarSamplePage.xaml.cs
@@ -1,4 +1,4 @@
-using Uno.Themes.Samples.Content.NestedSamples;
+using Uno.Themes.Samples.Content.NestedSamples;
 
 namespace Uno.Themes.Samples.Content.Controls;
 
@@ -10,13 +10,4 @@ public CommandBarSamplePage()
 	{
 		this.InitializeComponent();
 	}
-	private void ShowSampleInNestedFrame(object sender, RoutedEventArgs e)
-	{
-		Shell.GetForCurrentView()?.ShowNestedSample<CommandBarSample_NestedPage1>(clearStack: true);
-	}
-
-	private void ShowM3SampleInNestedFrame(object sender, RoutedEventArgs e)
-	{
-		Shell.GetForCurrentView()?.ShowNestedSample<M3MaterialCommandBarSample_NestedPage1>(clearStack: true);
-	}
 }
diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage1.xaml b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage1.xaml
deleted file mode 100644
index ffc22c9d2..000000000
--- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage1.xaml
+++ /dev/null
@@ -1,71 +0,0 @@
-<Page x:Class="Uno.Themes.Samples.Content.NestedSamples.CommandBarSample_NestedPage1"
-	  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	  xmlns:local="using:Uno.Themes.Samples.Content.NestedSamples"
-	  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	  xmlns:toolkit="using:Uno.UI.Toolkit"
-	  xmlns:smtx="using:ShowMeTheXAML"
-	  xmlns:todo="what should be done"
-	  xmlns:xamarin="http://uno.ui/xamarin"
-	  mc:Ignorable="d todo xamarin"
-	  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
-	<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-		<Grid.RowDefinitions>
-			<RowDefinition Height="Auto" />
-			<RowDefinition Height="*" />
-		</Grid.RowDefinitions>
-		<CommandBar Content="Material Page 1"
-					toolkit:VisibleBoundsPadding.PaddingMask="Top"
-					Style="{StaticResource MaterialCommandBarStyle}">
-			<toolkit:CommandBarExtensions.NavigationCommand>
-				<AppBarButton Click="NavigateBack"
-							  Style="{StaticResource MaterialAppBarButton}">
-					<AppBarButton.Icon>
-						<BitmapIcon UriSource="ms-appx:///Assets/BackButton.png"
-									ShowAsMonochrome="False" />
-					</AppBarButton.Icon>
-				</AppBarButton>
-			</toolkit:CommandBarExtensions.NavigationCommand>
-		</CommandBar>
-
-		<StackPanel Grid.Row="1"
-					Margin="16">
-			<TextBlock Style="{StaticResource MaterialBody1}">
-				You can use the back button located on the left side of the CommandBar
-				to exit this sample.
-			</TextBlock>
-
-			<Button Content="Exit sample"
-					Click="NavigateBack" />
-			<Button Content="Navigate to next page"
-					Click="NavigateToNextPage" />
-
-			<smtx:XamlPresenter ReferenceKey="CommandBarSample_NestedPage1_CommandBar" />
-
-			<Button x:Name="SeeCodeBehindButton"
-					Tag="See code behind"
-					Style="{StaticResource SeeSourceFlyoutButtonStyle}" />
-
-			<TextBlock Style="{StaticResource MaterialBody1}">
-				note: In order for the `MaterialCommandBarStyle` to work properly on iOS and Android,
-				you will need to present them using a `NativeDefaultFrame` in your MainPage/Shell. As shown below:
-			</TextBlock>
-
-			<smtx:XamlDisplay UniqueKey="CommandBarSample_NestedPage1_Note"
-							  Style="{StaticResource SourceOnlyXamlDisplayStyle}">
-				<Frame x:Name="ContentFrame"
-					   xamarin:Style="{StaticResource NativeDefaultFrame}" />
-			</smtx:XamlDisplay>
-
-			<TextBlock Style="{StaticResource MaterialBody1}">
-				note: In order to support native back navigations (uwp, browser, android),
-				you will have to handle the SystemNavigationManager.BackRequested event. As shown below:
-			</TextBlock>
-			<Button x:Name="SeeAdditionSetupButton"
-					Tag="See additional setup"
-					Style="{StaticResource SeeSourceFlyoutButtonStyle}" />
-		</StackPanel>
-	</Grid>
-</Page>
diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage1.xaml.cs b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage1.xaml.cs
deleted file mode 100644
index 9b9091ce2..000000000
--- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage1.xaml.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-namespace Uno.Themes.Samples.Content.NestedSamples;
-
-public sealed partial class CommandBarSample_NestedPage1 : Page
-{
-	public CommandBarSample_NestedPage1()
-	{
-		this.InitializeComponent();
-
-		this.SeeCodeBehindButton.Content = GetCodeBehind();
-		this.SeeAdditionSetupButton.Content = GetAdditionSetup();
-	}
-
-	private string GetCodeBehind()
-	{
-		return @"
-private void NavigateToNextPage(object sender, RoutedEventArgs e) =>
-	Frame.Navigate(typeof(CommandBarSample_NestedPage2));
-
-private void NavigateBack(object sender, RoutedEventArgs e) =>
-	Frame.GoBack();
-".Trim("\r\n".ToCharArray());
-	}
-
-	private string GetAdditionSetup()
-	{
-		return @"
-// in the MainPage or Shell:
-public MainPage()
-{
-	this.InitializeComponent();
-
-	SystemNavigationManager.GetForCurrentView().BackRequested += OnBackRequested;
-}
-
-private void OnBackRequested(object sender, BackRequestedEventArgs e)
-{
-	if (ContentFrame.CanGoBack)
-	{
-		ContentFrame.GoBack();
-
-		// prevent default behaviors (android: back to home screen, browser: navigate back)
-		// since we just handled in app.
-		e.Handled = true;
-	}
-}
-".Trim("\r\n".ToCharArray());
-	}
-
-	private void NavigateToNextPage(object sender, RoutedEventArgs e) =>
-		Frame.Navigate(typeof(CommandBarSample_NestedPage2));
-
-	private void NavigateBack(object sender, RoutedEventArgs e)
-	{
-		// Normally we would've just called `Frame.GoBack();` if we only have a single frame.
-		// However, a nested frame is used to show-case fullscreen sample, so we need some
-		// custom handling to hide the nested frame on back navigation when the stack is empty.
-		Shell.GetForCurrentView()?.BackNavigateFromNestedSample();
-	}
-}
diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage2.xaml b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage2.xaml
deleted file mode 100644
index fe4f534a2..000000000
--- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage2.xaml
+++ /dev/null
@@ -1,42 +0,0 @@
-<Page x:Class="Uno.Themes.Samples.Content.NestedSamples.CommandBarSample_NestedPage2"
-	  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	  xmlns:local="using:Uno.Themes.Samples.Content.NestedSamples"
-	  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	  xmlns:toolkit="using:Uno.UI.Toolkit"
-	  xmlns:xamarin="http:/uno.ui/xamarin"
-	  mc:Ignorable="d xamarin"
-	  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
-	<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-		<Grid.RowDefinitions>
-			<RowDefinition Height="Auto" />
-			<RowDefinition Height="*" />
-		</Grid.RowDefinitions>
-
-		<CommandBar Content="Material Page 2"
-					toolkit:VisibleBoundsPadding.PaddingMask="Top"
-					Style="{StaticResource MaterialCommandBarStyle}">
-			<toolkit:CommandBarExtensions.NavigationCommand>
-				<AppBarButton Click="NavigateBack"
-							  Style="{StaticResource MaterialAppBarButton}">
-					<AppBarButton.Icon>
-						<BitmapIcon UriSource="ms-appx:///Assets/BackButton.png"
-									ShowAsMonochrome="False" />
-					</AppBarButton.Icon>
-				</AppBarButton>
-			</toolkit:CommandBarExtensions.NavigationCommand>
-		</CommandBar>
-
-		<StackPanel Grid.Row="1" Margin="16">
-			<TextBlock Style="{StaticResource MaterialBody1}">
-				You can use the back button located on the left side of the CommandBar
-				to navigate back.
-			</TextBlock>
-
-			<Button Content="Navigate Back"
-					Click="NavigateBack" />
-		</StackPanel>
-	</Grid>
-</Page>
diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage2.xaml.cs b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage2.xaml.cs
deleted file mode 100644
index befed4902..000000000
--- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/CommandBarSample_NestedPage2.xaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Uno.Themes.Samples.Content.NestedSamples;
-
-public sealed partial class CommandBarSample_NestedPage2 : Page
-{
-	public CommandBarSample_NestedPage2()
-	{
-		this.InitializeComponent();
-	}
-
-	private void NavigateBack(object sender, RoutedEventArgs e) => Frame.GoBack();
-}
diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage1.xaml b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage1.xaml
deleted file mode 100644
index 374b11532..000000000
--- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage1.xaml
+++ /dev/null
@@ -1,70 +0,0 @@
-<Page x:Class="Uno.Themes.Samples.Content.NestedSamples.M3MaterialCommandBarSample_NestedPage1"
-	  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	  xmlns:local="using:Uno.Themes.Samples.Content.NestedSamples"
-	  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	  xmlns:toolkit="using:Uno.UI.Toolkit"
-	  xmlns:smtx="using:ShowMeTheXAML"
-	  xmlns:todo="what should be done"
-	  xmlns:xamarin="http://uno.ui/xamarin"
-	  mc:Ignorable="d todo xamarin"
-	  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
-	<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-		<Grid.RowDefinitions>
-			<RowDefinition Height="Auto" />
-			<RowDefinition Height="*" />
-		</Grid.RowDefinitions>
-		<CommandBar Content="Material Page 1"
-					toolkit:VisibleBoundsPadding.PaddingMask="Top"
-					Style="{StaticResource MaterialCommandBarStyle}">
-			<toolkit:CommandBarExtensions.NavigationCommand>
-				<AppBarButton Click="NavigateBack"
-							  Style="{StaticResource MaterialAppBarButtonStyle}">
-					<AppBarButton.Icon>
-						<BitmapIcon UriSource="ms-appx:///Assets/BackButton.png" />
-					</AppBarButton.Icon>
-				</AppBarButton>
-			</toolkit:CommandBarExtensions.NavigationCommand>
-		</CommandBar>
-
-		<StackPanel Grid.Row="1"
-					Margin="16">
-			<TextBlock Style="{StaticResource BodySmall}">
-				You can use the back button located on the left side of the CommandBar
-				to exit this sample.
-			</TextBlock>
-
-			<Button Content="Exit sample"
-					Click="NavigateBack" />
-			<Button Content="Navigate to next page"
-					Click="NavigateToNextPage" />
-
-			<smtx:XamlPresenter ReferenceKey="MaterialM3_CommandBarSample_NestedPage1_CommandBar" />
-
-			<Button x:Name="SeeCodeBehindButton"
-					Tag="See code behind"
-					Style="{StaticResource SeeSourceFlyoutButtonStyle}" />
-
-			<TextBlock Style="{StaticResource BodySmall}">
-				note: In order for the `MaterialCommandBarStyle` to work properly on iOS and Android,
-				you will need to present them using a `NativeDefaultFrame` in your MainPage/Shell. As shown below:
-			</TextBlock>
-
-			<smtx:XamlDisplay UniqueKey="MaterialM3_CommandBarSample_NestedPage1_Note"
-							  Style="{StaticResource SourceOnlyXamlDisplayStyle}">
-				<Frame x:Name="ContentFrame"
-					   xamarin:Style="{StaticResource NativeDefaultFrame}" />
-			</smtx:XamlDisplay>
-
-			<TextBlock Style="{StaticResource BodySmall}">
-				note: In order to support native back navigations (uwp, browser, android),
-				you will have to handle the SystemNavigationManager.BackRequested event. As shown below:
-			</TextBlock>
-			<Button x:Name="SeeAdditionSetupButton"
-					Tag="See additional setup"
-					Style="{StaticResource SeeSourceFlyoutButtonStyle}" />
-		</StackPanel>
-	</Grid>
-</Page>
diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage1.xaml.cs b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage1.xaml.cs
deleted file mode 100644
index 10a812476..000000000
--- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage1.xaml.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-namespace Uno.Themes.Samples.Content.NestedSamples;
-
-public sealed partial class M3MaterialCommandBarSample_NestedPage1 : Page
-{
-	public M3MaterialCommandBarSample_NestedPage1()
-	{
-		this.InitializeComponent();
-
-		this.SeeCodeBehindButton.Content = GetCodeBehind();
-		this.SeeAdditionSetupButton.Content = GetAdditionSetup();
-	}
-
-	private string GetCodeBehind()
-	{
-		return @"
-private void NavigateToNextPage(object sender, RoutedEventArgs e) =>
-	Frame.Navigate(typeof(CommandBarSample_NestedPage2));
-
-private void NavigateBack(object sender, RoutedEventArgs e) =>
-	Frame.GoBack();
-".Trim("\r\n".ToCharArray());
-	}
-
-	private string GetAdditionSetup()
-	{
-		return @"
-// in the MainPage or Shell:
-public MainPage()
-{
-	this.InitializeComponent();
-
-	SystemNavigationManager.GetForCurrentView().BackRequested += OnBackRequested;
-}
-
-private void OnBackRequested(object sender, BackRequestedEventArgs e)
-{
-	if (ContentFrame.CanGoBack)
-	{
-		ContentFrame.GoBack();
-
-		// prevent default behaviors (android: back to home screen, browser: navigate back)
-		// since we just handled in app.
-		e.Handled = true;
-	}
-}
-".Trim("\r\n".ToCharArray());
-	}
-
-	private void NavigateToNextPage(object sender, RoutedEventArgs e) =>
-		Frame.Navigate(typeof(M3MaterialCommandBarSample_NestedPage2));
-
-	private void NavigateBack(object sender, RoutedEventArgs e)
-	{
-		// Normally we would've just called `Frame.GoBack();` if we only have a single frame.
-		// However, a nested frame is used to show-case fullscreen sample, so we need some
-		// custom handling to hide the nested frame on back navigation when the stack is empty.
-		Shell.GetForCurrentView()?.BackNavigateFromNestedSample();
-	}
-}
diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage2.xaml b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage2.xaml
deleted file mode 100644
index 4c07041a1..000000000
--- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage2.xaml
+++ /dev/null
@@ -1,41 +0,0 @@
-<Page x:Class="Uno.Themes.Samples.Content.NestedSamples.M3MaterialCommandBarSample_NestedPage2"
-	  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	  xmlns:local="using:Uno.Themes.Samples.Content.NestedSamples"
-	  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	  xmlns:toolkit="using:Uno.UI.Toolkit"
-	  xmlns:xamarin="http:/uno.ui/xamarin"
-	  mc:Ignorable="d xamarin"
-	  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
-	<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-		<Grid.RowDefinitions>
-			<RowDefinition Height="Auto" />
-			<RowDefinition Height="*" />
-		</Grid.RowDefinitions>
-
-		<CommandBar Content="Material Page 2"
-					toolkit:VisibleBoundsPadding.PaddingMask="Top"
-					Style="{StaticResource MaterialCommandBarStyle}">
-			<toolkit:CommandBarExtensions.NavigationCommand>
-				<AppBarButton Click="NavigateBack"
-							  Style="{StaticResource MaterialAppBarButtonStyle}">
-					<AppBarButton.Icon>
-						<BitmapIcon UriSource="ms-appx:///Assets/BackButton.png" />
-					</AppBarButton.Icon>
-				</AppBarButton>
-			</toolkit:CommandBarExtensions.NavigationCommand>
-		</CommandBar>
-
-		<StackPanel Grid.Row="1" Margin="16">
-			<TextBlock Style="{StaticResource BodySmall}">
-				You can use the back button located on the left side of the CommandBar
-				to navigate back.
-			</TextBlock>
-
-			<Button Content="Navigate Back"
-					Click="NavigateBack" />
-		</StackPanel>
-	</Grid>
-</Page>
diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage2.xaml.cs b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage2.xaml.cs
deleted file mode 100644
index 58b77bd3a..000000000
--- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/NestedSamples/M3MaterialCommandBarSample_NestedPage2.xaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Uno.Themes.Samples.Content.NestedSamples;
-
-public sealed partial class M3MaterialCommandBarSample_NestedPage2 : Page
-{
-	public M3MaterialCommandBarSample_NestedPage2()
-	{
-		this.InitializeComponent();
-	}
-
-	private void NavigateBack(object sender, RoutedEventArgs e) => Frame.GoBack();
-}
diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Uno.Themes.Samples.Shared.projitems b/src/samples/UWP/Uno.Themes.Samples.Shared/Uno.Themes.Samples.Shared.projitems
index b67885b51..dc6be5309 100644
--- a/src/samples/UWP/Uno.Themes.Samples.Shared/Uno.Themes.Samples.Shared.projitems
+++ b/src/samples/UWP/Uno.Themes.Samples.Shared/Uno.Themes.Samples.Shared.projitems
@@ -109,18 +109,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Content\Extensions\ControlExtensionsSamplePage.xaml.cs">
       <DependentUpon>ControlExtensionsSamplePage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Content\NestedSamples\M3MaterialCommandBarSample_NestedPage1.xaml.cs">
-      <DependentUpon>M3MaterialCommandBarSample_NestedPage1.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Content\NestedSamples\CommandBarSample_NestedPage1.xaml.cs">
-      <DependentUpon>CommandBarSample_NestedPage1.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Content\NestedSamples\M3MaterialCommandBarSample_NestedPage2.xaml.cs">
-      <DependentUpon>M3MaterialCommandBarSample_NestedPage2.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Content\NestedSamples\CommandBarSample_NestedPage2.xaml.cs">
-      <DependentUpon>CommandBarSample_NestedPage2.xaml</DependentUpon>
-    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Content\NestedSamples\MediaPlayerElementSample_NestedPage1.xaml.cs">
       <DependentUpon>MediaPlayerElementSample_NestedPage1.xaml</DependentUpon>
     </Compile>
@@ -291,22 +279,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Content\NestedSamples\M3MaterialCommandBarSample_NestedPage1.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Content\NestedSamples\CommandBarSample_NestedPage1.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Content\NestedSamples\M3MaterialCommandBarSample_NestedPage2.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Content\NestedSamples\CommandBarSample_NestedPage2.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Content\NestedSamples\MediaPlayerElementSample_NestedPage1.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>