chore: removing nested commandBar samples

unoplatform · Jun 18, 2024 · 4f4f04e · 4f4f04e
1 parent 106ba62
commit 4f4f04e
Showing 1 changed file with 27 additions and 37 deletions.
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
@@ -6,44 +6,34 @@
 	  xmlns:sample="using:Uno.Themes.Samples"
 	  xmlns:android="http:/uno.ui/android"
 	  xmlns:ios="http:/uno.ui/ios"
+	  xmlns:showMeTheXaml="clr-namespace:ShowMeTheXAML;assembly=Uno.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>
-					</StackPanel>
-				</DataTemplate>
-			</sample:SamplePageLayout.M3MaterialTemplate>
-		</sample:SamplePageLayout>
-	</Grid>
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <sample:SamplePageLayout>
+            <sample:SamplePageLayout.M3MaterialTemplate>
+                <DataTemplate>
+                    <StackPanel>
+                        <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+                            <StackPanel>
+                                <showMeTheXaml:XamlDisplay Margin="16" UniqueKey="CommandBarSamplePage">
+                                    <CommandBar
+                                        toolkit:VisibleBoundsPadding.PaddingMask="Top"
+                                        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>
+                                </showMeTheXaml:XamlDisplay>
+                            </StackPanel>
+                        </Grid>
+                    </StackPanel>
+                </DataTemplate>
+            </sample:SamplePageLayout.M3MaterialTemplate>
+        </sample:SamplePageLayout>
+    </Grid>
 </Page>
-