Removing obsolete button styles. (#3407)

Author: Keboo

MaterialDesign3.Demo.Wpf/Buttons.xaml

@@ -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">
@@ -937,4 +937,4 @@
       </smtx:XamlDisplay>
     </StackPanel>
   </Grid>
-</UserControl>
+</UserControl>

MaterialDesign3.Demo.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">
@@ -94,7 +94,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">

MaterialDesign3.Demo.Wpf/Dialogs.xaml

@@ -122,7 +122,7 @@
                       Command="{x:Static materialDesign:DialogHost.OpenDialogCommand}"
                       Content="{materialDesign:PackIcon Kind=Plus,
                                                         Size=22}"
-                      Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}" />
+                      Style="{StaticResource MaterialDesignFloatingActionMiniSecondaryButton}" />
             </Grid>
           </Border>
         </materialDesign:DialogHost>
@@ -319,7 +319,7 @@
                       Command="{x:Static materialDesign:DialogHost.OpenDialogCommand}"
                       Content="{materialDesign:PackIcon Kind=Plus,
                                                         Size=22}"
-                      Style="{StaticResource MaterialDesignFloatingActionMiniAccentButton}" />
+                      Style="{StaticResource MaterialDesignFloatingActionMiniSecondaryButton}" />
             </Grid>
           </Border>
         </materialDesign:DialogHost>

MaterialDesign3.Demo.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>

MaterialDesign3.Demo.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>

MaterialDesign3.Demo.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>

MaterialDesign3.Demo.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>

MaterialDesign3.Demo.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>

MaterialDesign3.Demo.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">

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml

@@ -166,11 +166,6 @@
     <Setter Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.Secondary.Dark.Foreground}" />
   </Style>
 
-  <!-- Obsolete -->
-  <Style x:Key="MaterialDesignRaisedAccentButton"
-         TargetType="{x:Type ButtonBase}"
-         BasedOn="{StaticResource MaterialDesignRaisedSecondaryButton}" />
-
   <!--#endregion-->
   <!--#region Flat Button-->
   <Style x:Key="MaterialDesignFlatButton" TargetType="{x:Type ButtonBase}">
@@ -294,11 +289,6 @@
     <Setter Property="wpf:RippleAssist.Feedback" Value="{DynamicResource MaterialDesign.Brush.Secondary.Dark}" />
   </Style>
 
-  <!-- Obsolete -->
-  <Style x:Key="MaterialDesignFlatAccentButton"
-         TargetType="{x:Type ButtonBase}"
-         BasedOn="{StaticResource MaterialDesignFlatSecondaryButton}" />
-
   <Style x:Key="MaterialDesignFlatLightBgButton"
          TargetType="{x:Type ButtonBase}"
          BasedOn="{StaticResource MaterialDesignRaisedLightButton}">
@@ -338,11 +328,6 @@
     <Setter Property="wpf:ElevationAssist.Elevation" Value="Dp0" />
   </Style>
 
-  <!-- Obsolete -->
-  <Style x:Key="MaterialDesignFlatAccentBgButton"
-         TargetType="{x:Type ButtonBase}"
-         BasedOn="{StaticResource MaterialDesignFlatSecondaryMidBgButton}" />
-
   <!--#endregion-->
   <!--#region Outlined Button-->
 
@@ -674,11 +659,6 @@
     <Setter Property="wpf:ButtonProgressAssist.IndicatorForeground" Value="{DynamicResource MaterialDesign.Brush.Secondary.Light}" />
   </Style>
 
-  <!-- Obsolete -->
-  <Style x:Key="MaterialDesignFloatingActionMiniAccentButton"
-         TargetType="{x:Type ButtonBase}"
-         BasedOn="{StaticResource MaterialDesignFloatingActionMiniSecondaryButton}" />
-
   <Style x:Key="MaterialDesignFloatingActionLightButton"
          TargetType="{x:Type ButtonBase}"
          BasedOn="{StaticResource MaterialDesignFloatingActionButton}">
@@ -724,11 +704,6 @@
     <Setter Property="wpf:ButtonProgressAssist.IndicatorForeground" Value="{DynamicResource MaterialDesign.Brush.Secondary.Light}" />
   </Style>
 
-  <!-- Obsolete -->
-  <Style x:Key="MaterialDesignFloatingActionAccentButton"
-         TargetType="{x:Type ButtonBase}"
-         BasedOn="{StaticResource MaterialDesignFloatingActionSecondaryButton}" />
-
   <!--#endregion-->
   <!--#region Icon Button-->