Improve resource name consistency

Esri · Nov 17, 2024 · 55886e5 · 55886e5
1 parent 389df3c
commit 55886e5
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 27 deletions.
diff --git a/src/Esri.Calcite.Wpf/Controls/Calendar.xaml b/src/Esri.Calcite.Wpf/Controls/Calendar.xaml
@@ -175,7 +175,7 @@
     </Style>
 
     <!--  Style for the months of a year and years of a decade.  -->
-    <Style x:Key="CalendarButtonStyle" TargetType="CalendarButton">
+    <Style x:Key="CalciteCalendarButtonStyle" TargetType="CalendarButton">
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Template">
@@ -614,7 +614,7 @@
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="FontWeight" Value="Light" />
         <Setter Property="CalendarDayButtonStyle" Value="{StaticResource CalendarDayButtonStyleBase}" />
-        <Setter Property="CalendarButtonStyle" Value="{StaticResource CalendarButtonStyle}" />
+        <Setter Property="CalendarButtonStyle" Value="{StaticResource CalciteCalendarButtonStyle}" />
         <Setter Property="CalendarItemStyle" Value="{StaticResource CalciteCalendarItemStyle}" />
         <Setter Property="Foreground" Value="{DynamicResource CalciteUIText3Brush}" />
         <Setter Property="Background" Value="{DynamicResource CalciteUIBackground1Brush}" />

diff --git a/src/Esri.Calcite.Wpf/Controls/ComboBox.xaml b/src/Esri.Calcite.Wpf/Controls/ComboBox.xaml
@@ -41,7 +41,7 @@
     </Style>
 
     <!--  Not an override but used by ComboBox template  -->
-    <Style x:Key="ComboBoxToggleButton" TargetType="ToggleButton">
+    <Style x:Key="CalciteComboBoxToggleButtonStyle" TargetType="ToggleButton">
         <Setter Property="BorderBrush" Value="{DynamicResource CalciteUIBorder3Brush}" />
         <Setter Property="Background" Value="{DynamicResource CalciteUIBackground1Brush}" />
         <Setter Property="BorderThickness" Value="1" />
@@ -154,7 +154,7 @@
                             Focusable="false"
                             Foreground="{TemplateBinding Foreground}"
                             IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                            Style="{StaticResource ComboBoxToggleButton}">
+                            Style="{StaticResource CalciteComboBoxToggleButtonStyle}">
                             <Grid>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="Auto" />

diff --git a/src/Esri.Calcite.Wpf/Controls/DataGrid.xaml b/src/Esri.Calcite.Wpf/Controls/DataGrid.xaml
@@ -295,7 +295,7 @@
     </Style>
 
     <!--  Style and template for the resize control on the DataGridColumnHeader.  -->
-    <Style x:Key="ColumnHeaderGripperStyle" TargetType="{x:Type Thumb}">
+    <Style x:Key="ColumnHeaderGripperThumbStyle" TargetType="{x:Type Thumb}">
         <Setter Property="Width" Value="8" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Cursor" Value="SizeWE" />
@@ -330,11 +330,11 @@
                         <Thumb
                             x:Name="PART_LeftHeaderGripper"
                             HorizontalAlignment="Left"
-                            Style="{DynamicResource ColumnHeaderGripperStyle}" />
+                            Style="{DynamicResource ColumnHeaderGripperThumbStyle}" />
                         <Thumb
                             x:Name="PART_RightHeaderGripper"
                             HorizontalAlignment="Right"
-                            Style="{DynamicResource ColumnHeaderGripperStyle}" />
+                            Style="{DynamicResource ColumnHeaderGripperThumbStyle}" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>

diff --git a/src/Esri.Calcite.Wpf/Controls/DatePicker.xaml b/src/Esri.Calcite.Wpf/Controls/DatePicker.xaml
@@ -7,7 +7,7 @@
         <!--<ResourceDictionary Source=".\Calendar.xaml" />-->
     </ResourceDictionary.MergedDictionaries>
 
-    <Style x:Key="DatePickerTextBoxButton" TargetType="Button">
+    <Style x:Key="CalciteDatePickerTextBoxButtonStyle" TargetType="Button">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ButtonBase">
@@ -47,7 +47,7 @@
             </Setter.Value>
         </Setter>
     </Style>
-    <Style x:Key="DatePickerTextBoxBase" TargetType="DatePickerTextBox">
+    <Style x:Key="CalciteDatePickerTextBoxStyle" TargetType="DatePickerTextBox">
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
@@ -105,7 +105,7 @@
                     Width="28"
                     Height="28"
                     Focusable="False"
-                    Style="{StaticResource DatePickerTextBoxButton}">
+                    Style="{StaticResource CalciteDatePickerTextBoxButtonStyle}">
                     <Path
                         x:Name="PathIcon"
                         Fill="{DynamicResource CalciteUIText1Brush}"
@@ -122,7 +122,7 @@
                     Padding="0"
                     HorizontalAlignment="Stretch"
                     Focusable="False"
-                    Style="{StaticResource DatePickerTextBoxBase}" />
+                    Style="{StaticResource CalciteDatePickerTextBoxStyle}" />
 
                 <Popup
                     x:Name="PART_Popup"

diff --git a/src/Esri.Calcite.Wpf/Controls/ListBox.xaml b/src/Esri.Calcite.Wpf/Controls/ListBox.xaml
@@ -5,7 +5,7 @@
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="..\Shared\Fonts.xaml" />
     </ResourceDictionary.MergedDictionaries>
-    <Style x:Key="ListBoxItemStyle" TargetType="ListBoxItem">
+    <Style x:Key="CalciteListBoxItemStyle" TargetType="ListBoxItem">
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Padding" Value="8" />
         <Setter Property="Cursor" Value="{DynamicResource CalciteActionCursor}" />
@@ -64,7 +64,7 @@
         </Setter>
     </Style>
     <Style TargetType="ListBox" x:Key="CalciteListBoxStyle">
-        <Setter Property="ItemContainerStyle" Value="{StaticResource ListBoxItemStyle}" />
+        <Setter Property="ItemContainerStyle" Value="{StaticResource CalciteListBoxItemStyle}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Margin" Value="0" />
         <Setter Property="VerticalAlignment" Value="Top" />

diff --git a/src/Esri.Calcite.Wpf/Controls/ListView.xaml b/src/Esri.Calcite.Wpf/Controls/ListView.xaml
@@ -6,7 +6,7 @@
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="..\Shared\Fonts.xaml" />
     </ResourceDictionary.MergedDictionaries>
-    <Style x:Key="ListViewContainerStyle" TargetType="{x:Type ListViewItem}">
+    <Style x:Key="CalciteListItemViewContainerStyle" TargetType="{x:Type ListViewItem}">
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Padding" Value="8" />
         <Setter Property="Cursor" Value="{DynamicResource CalciteActionCursor}" />
@@ -65,7 +65,7 @@
         </Setter>
     </Style>
     <Style x:Key="CalciteListViewStyle" TargetType="{x:Type ListView}">
-        <Setter Property="ItemContainerStyle" Value="{StaticResource ListViewContainerStyle}" />
+        <Setter Property="ItemContainerStyle" Value="{StaticResource CalciteListItemViewContainerStyle}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Margin" Value="0" />
         <Setter Property="VerticalAlignment" Value="Top" />

diff --git a/src/Esri.Calcite.Wpf/Controls/ScrollBar.xaml b/src/Esri.Calcite.Wpf/Controls/ScrollBar.xaml
@@ -44,7 +44,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="ScrollBarThumb" TargetType="{x:Type Thumb}">
+    <Style x:Key="CalciteScrollBarThumbStyle" TargetType="{x:Type Thumb}">
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="OverridesDefaultStyle" Value="true" />
         <Setter Property="IsTabStop" Value="false" />
@@ -98,7 +98,7 @@
                         Background="{DynamicResource CalciteUIBackgroundBrush}"
                         BorderBrush="{DynamicResource CalciteUIBorder3Brush}"
                         Foreground="{DynamicResource CalciteUIBrandBrush}"
-                        Style="{StaticResource ScrollBarThumb}" />
+                        Style="{StaticResource CalciteScrollBarThumbStyle}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton Command="ScrollBar.PageDownCommand" Style="{StaticResource ScrollBarPageButton}" />
@@ -140,7 +140,7 @@
                         Background="{DynamicResource CalciteUIBackgroundBrush}"
                         BorderBrush="{DynamicResource CalciteUIBorder3Brush}"
                         Foreground="{DynamicResource CalciteUIText1Brush}"
-                        Style="{StaticResource ScrollBarThumb}" />
+                        Style="{StaticResource CalciteScrollBarThumbStyle}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton Command="ScrollBar.PageRightCommand" Style="{StaticResource ScrollBarPageButton}" />

diff --git a/src/Esri.Calcite.Wpf/Patterns/Alerts.xaml b/src/Esri.Calcite.Wpf/Patterns/Alerts.xaml
@@ -56,25 +56,25 @@
         </Setter>
     </Style>
     <Style
-        x:Key="Pattern.Alert.Tint"
+        x:Key="CalciteBrandAlertGroupBoxStyle"
         BasedOn="{StaticResource CalciteAlertBorderBase}"
         TargetType="GroupBox">
         <Setter Property="BorderBrush" Value="{DynamicResource CalciteUIBrandBrush}" />
     </Style>
     <Style
-        x:Key="Pattern.Alert.Danger"
+        x:Key="CalciteDangerAlertGroupBoxStyle"
         BasedOn="{StaticResource CalciteAlertBorderBase}"
         TargetType="GroupBox">
         <Setter Property="BorderBrush" Value="{DynamicResource CalciteUIDangerBrush}" />
     </Style>
     <Style
-        x:Key="Pattern.Alert.Warning"
+        x:Key="CalciteWarningAlertGroupBoxStyle"
         BasedOn="{StaticResource CalciteAlertBorderBase}"
         TargetType="GroupBox">
         <Setter Property="BorderBrush" Value="{DynamicResource CalciteUIWarningBrush}" />
     </Style>
     <Style
-        x:Key="Pattern.Alert.Success"
+        x:Key="CalciteSuccessAlertGroupBoxStyle"
         BasedOn="{StaticResource CalciteAlertBorderBase}"
         TargetType="GroupBox">
         <Setter Property="BorderBrush" Value="{DynamicResource CalciteUISuccessBrush}" />

diff --git a/src/TestApps/WpfTests/Samples/Alerts/Danger.xaml b/src/TestApps/WpfTests/Samples/Alerts/Danger.xaml
@@ -1 +1 @@
-<GroupBox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Content="Details" Header="Header" Style="{DynamicResource Pattern.Alert.Danger}" />
+<GroupBox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Content="Details" Header="Header" Style="{DynamicResource CalciteDangerAlertGroupBoxStyle}" />
diff --git a/src/TestApps/WpfTests/Samples/Alerts/Success.xaml b/src/TestApps/WpfTests/Samples/Alerts/Success.xaml
@@ -1 +1 @@
-<GroupBox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Content="Details" Header="Header" Style="{DynamicResource Pattern.Alert.Success}" />
+<GroupBox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Content="Details" Header="Header" Style="{DynamicResource CalciteSuccessAlertGroupBoxStyle}" />
diff --git a/src/TestApps/WpfTests/Samples/Alerts/Tint.xaml b/src/TestApps/WpfTests/Samples/Alerts/Tint.xaml
@@ -1 +1 @@
-<GroupBox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Content="Details" Header="Header" Style="{DynamicResource Pattern.Alert.Tint}" />
+<GroupBox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Content="Details" Header="Header" Style="{DynamicResource CalciteBrandAlertGroupBoxStyle}" />
diff --git a/src/TestApps/WpfTests/Samples/Alerts/Warning.xaml b/src/TestApps/WpfTests/Samples/Alerts/Warning.xaml
@@ -1 +1 @@
-<GroupBox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Content="Details" Header="Header" Style="{DynamicResource Pattern.Alert.Warning}" />
+<GroupBox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Content="Details" Header="Header" Style="{DynamicResource CalciteWarningAlertGroupBoxStyle}" />
diff --git a/src/TestApps/WpfTests/Themes/Generic.xaml b/src/TestApps/WpfTests/Themes/Generic.xaml
@@ -82,7 +82,7 @@
                             IsOpen="False"
                             Placement="Center"
                             PlacementTarget="{Binding ElementName=PART_CopyButton}">
-                            <GroupBox Header="Copied to clipboard!" Style="{DynamicResource Pattern.Alert.Success}" />
+                            <GroupBox Header="Copied to clipboard!" Style="{DynamicResource CalciteSuccessAlertGroupBoxStyle}" />
                         </Popup>
                     </Grid>
                 </ControlTemplate>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<GroupBox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Content="Details" Header="Header" Style="{DynamicResource Pattern.Alert.Danger}" />
		<GroupBox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Content="Details" Header="Header" Style="{DynamicResource CalciteDangerAlertGroupBoxStyle}" />