Adding new Secondary styles which will eventually replace Accent styles (#3080)

Keboo · web-flow · commit da59c4c39582 · 2023-02-11T09:29:22.000Z
The accent styles will continue to exist, but will likely be delete in the 5.0.0 release.
diff --git a/.github/workflows/build_artifacts.yml b/.github/workflows/build_artifacts.yml
@@ -59,7 +59,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: Screenshots-${{ github.run_number }}
-          path: ${{ github.workspace }}/MaterialDesignThemes.UITests/bin/${{ inputs.build-configuration }}/net7.0-windows/Screenshots
+          path: ${{ github.workspace }}\MaterialDesignThemes.UITests\bin\${{ inputs.build-configuration }}\net6.0-windows\Screenshots
           if-no-files-found: ignore
 
       - name: Build NuGets
@@ -75,4 +75,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: DemoApp
-          path: "MainDemo.Wpf/bin/${{ env.buildConfiguration }}"
+          path: "MainDemo.Wpf/bin/${{ env.buildConfiguration }}"
diff --git a/MainDemo.Wpf/Buttons.xaml b/MainDemo.Wpf/Buttons.xaml
@@ -399,7 +399,7 @@
                     Content="MID"
                     IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
                     Style="{StaticResource MaterialDesignFlatSecondaryMidBgButton}"
-                    ToolTip="MaterialDesignFlatAccentBackgroundButton" />
+                    ToolTip="MaterialDesignFlatSecondaryMidBgButton" />
           </smtx:XamlDisplay>
 
           <smtx:XamlDisplay Margin="8,0" UniqueKey="buttons_flat_bg_6">
@@ -464,17 +464,17 @@
                     materialDesign:RippleAssist.Feedback="#DD000000"
                     Content="CUSTOM RIPPLE"
                     IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
-                    Style="{StaticResource MaterialDesignRaisedAccentButton}"
-                    ToolTip="Resource name: MaterialDesignRaisedAccentButton" />
+                    Style="{StaticResource MaterialDesignRaisedSecondaryButton}"
+                    ToolTip="Resource name: MaterialDesignRaisedSecondaryButton" />
           </smtx:XamlDisplay>
 
           <smtx:XamlDisplay Margin="8,0" UniqueKey="buttons_22">
             <Button Width="{StaticResource ButtonWidth}"
                     materialDesign:RippleAssist.IsDisabled="True"
                     Content="NO RIPPLE"
                     IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
-                    Style="{StaticResource MaterialDesignRaisedAccentButton}"
-                    ToolTip="Resource name: MaterialDesignRaisedAccentButton" />
+                    Style="{StaticResource MaterialDesignRaisedSecondaryButton}"
+                    ToolTip="Resource name: MaterialDesignRaisedSecondaryButton" />
           </smtx:XamlDisplay>
 
           <smtx:XamlDisplay Margin="8,0" UniqueKey="buttons_23">
@@ -572,8 +572,8 @@
           <Button Height="{StaticResource ButtonHeight}"
                   materialDesign:ButtonAssist.CornerRadius="25 25 0 0"
                   IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
-                  Style="{StaticResource MaterialDesignRaisedAccentButton}"
-                  ToolTip="MaterialDesignRaisedAccentButton with Round Top Corners">
+                  Style="{StaticResource MaterialDesignRaisedSecondaryButton}"
+                  ToolTip="MaterialDesignRaisedSecondaryButton with Round Top Corners">
             <TextBlock Text="25/50 Radius" />
           </Button>
         </Grid>
@@ -756,7 +756,7 @@
                   materialDesign:ButtonProgressAssist.Value="50"
                   Content="{materialDesign:PackIcon DotsHorizontal}"
                   IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
-                  Style="{StaticResource MaterialDesignFloatingActionAccentButton}" />
+                  Style="{StaticResource MaterialDesignFloatingActionSecondaryButton}" />
         </smtx:XamlDisplay>
 
         <smtx:XamlDisplay Margin="8,0" UniqueKey="buttons_31">
@@ -894,10 +894,10 @@
       <smtx:XamlDisplay Margin="8,0,0,5" UniqueKey="buttons_11">
         <materialDesign:PopupBox IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
                                  PlacementMode="BottomAndAlignCentres"
-                                 Style="{StaticResource MaterialDesignMultiFloatingActionAccentPopupBox}"
+                                 Style="{StaticResource MaterialDesignMultiFloatingActionSecondaryPopupBox}"
                                  ToggleCheckedContentCommand="{Binding FloatingActionDemoCommand}"
                                  ToggleCheckedContentCommandParameter="wowsers"
-                                 ToolTip="PopupBox, Style MaterialDesignMultiFloatingActionAccentPopupBox">
+                                 ToolTip="PopupBox, Style MaterialDesignMultiFloatingActionSecondaryPopupBox">
           <materialDesign:PopupBox.ToggleCheckedContent>
             <materialDesign:PackIcon Width="24"
                                      Height="24"
@@ -949,9 +949,9 @@
 
     <StackPanel Grid.Row="13" Orientation="Horizontal">
       <smtx:XamlDisplay Margin="0,0,20,0" UniqueKey="button_duration_1">
-        <Button materialDesign:ShadowAssist.ShadowAnimationDuration="0:0:0" Style="{StaticResource MaterialDesignRaisedAccentButton}">
-          Instant Duration
-        </Button>
+        <Button materialDesign:ShadowAssist.ShadowAnimationDuration="0:0:0"
+                Style="{StaticResource MaterialDesignRaisedSecondaryButton}"
+                Content="Instant Duration" />
       </smtx:XamlDisplay>
       <smtx:XamlDisplay Margin="0,0,20,0" UniqueKey="button_duration_2">
         <Button>
@@ -965,4 +965,4 @@
       </smtx:XamlDisplay>
     </StackPanel>
   </Grid>
-</UserControl>
+</UserControl>
diff --git a/MainDemo.Wpf/Cards.xaml b/MainDemo.Wpf/Cards.xaml
@@ -38,7 +38,7 @@
                   Margin="0,0,16,-20"
                   HorizontalAlignment="Right"
                   VerticalAlignment="Bottom"
-                  Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}">
+                  Style="{StaticResource MaterialDesignFloatingActionMiniSecondaryButton}">
             <materialDesign:PackIcon Kind="Bike" />
           </Button>
           <StackPanel Grid.Row="1" Margin="8,24,8,0">
@@ -92,7 +92,7 @@
                   Margin="0,0,16,-20"
                   HorizontalAlignment="Right"
                   VerticalAlignment="Bottom"
-                  Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}">
+                  Style="{StaticResource MaterialDesignFloatingActionMiniSecondaryButton}">
             <materialDesign:PackIcon Kind="Bike" />
           </Button>
           <StackPanel Grid.Row="1" Margin="8,24,8,0">
@@ -148,7 +148,7 @@
                   Margin="0,0,16,-20"
                   HorizontalAlignment="Right"
                   VerticalAlignment="Bottom"
-                  Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}">
+                  Style="{StaticResource MaterialDesignFloatingActionMiniSecondaryButton}">
             <materialDesign:PackIcon Kind="ShareVariant" />
           </Button>
           <StackPanel Grid.Row="1" Margin="8,24,8,4">
diff --git a/MainDemo.Wpf/Chips.xaml b/MainDemo.Wpf/Chips.xaml
@@ -159,7 +159,7 @@
         </smtx:XamlDisplay>
 
         <smtx:XamlDisplay Margin="0,0,4,4" UniqueKey="chips_12">
-          <CheckBox IsChecked="True" Style="{StaticResource MaterialDesignFilterChipAccentCheckBox}">Secondary</CheckBox>
+          <CheckBox IsChecked="True" Style="{StaticResource MaterialDesignFilterChipSecondaryCheckBox}">Secondary</CheckBox>
         </smtx:XamlDisplay>
       </WrapPanel>
 
@@ -179,7 +179,7 @@
         <smtx:XamlDisplay Margin="0,0,4,4" UniqueKey="chips_15">
           <CheckBox Content="Secondary Outline"
                     IsChecked="True"
-                    Style="{StaticResource MaterialDesignFilterChipAccentOutlineCheckBox}" />
+                    Style="{StaticResource MaterialDesignFilterChipSecondaryOutlineCheckBox}" />
         </smtx:XamlDisplay>
       </WrapPanel>
 
@@ -208,7 +208,7 @@
 
         <materialDesign:Card Margin="4">
           <smtx:XamlDisplay Margin="4" UniqueKey="chips_18">
-            <ListBox Style="{StaticResource MaterialDesignFilterChipAccentListBox}">
+            <ListBox Style="{StaticResource MaterialDesignFilterChipSecondaryListBox}">
               <ListBoxItem Content="Mercury" />
               <ListBoxItem Content="Venus" IsSelected="True" />
               <ListBoxItem Content="Earth" />
@@ -243,7 +243,7 @@
 
         <materialDesign:Card Margin="4">
           <smtx:XamlDisplay Margin="4" UniqueKey="chips_21">
-            <ListBox Style="{StaticResource MaterialDesignFilterChipAccentOutlineListBox}">
+            <ListBox Style="{StaticResource MaterialDesignFilterChipSecondaryOutlineListBox}">
               <ListBoxItem Content="Mercury" />
               <ListBoxItem Content="Venus" IsSelected="True" />
               <ListBoxItem Content="Earth" />
@@ -279,7 +279,7 @@
         <smtx:XamlDisplay Margin="0,0,4,4" UniqueKey="chips_24">
           <RadioButton Content="Secondary"
                        GroupName="GroupChoiceChip"
-                       Style="{StaticResource MaterialDesignChoiceChipAccentRadioButton}" />
+                       Style="{StaticResource MaterialDesignChoiceChipSecondaryRadioButton}" />
         </smtx:XamlDisplay>
       </WrapPanel>
 
@@ -300,7 +300,7 @@
         <smtx:XamlDisplay Margin="0,0,4,4" UniqueKey="chips_27">
           <RadioButton Content="Secondary Outline"
                        GroupName="GroupChoiceChipOutline"
-                       Style="{StaticResource MaterialDesignChoiceChipAccentOutlineRadioButton}" />
+                       Style="{StaticResource MaterialDesignChoiceChipSecondaryOutlineRadioButton}" />
         </smtx:XamlDisplay>
       </WrapPanel>
 
@@ -329,7 +329,8 @@
 
         <materialDesign:Card Margin="4">
           <smtx:XamlDisplay Margin="0,0,6,4" UniqueKey="chips_30">
-            <ListBox x:Name="RadioButtonGroupChoiceChipAccent" Style="{StaticResource MaterialDesignChoiceChipAccentListBox}">
+            <ListBox x:Name="RadioButtonGroupChoiceChipSecondary"
+                     Style="{StaticResource MaterialDesignChoiceChipSecondaryListBox}">
               <ListBoxItem Content="Mercury" />
               <ListBoxItem Content="Venus" IsSelected="True" />
               <ListBoxItem Content="Earth" />
@@ -364,7 +365,8 @@
 
         <materialDesign:Card Margin="4">
           <smtx:XamlDisplay Margin="0,0,6,4" UniqueKey="chips_33">
-            <ListBox x:Name="RadioButtonGroupChoiceChipAccentOutline" Style="{StaticResource MaterialDesignChoiceChipAccentOutlineListBox}">
+            <ListBox x:Name="RadioButtonGroupChoiceChipSecondaryOutline"
+                     Style="{StaticResource MaterialDesignChoiceChipSecondaryOutlineListBox}">
               <ListBoxItem Content="Mercury" />
               <ListBoxItem Content="Venus" IsSelected="True" />
               <ListBoxItem Content="Earth" />
diff --git a/MainDemo.Wpf/ColorZones.xaml b/MainDemo.Wpf/ColorZones.xaml
@@ -76,7 +76,7 @@
         <DockPanel>
           <ToggleButton VerticalAlignment="Center"
                         DockPanel.Dock="Right"
-                        Style="{StaticResource MaterialDesignSwitchAccentToggleButton}" />
+                        Style="{StaticResource MaterialDesignSwitchSecondaryToggleButton}" />
 
           <StackPanel materialDesign:RippleAssist.IsCentered="True" Orientation="Horizontal">
             <ToggleButton Style="{StaticResource MaterialDesignHamburgerToggleButton}" />
diff --git a/MainDemo.Wpf/Dialogs.xaml b/MainDemo.Wpf/Dialogs.xaml
@@ -124,7 +124,7 @@
                       Command="{x:Static materialDesign:DialogHost.OpenDialogCommand}"
                       Content="{materialDesign:PackIcon Kind=Plus,
                                                         Size=22}"
-                      Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}" />
+                      Style="{StaticResource MaterialDesignFloatingActionMiniSecondaryButton}" />
             </Grid>
           </Border>
         </materialDesign:DialogHost>
@@ -324,7 +324,7 @@
                       Command="{x:Static materialDesign:DialogHost.OpenDialogCommand}"
                       Content="{materialDesign:PackIcon Kind=Plus,
                                                         Size=22}"
-                      Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}" />
+                      Style="{StaticResource MaterialDesignFloatingActionMiniSecondaryButton}" />
             </Grid>
           </Border>
         </materialDesign:DialogHost>
diff --git a/MainDemo.Wpf/Drawers.xaml b/MainDemo.Wpf/Drawers.xaml
@@ -187,7 +187,7 @@
                   Margin="4"
                   Command="{x:Static materialDesign:DrawerHost.OpenDrawerCommand}"
                   Content="{materialDesign:PackIcon Kind=ArrowAll}"
-                  Style="{StaticResource MaterialDesignRaisedAccentButton}" />
+                  Style="{StaticResource MaterialDesignRaisedSecondaryButton}" />
         </Grid>
 
       </materialDesign:DrawerHost>
diff --git a/MainDemo.Wpf/GroupBoxes.xaml b/MainDemo.Wpf/GroupBoxes.xaml
@@ -68,7 +68,7 @@
                       UniqueKey="groupbox_4">
       <GroupBox Margin="16"
                 materialDesign:ColorZoneAssist.Mode="SecondaryMid"
-                Header="Accent Header"
+                Header="Secondary Header"
                 Style="{StaticResource MaterialDesignGroupBox}">
         <TextBlock Text="My Content" />
       </GroupBox>
@@ -120,7 +120,7 @@
                       UniqueKey="groupbox_7">
       <GroupBox Margin="16"
                 materialDesign:ColorZoneAssist.Mode="SecondaryMid"
-                Header="Card Group Box Accent"
+                Header="Card Group Box Secondary"
                 Style="{StaticResource MaterialDesignCardGroupBox}">
         <GroupBox.HeaderTemplate>
           <DataTemplate>
diff --git a/MainDemo.Wpf/NavigationRail.xaml b/MainDemo.Wpf/NavigationRail.xaml
@@ -36,7 +36,7 @@
             <materialDesign:NavigationRailAssist.FloatingContent>
               <Button Margin="8"
                       Content="{materialDesign:PackIcon Kind=Plus}"
-                      Style="{StaticResource MaterialDesignFloatingActionAccentButton}" />
+                      Style="{StaticResource MaterialDesignFloatingActionSecondaryButton}" />
             </materialDesign:NavigationRailAssist.FloatingContent>
             <TabItem>
               <TabItem.Header>
@@ -399,7 +399,7 @@
                     Style="{StaticResource MaterialDesignNavigationRailTabControl}"
                     TabStripPlacement="Top">
           <materialDesign:NavigationRailAssist.FloatingContent>
-            <Button Margin="8" Style="{StaticResource MaterialDesignFloatingActionAccentButton}">
+            <Button Margin="8" Style="{StaticResource MaterialDesignFloatingActionSecondaryButton}">
               <materialDesign:PackIcon Width="24"
                                        Height="24"
                                        Kind="Plus" />
diff --git a/MainDemo.Wpf/Snackbars.xaml b/MainDemo.Wpf/Snackbars.xaml
@@ -236,7 +236,7 @@
 
         <smtx:XamlDisplay Margin="0,8,0,0" UniqueKey="snackbar_6">
           <materialDesign:Snackbar IsActive="True">
-            <materialDesign:SnackbarMessage ActionContent="ACCENT" Content="Default - accent" />
+            <materialDesign:SnackbarMessage ActionContent="SECONDARY" Content="Default - secondary" />
           </materialDesign:Snackbar>
         </smtx:XamlDisplay>
         <smtx:XamlDisplay Margin="0,8,0,0" UniqueKey="snackbar_7">
diff --git a/MainDemo.Wpf/Toggles.xaml b/MainDemo.Wpf/Toggles.xaml
@@ -60,8 +60,8 @@
       <smtx:XamlDisplay Margin="0,5,8,8" UniqueKey="buttons_36">
         <ToggleButton Content="C"
                       IsChecked="True"
-                      Style="{StaticResource MaterialDesignActionAccentToggleButton}"
-                      ToolTip="MaterialDesignActionAccentToggleButton" />
+                      Style="{StaticResource MaterialDesignActionSecondaryToggleButton}"
+                      ToolTip="MaterialDesignActionSecondaryToggleButton" />
       </smtx:XamlDisplay>
 
       <smtx:XamlDisplay Margin="0,5,8,8" UniqueKey="buttons_37">
@@ -173,9 +173,9 @@
       </smtx:XamlDisplay>
 
       <smtx:XamlDisplay Margin="8,0,0,0" UniqueKey="buttons_67">
-        <RadioButton Content="Accent"
+        <RadioButton Content="Secondary"
                      IsChecked="True"
-                     Style="{StaticResource MaterialDesignAccentRadioButton}" />
+                     Style="{StaticResource MaterialDesignSecondaryRadioButton}" />
       </smtx:XamlDisplay>
 
       <smtx:XamlDisplay Margin="8,0,0,0" UniqueKey="buttons_68">
@@ -191,9 +191,9 @@
       </smtx:XamlDisplay>
 
       <smtx:XamlDisplay Margin="8,0,0,0" UniqueKey="buttons_70">
-        <CheckBox Content="Accent"
+        <CheckBox Content="Secondary"
                   IsChecked="True"
-                  Style="{StaticResource MaterialDesignAccentCheckBox}" />
+                  Style="{StaticResource MaterialDesignSecondaryCheckBox}" />
       </smtx:XamlDisplay>
     </StackPanel>
 
@@ -241,8 +241,8 @@
                         VerticalAlignment="Center"
                         UniqueKey="buttons_51">
         <ToggleButton IsChecked="True"
-                      Style="{StaticResource MaterialDesignSwitchAccentToggleButton}"
-                      ToolTip="MaterialDesignSwitchAccentToggleButton" />
+                      Style="{StaticResource MaterialDesignSwitchSecondaryToggleButton}"
+                      ToolTip="MaterialDesignSwitchSecondaryToggleButton" />
       </smtx:XamlDisplay>
 
       <smtx:XamlDisplay Margin="8,0,0,0"
diff --git a/MainDemo.Wpf/TransitionsDemo/Slide2_Intro.xaml b/MainDemo.Wpf/TransitionsDemo/Slide2_Intro.xaml
@@ -34,7 +34,7 @@
       <Button Grid.Row="1"
               HorizontalAlignment="Right"
               Command="{x:Static materialDesign:Transitioner.MoveNextCommand}"
-              Style="{StaticResource MaterialDesignFloatingActionAccentButton}">
+              Style="{StaticResource MaterialDesignFloatingActionSecondaryButton}">
         <materialDesign:PackIcon Kind="StepForward" />
       </Button>
     </Grid>
diff --git a/MainDemo.Wpf/TransitionsDemo/Slide3_Intro.xaml b/MainDemo.Wpf/TransitionsDemo/Slide3_Intro.xaml
@@ -28,7 +28,7 @@
         </Button>
         <Button Margin="16"
                 Command="{x:Static materialDesign:Transitioner.MoveNextCommand}"
-                Style="{StaticResource MaterialDesignFloatingActionAccentButton}">
+                Style="{StaticResource MaterialDesignFloatingActionSecondaryButton}">
           <materialDesign:PackIcon Kind="StepForward" />
         </Button>
       </StackPanel>
diff --git a/MainDemo.Wpf/TransitionsDemo/Slide4_CombineTransitions.xaml b/MainDemo.Wpf/TransitionsDemo/Slide4_CombineTransitions.xaml
@@ -33,7 +33,7 @@
         <Button Margin="16"
                 VerticalAlignment="Top"
                 Command="{x:Static materialDesign:Transitioner.MoveNextCommand}"
-                Style="{StaticResource MaterialDesignFloatingActionAccentButton}">
+                Style="{StaticResource MaterialDesignFloatingActionSecondaryButton}">
           <materialDesign:PackIcon Kind="StepForward" />
         </Button>
       </StackPanel>
diff --git a/MainDemo.Wpf/TransitionsDemo/Slide5_TransitioningContent.xaml b/MainDemo.Wpf/TransitionsDemo/Slide5_TransitioningContent.xaml
@@ -141,7 +141,7 @@
       <Button Margin="16"
               VerticalAlignment="Top"
               Command="{x:Static materialDesign:Transitioner.MoveNextCommand}"
-              Style="{StaticResource MaterialDesignFloatingActionAccentButton}">
+              Style="{StaticResource MaterialDesignFloatingActionSecondaryButton}">
         <materialDesign:PackIcon Kind="StepForward" />
       </Button>
     </StackPanel>
diff --git a/MainDemo.Wpf/TransitionsDemo/Slide7_MVVM.xaml b/MainDemo.Wpf/TransitionsDemo/Slide7_MVVM.xaml
@@ -34,7 +34,7 @@
           <materialDesign:PackIcon Kind="StepBackward" />
         </Button>
         <!--
-                <Button Style="{StaticResource MaterialDesignFloatingActionAccentButton}"
+                <Button Style="{StaticResource MaterialDesignFloatingActionSecondaryButton}"
                     Command="{x:Static materialDesign:Transitioner.MoveNextCommand}"
                     VerticalAlignment="Top"
                     Margin="16">
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesign3.ToggleButton.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesign3.ToggleButton.xaml
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.CheckBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.CheckBox.xaml
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ListBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ListBox.xaml
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PopupBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PopupBox.xaml
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.RadioButton.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.RadioButton.xaml
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToggleButton.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToggleButton.xaml
