Removed Duplicate resources for TopNavigationViewItem style brushes

microsoft · Sep 18, 2021 · ee70ad9 · ee70ad9
1 parent bb516c6
commit ee70ad9
Show file tree

Hide file tree

Showing 7 changed files with 1,774 additions and 1,154 deletions.
diff --git a/dev/NavigationView/NavigationView.xaml b/dev/NavigationView/NavigationView.xaml
diff --git a/dev/NavigationView/NavigationView_rs1_themeresources.xaml b/dev/NavigationView/NavigationView_rs1_themeresources.xaml
@@ -74,9 +74,6 @@
             <StaticResource x:Key="TopNavigationViewItemForegroundSelected" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="TopNavigationViewItemForegroundSelectedPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="TopNavigationViewItemForegroundSelectedPressed" ResourceKey="TextFillColorTertiaryBrush" />
-            <StaticResource x:Key="TopNavigationViewItemBackgroundPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
-            <StaticResource x:Key="TopNavigationViewItemBackgroundPressed" ResourceKey="SubtleFillColorTransparentBrush" />
-            <StaticResource x:Key="TopNavigationViewItemBackgroundSelected" ResourceKey="SubtleFillColorTransparentBrush" />
             <StaticResource x:Key="TopNavigationViewItemBackgroundSelectedPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
             <StaticResource x:Key="TopNavigationViewItemBackgroundSelectedPressed" ResourceKey="SubtleFillColorTransparentBrush" />
 
@@ -146,9 +143,6 @@
             <StaticResource x:Key="TopNavigationViewItemForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="TopNavigationViewItemForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="TopNavigationViewItemForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
-            <StaticResource x:Key="TopNavigationViewItemBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
-            <StaticResource x:Key="TopNavigationViewItemBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
-            <StaticResource x:Key="TopNavigationViewItemBackgroundSelected" ResourceKey="SubtleFillColorSecondaryBrush" />
             <StaticResource x:Key="TopNavigationViewItemForegroundSelected" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="TopNavigationViewItemForegroundSelectedPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="TopNavigationViewItemForegroundSelectedPressed" ResourceKey="TextFillColorTertiaryBrush" />

diff --git a/dev/NavigationView/NavigationView_v1.xaml b/dev/NavigationView/NavigationView_v1.xaml
diff --git a/dev/NavigationView/TestUI/Common/NavigationViewPage.xaml b/dev/NavigationView/TestUI/Common/NavigationViewPage.xaml
diff --git a/dev/NavigationView/TestUI/NavigationViewCaseBundle.xaml b/dev/NavigationView/TestUI/NavigationViewCaseBundle.xaml
@@ -1,63 +1,206 @@
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<!--  Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information.  -->
 <local:TestPage
     x:Class="MUXControlsTestApp.NavigationViewCaseBundle"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:MUXControlsTestApp"
-    xmlns:muxcontrols="using:Microsoft.UI.Xaml.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:MUXControlsTestApp"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:muxcontrols="using:Microsoft.UI.Xaml.Controls"
     mc:Ignorable="d">
 
-    <VariableSizedWrapGrid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-            Orientation="Horizontal">
+    <VariableSizedWrapGrid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Orientation="Horizontal">
         <VariableSizedWrapGrid.Resources>
             <Style TargetType="StackPanel">
-                <Setter Property="Margin" Value="4"/>
+                <Setter Property="Margin" Value="4" />
                 <Setter Property="MaxWidth" Value="400" />
                 <Setter Property="MinWidth" Value="200" />
             </Style>
         </VariableSizedWrapGrid.Resources>
 
         <StackPanel>
-            <TextBlock Text="Common tests"/>
-            <Button x:Name="NavigationViewPage" AutomationProperties.Name="NavigationView Test" Margin="2" HorizontalAlignment="Stretch">NavigationView Test</Button>
-            <Button x:Name="NavigationViewInfoBadgePage" AutomationProperties.Name="NavigationView Info Badge Test" Margin="2" HorizontalAlignment="Stretch">NavigationView InfoBadge Test</Button>
-            <Button x:Name="NavigationViewCompactPaneLengthTestPage" AutomationProperties.Name="NavigationView compact pane length test" Margin="2" HorizontalAlignment="Stretch">NavigationView compact pane length test</Button>
-            <Button x:Name="NavigationViewPageDataContext" AutomationProperties.Name="NavigationViewPageDataContext" Margin="2" HorizontalAlignment="Stretch">NavigationView DataContext</Button>
-            <Button x:Name="NavigateToSelectedItemEdgeCasePage" AutomationProperties.Name="SelectedItem edge case test" Margin="2" HorizontalAlignment="Stretch">SelectedItem edge Case Test</Button>
-            <Button x:Name="NavigateToInitPage" AutomationProperties.Name="NavigationView Init Test" Margin="2" HorizontalAlignment="Stretch">NavigationView Init Test</Button>
-            <Button x:Name="NavigateToStretchPage" AutomationProperties.Name="NavigationView Stretch Test" Margin="2" HorizontalAlignment="Stretch">NavigationView Stretch Test</Button>
-            <Button x:Name="NavigateToAnimationPage" AutomationProperties.Name="Navigation Animation Test" Margin="2" HorizontalAlignment="Stretch">Navigation Animation Test</Button>
-            <Button x:Name="NavigateToIsPaneOpenPage" AutomationProperties.Name="Navigation IsPaneOpen Test" Margin="2" HorizontalAlignment="Stretch">Navigation IsPaneOpen Test</Button>
-            <Button x:Name="NavigateToMinimalPage" AutomationProperties.Name="Navigation Minimal Test" Margin="2" HorizontalAlignment="Stretch">Navigation Minimal Test</Button>
-            <Button x:Name="NavigationViewBlankPage1" AutomationProperties.Name="NavigationView Blank Test1" Margin="2" HorizontalAlignment="Stretch">NavigationView Blank Test1</Button>
-            <Button x:Name="NavigationViewMenuItemStretchPageButton" AutomationProperties.Name="NavigationView Menuitem Stretch Test" Margin="2" HorizontalAlignment="Stretch">NavigationView Menuitem Stretch Test</Button>
+            <TextBlock Text="Common tests" />
+            <Button
+                x:Name="NavigationViewPage"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="NavigationView Test">
+                NavigationView Test
+            </Button>
+            <Button
+                x:Name="NavigationViewInfoBadgePage"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="NavigationView Info Badge Test">
+                NavigationView InfoBadge Test
+            </Button>
+            <Button
+                x:Name="NavigationViewCompactPaneLengthTestPage"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="NavigationView compact pane length test">
+                NavigationView compact pane length test
+            </Button>
+            <Button
+                x:Name="NavigationViewPageDataContext"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="NavigationViewPageDataContext">
+                NavigationView DataContext
+            </Button>
+            <Button
+                x:Name="NavigateToSelectedItemEdgeCasePage"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="SelectedItem edge case test">
+                SelectedItem edge Case Test
+            </Button>
+            <Button
+                x:Name="NavigateToInitPage"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="NavigationView Init Test">
+                NavigationView Init Test
+            </Button>
+            <Button
+                x:Name="NavigateToStretchPage"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="NavigationView Stretch Test">
+                NavigationView Stretch Test
+            </Button>
+            <Button
+                x:Name="NavigateToAnimationPage"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="Navigation Animation Test">
+                Navigation Animation Test
+            </Button>
+            <Button
+                x:Name="NavigateToIsPaneOpenPage"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="Navigation IsPaneOpen Test">
+                Navigation IsPaneOpen Test
+            </Button>
+            <Button
+                x:Name="NavigateToMinimalPage"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="Navigation Minimal Test">
+                Navigation Minimal Test
+            </Button>
+            <Button
+                x:Name="NavigationViewBlankPage1"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="NavigationView Blank Test1">
+                NavigationView Blank Test1
+            </Button>
+            <Button
+                x:Name="NavigationViewMenuItemStretchPageButton"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="NavigationView Menuitem Stretch Test">
+                NavigationView Menuitem Stretch Test
+            </Button>
             <TextBlock Text="Hierarchy Tests" />
-            <Button x:Name="NavigateToHierarchicalNavigationViewMarkupPage" AutomationProperties.Name="HierarchicalNavigationView Markup Test" Margin="2" HorizontalAlignment="Stretch">Hierarchical NavigationView Markup Test</Button>
-            <Button x:Name="NavigateToHierarchicalNavigationViewDataBindingPage" AutomationProperties.Name="HierarchicalNavigationView DataBinding Test" Margin="2" HorizontalAlignment="Stretch">Hierarchical NavigationView DataBinding Test</Button>
+            <Button
+                x:Name="NavigateToHierarchicalNavigationViewMarkupPage"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="HierarchicalNavigationView Markup Test">
+                Hierarchical NavigationView Markup Test
+            </Button>
+            <Button
+                x:Name="NavigateToHierarchicalNavigationViewDataBindingPage"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="HierarchicalNavigationView DataBinding Test">
+                Hierarchical NavigationView DataBinding Test
+            </Button>
         </StackPanel>
 
         <StackPanel>
-            <TextBlock Text="Top mode tests"/>
-            <Button x:Name="NavigationViewTopNavPage" AutomationProperties.Name="NavigationView TopNav Test" Margin="2" HorizontalAlignment="Stretch">NavigationView TopNav Test</Button>
-            <Button x:Name="NavigationViewTopNavOnlyPage" AutomationProperties.Name="Top NavigationView Test" Margin="2" HorizontalAlignment="Stretch">Top NavigationView Test</Button>
-            <Button x:Name="NavigationViewTopNavStorePage" AutomationProperties.Name="Top NavigationView Store Test" Margin="2" HorizontalAlignment="Stretch">Top NavigationView Store Test</Button>
-            <Button x:Name="NavigateToTopNavOverflowButtonPage" AutomationProperties.Name="Top NavigationView Overflow Button Test" Margin="2" HorizontalAlignment="Stretch">Top NavigationView Overflow Button Test</Button>
+            <TextBlock Text="Top mode tests" />
+            <Button
+                x:Name="NavigationViewTopNavPage"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="NavigationView TopNav Test">
+                NavigationView TopNav Test
+            </Button>
+            <Button
+                x:Name="NavigationViewTopNavOnlyPage"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="Top NavigationView Test">
+                Top NavigationView Test
+            </Button>
+            <Button
+                x:Name="NavigationViewTopNavStorePage"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="Top NavigationView Store Test">
+                Top NavigationView Store Test
+            </Button>
+            <Button
+                x:Name="NavigateToTopNavOverflowButtonPage"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="Top NavigationView Overflow Button Test">
+                Top NavigationView Overflow Button Test
+            </Button>
 
-            <TextBlock Text="Footer item tests"/>
-            <Button x:Name="PaneLayoutTestPageButton" AutomationProperties.Name="PaneLayoutTestPage" Margin="2" HorizontalAlignment="Stretch">PaneLayoutTestPage</Button>
-            <Button x:Name="PaneFooterTestPageButton" AutomationProperties.Name="PaneFooterTestPage" Margin="2" HorizontalAlignment="Stretch">PaneFooterTestPage</Button>
+            <TextBlock Text="Footer item tests" />
+            <Button
+                x:Name="PaneLayoutTestPageButton"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="PaneLayoutTestPage">
+                PaneLayoutTestPage
+            </Button>
+            <Button
+                x:Name="PaneFooterTestPageButton"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="PaneFooterTestPage">
+                PaneFooterTestPage
+            </Button>
         </StackPanel>
 
         <StackPanel>
-            <TextBlock Text="Regression tests"/>
-            <Button x:Name="NavigationViewRS4Page" AutomationProperties.Name="NavigationView Regression Test" Margin="2" HorizontalAlignment="Stretch">NavigationView Regression Test</Button>
-            <Button x:Name="NavigateToRS3Page" AutomationProperties.Name="NavigationView PreserveRS3 Test" Margin="2" HorizontalAlignment="Stretch">NavigationView PreserveRS3 Test</Button>
+            <TextBlock Text="Regression tests" />
+            <Button
+                x:Name="NavigationViewRS4Page"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="NavigationView Regression Test">
+                NavigationView Regression Test
+            </Button>
+            <Button
+                x:Name="NavigateToRS3Page"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="NavigationView PreserveRS3 Test">
+                NavigationView PreserveRS3 Test
+            </Button>
 
-            <TextBlock Text="Custom resources"/>
-            <Button x:Name="NavigateToItemTemplatePage" AutomationProperties.Name="NavigationView ItemTemplate Test" Margin="2" HorizontalAlignment="Stretch">NavigationView ItemTemplate Test</Button>
-            <Button x:Name="NavigateToCustomThemeResourcesPage" AutomationProperties.Name="NavigationView custom ThemeResources Test" Margin="2" HorizontalAlignment="Stretch">NavigationView with custom ThemeResources Test</Button>
+            <TextBlock Text="Custom resources" />
+            <Button
+                x:Name="NavigateToItemTemplatePage"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="NavigationView ItemTemplate Test">
+                NavigationView ItemTemplate Test
+            </Button>
+            <Button
+                x:Name="NavigateToCustomThemeResourcesPage"
+                Margin="2"
+                HorizontalAlignment="Stretch"
+                AutomationProperties.Name="NavigationView custom ThemeResources Test">
+                NavigationView with custom ThemeResources Test
+            </Button>
         </StackPanel>
     </VariableSizedWrapGrid>
 </local:TestPage>
diff --git a/test/TestAppCX/App.xaml b/test/TestAppCX/App.xaml
@@ -1,4 +1,4 @@
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<!--  Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information.  -->
 <Application
     x:Class="TestAppCX.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"