fix(RatingControl)!: adjust ratingcontrol resource keys (backport #1350…

…) (#1352) * fix(RatingControl)!: adjust ratingcontrol resource keys (#1350) BREAKING CHANGE: RatingControl Lightweight Styling keys have changed to align the WinUI resoure keys (cherry picked from commit 24d80ff) # Conflicts: # doc/material-migration.md * chore: fix conflicts --------- Co-authored-by: Steve Bilogan <steve.bilogan@gmail.com>
unoplatform · Feb 13, 2024 · 6e65d74 · 6e65d74
1 parent 2043387
commit 6e65d74
Show file tree

Hide file tree

Showing 5 changed files with 81 additions and 59 deletions.
diff --git a/build/.markdownlint.json b/build/.markdownlint.json
@@ -3,5 +3,6 @@
 	"line-length": false,
 	"commands-show-output": false,
 	"no-bare-urls": false,
-	"no-inline-html": false
+	"no-inline-html": false,
+	"no-duplicate-heading": false
 }
diff --git a/doc/material-migration.md b/doc/material-migration.md
@@ -4,6 +4,27 @@ uid: Uno.Themes.Material.Migration
 
 # Updating to Uno.Material
 
+## Updating to Uno.Material v4.1
+
+### Resources
+
+Certain Lightweight Styling resource keys have been edited to align with those coming from `Microsoft.UI.Xaml`.
+
+#### RatingControl
+
+| Old Key                                    | New Key                            |
+|--------------------------------------------|------------------------------------|
+| `RatingControlForegroundUnselected`                     | `RatingControlUnselectedForeground`                     |
+| `RatingControlForegroundSelected`                       | `RatingControlSelectedForeground`                       |
+| `RatingControlForegroundPointerOverUnselected`          | `RatingControlUnselectedForegroundPointerOver`          |
+| `RatingControlForegroundPointerOverSelected`            | `RatingControlSelectedForegroundPointerOver`            |
+| `RatingControlForegroundDisabledSelected`               | `RatingControlSelectedForegroundDisabled`               |
+| `SecondaryRatingControlForegroundUnselected`            | `SecondaryRatingControlUnselectedForeground`            |
+| `SecondaryRatingControlForegroundSelected`              | `SecondaryRatingControlSelectedForeground`              |
+| `SecondaryRatingControlForegroundPointerOverUnselected` | `SecondaryRatingControlUnselectedForegroundPointerOver` |
+| `SecondaryRatingControlForegroundPointerOverSelected`   | `SecondaryRatingControlSelectedForegroundPointerOver`   |
+| `SecondaryRatingControlForegroundDisabledSelected`      | `SecondaryRatingControlSelectedForegroundDisabled`      |
+
 ## Updating to Uno.Material v3
 
 Uno.Material v3 (not to be confused with [Material Design 3](https://m3.material.io/) from Google) introduces support for [Lightweight Styling](lightweight-styling.md) as well as some breaking changes to the default style keys for some controls. Refer to the tables below for the changes that have been made within Uno.Material.

diff --git a/doc/styles/RatingControl.md b/doc/styles/RatingControl.md
@@ -21,21 +21,21 @@ IsDefaultStyle\*: Styles in this column will be set as the default implicit styl
 | `RatingControlCaptionHeight`                             | `Double`            | 32                          |
 | `SecondaryRatingControlCaptionHeight`                    | `Double`            | 32                          |
 | `RatingControlForeground`                                | `SolidColorBrush`   | `PrimaryBrush`              |
-| `RatingControlForegroundUnselected`                      | `SolidColorBrush`   | `OnSurfaceLowBrush`         |
-| `RatingControlForegroundSelected`                        | `SolidColorBrush`   | `PrimaryBrush`              |
+| `RatingControlUnselectedForeground`                      | `SolidColorBrush`   | `OnSurfaceLowBrush`         |
+| `RatingControlSelectedForeground`                        | `SolidColorBrush`   | `PrimaryBrush`              |
 | `RatingControlPlaceholderForeground`                     | `SolidColorBrush`   | `OnSurfaceLowBrush`         |
 | `RatingControlPlaceholderForegroundPointerOver`          | `SolidColorBrush`   | `PrimaryBrush`              |
-| `RatingControlForegroundPointerOverUnselected`           | `SolidColorBrush`   | `PrimaryBrush`              |
-| `RatingControlForegroundPointerOverSelected`             | `SolidColorBrush`   | `PrimaryBrush`              |
-| `RatingControlForegroundDisabledSelected`                | `SolidColorBrush`   | `OnSurfaceLowBrush`         |
+| `RatingControlUnselectedForegroundPointerOver`           | `SolidColorBrush`   | `PrimaryBrush`              |
+| `RatingControlSelectedForegroundPointerOver`             | `SolidColorBrush`   | `PrimaryBrush`              |
+| `RatingControlSelectedForegroundDisabled`                | `SolidColorBrush`   | `OnSurfaceLowBrush`         |
 | `SecondaryRatingControlForeground`                       | `SolidColorBrush`   | `SecondaryBrush`            |
-| `SecondaryRatingControlForegroundUnselected`             | `SolidColorBrush`   | `OnSurfaceLowBrush`         |
-| `SecondaryRatingControlForegroundSelected`               | `SolidColorBrush`   | `SecondaryBrush`            |
+| `SecondaryRatingControlUnselectedForeground`             | `SolidColorBrush`   | `OnSurfaceLowBrush`         |
+| `SecondaryRatingControlSelectedForeground`               | `SolidColorBrush`   | `SecondaryBrush`            |
 | `SecondaryRatingControlPlaceholderForeground`            | `SolidColorBrush`   | `OnSurfaceLowBrush`         |
 | `SecondaryRatingControlPlaceholderForegroundPointerOver` | `SolidColorBrush`   | `SecondaryBrush`            |
-| `SecondaryRatingControlForegroundPointerOverUnselected`  | `SolidColorBrush`   | `SecondaryBrush`            |
-| `SecondaryRatingControlForegroundPointerOverSelected`    | `SolidColorBrush`   | `SecondaryBrush`            |
-| `SecondaryRatingControlForegroundDisabledSelected`       | `SolidColorBrush`   | `OnSurfaceLowBrush`         |
+| `SecondaryRatingControlUnselectedForegroundPointerOver`  | `SolidColorBrush`   | `SecondaryBrush`            |
+| `SecondaryRatingControlSelectedForegroundPointerOver`    | `SolidColorBrush`   | `SecondaryBrush`            |
+| `SecondaryRatingControlSelectedForegroundDisabled`       | `SolidColorBrush`   | `OnSurfaceLowBrush`         |
 | `RatingControlCaptionForeground`                         | `SolidColorBrush`   | `OnSurfaceBrush`            |
 | `RatingControlCaptionFontFamily`                         | `FontFamily`        | `MaterialRegularFontFamily` |
 | `RatingControlCaptionStyle`                              | `StaticResourceRef` | `CaptionMedium`             |

diff --git a/src/library/Uno.Material/Styles/Controls/v2/RatingControl.xaml b/src/library/Uno.Material/Styles/Controls/v2/RatingControl.xaml
@@ -13,24 +13,24 @@
 
 			<!-- Default -->
 			<StaticResource x:Key="RatingControlForeground" ResourceKey="PrimaryBrush" />
-			<StaticResource x:Key="RatingControlForegroundUnselected" ResourceKey="OnSurfaceLowBrush" />
-			<StaticResource x:Key="RatingControlForegroundUnselectedPointerOver" ResourceKey="PrimaryBrush" />
-			<StaticResource x:Key="RatingControlForegroundSelected" ResourceKey="PrimaryBrush" />
-			<StaticResource x:Key="RatingControlForegroundSelectedPointerOver" ResourceKey="PrimaryBrush" />
-			<StaticResource x:Key="RatingControlForegroundSelectedDisabled" ResourceKey="OnSurfaceLowBrush" />
+			<StaticResource x:Key="RatingControlUnselectedForeground" ResourceKey="OnSurfaceLowBrush" />
+			<StaticResource x:Key="RatingControlUnselectedForegroundPointerOver" ResourceKey="PrimaryBrush" />
+			<StaticResource x:Key="RatingControlSelectedForeground" ResourceKey="PrimaryBrush" />
+			<StaticResource x:Key="RatingControlSelectedForegroundPointerOver" ResourceKey="PrimaryBrush" />
+			<StaticResource x:Key="RatingControlSelectedForegroundDisabled" ResourceKey="OnSurfaceLowBrush" />
 			<StaticResource x:Key="RatingControlPlaceholderForeground" ResourceKey="OnSurfaceLowBrush" />
 			<StaticResource x:Key="RatingControlPlaceholderForegroundPointerOver" ResourceKey="PrimaryBrush" />
 
 			<!-- Secondary -->
 			<StaticResource x:Key="SecondaryRatingControlForeground" ResourceKey="SecondaryBrush" />
 
-			<StaticResource x:Key="SecondaryRatingControlForegroundUnselected" ResourceKey="OnSurfaceLowBrush" />
-			<StaticResource x:Key="SecondaryRatingControlForegroundSelected" ResourceKey="SecondaryBrush" />
+			<StaticResource x:Key="SecondaryRatingControlUnselectedForeground" ResourceKey="OnSurfaceLowBrush" />
+			<StaticResource x:Key="SecondaryRatingControlSelectedForeground" ResourceKey="SecondaryBrush" />
 			<StaticResource x:Key="SecondaryRatingControlPlaceholderForeground" ResourceKey="OnSurfaceLowBrush" />
 			<StaticResource x:Key="SecondaryRatingControlPlaceholderForegroundPointerOver" ResourceKey="SecondaryBrush" />
-			<StaticResource x:Key="SecondaryRatingControlForegroundUnselectedPointerOver" ResourceKey="SecondaryBrush" />
-			<StaticResource x:Key="SecondaryRatingControlForegroundSelectedPointerOver" ResourceKey="SecondaryBrush" />
-			<StaticResource x:Key="SecondaryRatingControlForegroundSelectedDisabled" ResourceKey="OnSurfaceLowBrush" />
+			<StaticResource x:Key="SecondaryRatingControlUnselectedForegroundPointerOver" ResourceKey="SecondaryBrush" />
+			<StaticResource x:Key="SecondaryRatingControlSelectedForegroundPointerOver" ResourceKey="SecondaryBrush" />
+			<StaticResource x:Key="SecondaryRatingControlSelectedForegroundDisabled" ResourceKey="OnSurfaceLowBrush" />
 
 			<!-- Caption and Fonts -->
 			<StaticResource x:Key="RatingControlCaptionForeground" ResourceKey="OnSurfaceBrush" />
@@ -51,24 +51,24 @@
 			<!-- Default -->
 			<StaticResource x:Key="RatingControlForeground" ResourceKey="PrimaryBrush" />
 
-			<StaticResource x:Key="RatingControlForegroundUnselected" ResourceKey="OnSurfaceLowBrush" />
-			<StaticResource x:Key="RatingControlForegroundSelected" ResourceKey="PrimaryBrush" />
+			<StaticResource x:Key="RatingControlUnselectedForeground" ResourceKey="OnSurfaceLowBrush" />
+			<StaticResource x:Key="RatingControlSelectedForeground" ResourceKey="PrimaryBrush" />
 			<StaticResource x:Key="RatingControlPlaceholderForeground" ResourceKey="OnSurfaceLowBrush" />
 			<StaticResource x:Key="RatingControlPlaceholderForegroundPointerOver" ResourceKey="PrimaryBrush" />
-			<StaticResource x:Key="RatingControlForegroundUnselectedPointerOver" ResourceKey="PrimaryBrush" />
-			<StaticResource x:Key="RatingControlForegroundSelectedPointerOver" ResourceKey="PrimaryBrush" />
-			<StaticResource x:Key="RatingControlForegroundSelectedDisabled" ResourceKey="OnSurfaceLowBrush" />
+			<StaticResource x:Key="RatingControlUnselectedForegroundPointerOver" ResourceKey="PrimaryBrush" />
+			<StaticResource x:Key="RatingControlSelectedForegroundPointerOver" ResourceKey="PrimaryBrush" />
+			<StaticResource x:Key="RatingControlSelectedForegroundDisabled" ResourceKey="OnSurfaceLowBrush" />
 
 			<!-- Secondary -->
 			<StaticResource x:Key="SecondaryRatingControlForeground" ResourceKey="SecondaryBrush" />
 
-			<StaticResource x:Key="SecondaryRatingControlForegroundUnselected" ResourceKey="OnSurfaceLowBrush" />
-			<StaticResource x:Key="SecondaryRatingControlForegroundSelected" ResourceKey="SecondaryBrush" />
+			<StaticResource x:Key="SecondaryRatingControlUnselectedForeground" ResourceKey="OnSurfaceLowBrush" />
+			<StaticResource x:Key="SecondaryRatingControlSelectedForeground" ResourceKey="SecondaryBrush" />
 			<StaticResource x:Key="SecondaryRatingControlPlaceholderForeground" ResourceKey="OnSurfaceLowBrush" />
 			<StaticResource x:Key="SecondaryRatingControlPlaceholderForegroundPointerOver" ResourceKey="SecondaryBrush" />
-			<StaticResource x:Key="SecondaryRatingControlForegroundUnselectedPointerOver" ResourceKey="SecondaryBrush" />
-			<StaticResource x:Key="SecondaryRatingControlForegroundSelectedPointerOver" ResourceKey="SecondaryBrush" />
-			<StaticResource x:Key="SecondaryRatingControlForegroundSelectedDisabled" ResourceKey="OnSurfaceLowBrush" />
+			<StaticResource x:Key="SecondaryRatingControlUnselectedForegroundPointerOver" ResourceKey="SecondaryBrush" />
+			<StaticResource x:Key="SecondaryRatingControlSelectedForegroundPointerOver" ResourceKey="SecondaryBrush" />
+			<StaticResource x:Key="SecondaryRatingControlSelectedForegroundDisabled" ResourceKey="OnSurfaceLowBrush" />
 
 			<!-- Caption and Fonts -->
 			<StaticResource x:Key="RatingControlCaptionForeground" ResourceKey="OnSurfaceBrush" />
@@ -99,7 +99,7 @@
 							<VisualStateGroup x:Name="CommonStates">
 								<VisualState x:Name="Disabled">
 									<VisualState.Setters>
-										<Setter Target="ForegroundContentPresenter.Foreground" Value="{ThemeResource RatingControlForegroundSelectedDisabled}" />
+										<Setter Target="ForegroundContentPresenter.Foreground" Value="{ThemeResource RatingControlSelectedForegroundDisabled}" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Placeholder">
@@ -114,17 +114,17 @@
 								</VisualState>
 								<VisualState x:Name="PointerOverUnselected">
 									<VisualState.Setters>
-										<Setter Target="ForegroundContentPresenter.Foreground" Value="{ThemeResource RatingControlForegroundUnselectedPointerOver}" />
+										<Setter Target="ForegroundContentPresenter.Foreground" Value="{ThemeResource RatingControlUnselectedForegroundPointerOver}" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Set">
 									<VisualState.Setters>
-										<Setter Target="ForegroundContentPresenter.Foreground" Value="{ThemeResource RatingControlForegroundSelected}" />
+										<Setter Target="ForegroundContentPresenter.Foreground" Value="{ThemeResource RatingControlSelectedForeground}" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="PointerOverSet">
 									<VisualState.Setters>
-										<Setter Target="ForegroundContentPresenter.Foreground" Value="{ThemeResource RatingControlForegroundSelected}" />
+										<Setter Target="ForegroundContentPresenter.Foreground" Value="{ThemeResource RatingControlSelectedForeground}" />
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
@@ -189,7 +189,7 @@
 							<VisualStateGroup x:Name="CommonStates">
 								<VisualState x:Name="Disabled">
 									<VisualState.Setters>
-										<Setter Target="ForegroundContentPresenter.Foreground" Value="{ThemeResource SecondaryRatingControlForegroundSelectedDisabled}" />
+										<Setter Target="ForegroundContentPresenter.Foreground" Value="{ThemeResource SecondaryRatingControlSelectedForegroundDisabled}" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Placeholder">
@@ -204,17 +204,17 @@
 								</VisualState>
 								<VisualState x:Name="PointerOverUnselected">
 									<VisualState.Setters>
-										<Setter Target="ForegroundContentPresenter.Foreground" Value="{ThemeResource SecondaryRatingControlForegroundUnselectedPointerOver}" />
+										<Setter Target="ForegroundContentPresenter.Foreground" Value="{ThemeResource SecondaryRatingControlUnselectedForegroundPointerOver}" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Set">
 									<VisualState.Setters>
-										<Setter Target="ForegroundContentPresenter.Foreground" Value="{ThemeResource SecondaryRatingControlForegroundSelected}" />
+										<Setter Target="ForegroundContentPresenter.Foreground" Value="{ThemeResource SecondaryRatingControlSelectedForeground}" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="PointerOverSet">
 									<VisualState.Setters>
-										<Setter Target="ForegroundContentPresenter.Foreground" Value="{ThemeResource SecondaryRatingControlForegroundSelected}" />
+										<Setter Target="ForegroundContentPresenter.Foreground" Value="{ThemeResource SecondaryRatingControlSelectedForeground}" />
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>

diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/RatingControl.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/RatingControl.cs
@@ -19,20 +19,20 @@ public static partial class Foreground
 					public static ThemeResourceKey<Brush> Default => new("RatingControlForeground");
 
 
-					[ResourceKeyDefinition(typeof(Brush), "RatingControlForegroundUnselected")]
-					public static ThemeResourceKey<Brush> Unselected => new("RatingControlForegroundUnselected");
+					[ResourceKeyDefinition(typeof(Brush), "RatingControlUnselectedForeground")]
+					public static ThemeResourceKey<Brush> Unselected => new("RatingControlUnselectedForeground");
 
-					[ResourceKeyDefinition(typeof(Brush), "RatingControlForegroundUnselectedPointerOver")]
-					public static ThemeResourceKey<Brush> UnselectedPointerOver => new("RatingControlForegroundUnselectedPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "RatingControlUnselectedForegroundPointerOver")]
+					public static ThemeResourceKey<Brush> UnselectedPointerOver => new("RatingControlUnselectedForegroundPointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "RatingControlForegroundSelected")]
-					public static ThemeResourceKey<Brush> Selected => new("RatingControlForegroundSelected");
+					[ResourceKeyDefinition(typeof(Brush), "RatingControlSelectedForeground")]
+					public static ThemeResourceKey<Brush> Selected => new("RatingControlSelectedForeground");
 
-					[ResourceKeyDefinition(typeof(Brush), "RatingControlForegroundSelectedPointerOver")]
-					public static ThemeResourceKey<Brush> SelectedPointerOver => new("RatingControlForegroundSelectedPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "RatingControlSelectedForegroundPointerOver")]
+					public static ThemeResourceKey<Brush> SelectedPointerOver => new("RatingControlSelectedForegroundPointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "RatingControlForegroundSelectedDisabled")]
-					public static ThemeResourceKey<Brush> SelectedDisabled => new("RatingControlForegroundSelectedDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "RatingControlSelectedForegroundDisabled")]
+					public static ThemeResourceKey<Brush> SelectedDisabled => new("RatingControlSelectedForegroundDisabled");
 				}
 
 				public static partial class PlaceholderForeground
@@ -79,20 +79,20 @@ public static partial class Foreground
 					public static ThemeResourceKey<Brush> Default => new("SecondaryRatingControlForeground");
 
 
-					[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlForegroundUnselected")]
-					public static ThemeResourceKey<Brush> Unselected => new("SecondaryRatingControlForegroundUnselected");
+					[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlUnselectedForeground")]
+					public static ThemeResourceKey<Brush> Unselected => new("SecondaryRatingControlUnselectedForeground");
 
-					[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlForegroundUnselectedPointerOver")]
-					public static ThemeResourceKey<Brush> UnselectedPointerOver => new("SecondaryRatingControlForegroundUnselectedPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlUnselectedForegroundPointerOver")]
+					public static ThemeResourceKey<Brush> UnselectedPointerOver => new("SecondaryRatingControlUnselectedForegroundPointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlForegroundSelected")]
-					public static ThemeResourceKey<Brush> Selected => new("SecondaryRatingControlForegroundSelected");
+					[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlSelectedForeground")]
+					public static ThemeResourceKey<Brush> Selected => new("SecondaryRatingControlSelectedForeground");
 
-					[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlForegroundSelectedPointerOver")]
-					public static ThemeResourceKey<Brush> SelectedPointerOver => new("SecondaryRatingControlForegroundSelectedPointerOver");
+					[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlSelectedForegroundPointerOver")]
+					public static ThemeResourceKey<Brush> SelectedPointerOver => new("SecondaryRatingControlSelectedForegroundPointerOver");
 
-					[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlForegroundSelectedDisabled")]
-					public static ThemeResourceKey<Brush> SelectedDisabled => new("SecondaryRatingControlForegroundSelectedDisabled");
+					[ResourceKeyDefinition(typeof(Brush), "SecondaryRatingControlSelectedForegroundDisabled")]
+					public static ThemeResourceKey<Brush> SelectedDisabled => new("SecondaryRatingControlSelectedForegroundDisabled");
 				}
 
 				public static partial class PlaceholderForeground