chore(markup): update c#markup (#1232)

Co-authored-by: Steve Bilogan <[email protected]>
unoplatform · Oct 26, 2023 · 6640857 · 6640857
1 parent 22d0694
commit 6640857
Show file tree

Hide file tree

Showing 43 changed files with 3,427 additions and 3,271 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -19,6 +19,7 @@
 		<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
 		<IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
 		<IsSampleProject>$(MSBuildProjectName.Contains('Sample'))</IsSampleProject>
+		<IsMarkupProject>$(MSBuildProjectName.Contains('Markup'))</IsMarkupProject>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -42,6 +43,10 @@
 		</When>
 	</Choose>
 
+	<PropertyGroup Condition="'$(IsMarkupProject)'=='true'">
+		<IsPackable>true</IsPackable>
+	</PropertyGroup>
+
 	<!-- Workaround for https://developercommunity.visualstudio.com/t/XamarinMac-binaries-are-missing-in-173/10164443 -->
 	<ItemGroup Condition="$(TargetFramework.ToLower().StartsWith('xamarinmac')) and '$(Configuration)' == 'Release' and '$(OS)'=='Windows_NT'">
 		<Reference Include="Xamarin.Mac">

diff --git a/doc/styles/Slider.md b/doc/styles/Slider.md
@@ -32,7 +32,7 @@ SliderBottomTickBarHeight|Double|4
 SliderHorizontalInlineTickBarHeight|Double|2
 SliderLeftTickBarWidth|Double|4
 SliderRightTickBarWidth|Double|4
-SliderVerticallInlineTickBarWidth|Double|2
+SliderVerticalInlineTickBarWidth|Double|2
 SliderTopTickBarMargin|Thickness|0,0,0,4
 SliderBottomTickBarMargin|Thickness|0,4,0,0
 SliderLeftTickBarMargin|Thickness|0,0,4,0

diff --git a/doc/styles/ToggleButton.md b/doc/styles/ToggleButton.md
@@ -24,17 +24,17 @@ TextToggleButtonBackgroundIndeterminate|SolidColorBrush|SystemControlTransparent
 TextToggleButtonBackgroundIndeterminatePointerOver|SolidColorBrush|SystemControlTransparentBrush
 TextToggleButtonBackgroundIndeterminatePressed|SolidColorBrush|SystemControlTransparentBrush
 TextToggleButtonBackgroundIndeterminateDisabled|SolidColorBrush|SystemControlTransparentBrush
-TextToggleButtonForeground|Color|PrimaryColor
-TextToggleButtonForegroundPointerOver|Color|PrimaryColor
-TextToggleButtonForegroundPressed|Color|PrimaryColor
+TextToggleButtonForeground|SolidColorBrush|PrimaryBrush
+TextToggleButtonForegroundPointerOver|SolidColorBrush|PrimaryBrush
+TextToggleButtonForegroundPressed|SolidColorBrush|PrimaryBrush
 TextToggleButtonForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush
-TextToggleButtonForegroundChecked|Color|PrimaryColor
-TextToggleButtonForegroundCheckedPointerOver|Color|PrimaryColor
-TextToggleButtonForegroundCheckedPressed|Color|PrimaryColor
+TextToggleButtonForegroundChecked|SolidColorBrush|PrimaryBrush
+TextToggleButtonForegroundCheckedPointerOver|SolidColorBrush|PrimaryBrush
+TextToggleButtonForegroundCheckedPressed|SolidColorBrush|PrimaryBrush
 TextToggleButtonForegroundCheckedDisabled|SolidColorBrush|OnSurfaceLowBrush
-TextToggleButtonForegroundIndeterminate|Color|PrimaryColor
-TextToggleButtonForegroundIndeterminatePointerOver|Color|PrimaryColor
-TextToggleButtonForegroundIndeterminatePressed|Color|PrimaryColor
+TextToggleButtonForegroundIndeterminate|SolidColorBrush|PrimaryBrush
+TextToggleButtonForegroundIndeterminatePointerOver|SolidColorBrush|PrimaryBrush
+TextToggleButtonForegroundIndeterminatePressed|SolidColorBrush|PrimaryBrush
 TextToggleButtonForegroundIndeterminateDisabled|SolidColorBrush|OnSurfaceLowBrush
 TextToggleButtonFontFamily|FontFamily|MaterialRegularFontFamily
 TextToggleButtonFontSize|Double|LabelLargeFontSize

diff --git a/src/library/Uno.Material.WinUI.Markup/MarkupInit.cs b/src/library/Uno.Material.WinUI.Markup/MarkupInit.cs
@@ -1,22 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.UI.Xaml;
-using Uno.Extensions.Markup;
+using Microsoft.UI.Xaml;
 
-namespace Uno.Material
+namespace Uno.Material.Markup;
+
+public static class MarkupInit
 {
-	public static class MarkupInit
-	{
-		public static T UseMaterial<T>(this T app,
-			ResourceDictionary colorOverride = null,
-			ResourceDictionary fontOverride = null) where T : Application
-			=> app.Resources(
-				r => r.Merged(
-					new MaterialTheme()
-						.ColorOverrideDictionary(colorOverride)
-						.FontOverrideDictionary(fontOverride)
-					)
-				);
-	}
+	public static T UseMaterial<T>(this T app,
+		ResourceDictionary colorOverride = null,
+		ResourceDictionary fontOverride = null) where T : Application
+		=> app.Resources(
+			r => r.Merged(
+				new MaterialTheme()
+					.ColorOverrideDictionary(colorOverride)
+					.FontOverrideDictionary(fontOverride)
+				)
+			);
 }
diff --git a/src/library/Uno.Material.WinUI.Markup/Uno.Material.WinUI.Markup.csproj b/src/library/Uno.Material.WinUI.Markup/Uno.Material.WinUI.Markup.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
 
 	<!--
 	Adding project references to this project requires some manual adjustments.
@@ -19,7 +19,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Uno.Extensions.Markup.Generators" PrivateAssets="All" Version="5.0.0-dev.407" />
+		<PackageReference Include="Uno.Extensions.Markup.Generators" PrivateAssets="All" Version="5.0.0-dev.517" />
 	</ItemGroup>
 
 	<PropertyGroup>

diff --git a/src/library/Uno.Material/Styles/Controls/v2/CalendarView.xaml b/src/library/Uno.Material/Styles/Controls/v2/CalendarView.xaml
@@ -7,10 +7,10 @@
 					mc:Ignorable="not_win">
 
 	<x:String x:Key="MaterialDownArrowPathData">M0,0L32,0 16,19.745z</x:String>
-	<SolidColorBrush x:Key="MaterialCalendarTodayForeground"
+	<SolidColorBrush x:Key="MaterialCalendarViewTodayForeground"
 					 Color="{ThemeResource OnSurfaceColor}"
 					 Opacity="0.87" />
-	<SolidColorBrush x:Key="MaterialCalendarBlackoutForeground"
+	<SolidColorBrush x:Key="MaterialCalendarViewBlackoutForeground"
 					 Color="{ThemeResource OnSurfaceColor}"
 					 Opacity="0.38" />
 
@@ -31,9 +31,9 @@
 		<Setter Property="CalendarItemBorderBrush"
 				Value="{ThemeResource CalendarViewCalendarItemRevealBorderBrush}" />
 		<Setter Property="TodayForeground"
-				Value="{StaticResource MaterialCalendarTodayForeground}" />
+				Value="{StaticResource MaterialCalendarViewTodayForeground}" />
 		<Setter Property="BlackoutForeground"
-				Value="{ThemeResource MaterialCalendarBlackoutForeground}" />
+				Value="{StaticResource MaterialCalendarViewBlackoutForeground}" />
 		<Setter Property="SelectedForeground"
 					Value="{ThemeResource OnPrimaryBrush}" />
 		<Setter Property="PressedForeground"

diff --git a/src/library/Uno.Material/Styles/Controls/v2/CheckBox.xaml b/src/library/Uno.Material/Styles/Controls/v2/CheckBox.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 					xmlns:um="using:Uno.Material"
@@ -65,6 +65,7 @@
 			<!-- endregion -->
 
 			<!--#region Check Background Stroke-->
+			<StaticResource x:Key="CheckBoxCheckBackgroundStroke" ResourceKey="OnSurfaceVariantBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundStrokeUnchecked" ResourceKey="OnSurfaceVariantBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPointerOver" ResourceKey="OnSurfaceBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPressed" ResourceKey="OnSurfaceBrush" />
@@ -82,6 +83,7 @@
 			<!--#endregion-->
 
 			<!--#region Check Background Fill-->
+			<StaticResource x:Key="CheckBoxCheckBackgroundFill" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundFillUnchecked" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPressed" ResourceKey="SystemControlTransparentBrush" />
@@ -106,6 +108,7 @@
 			<!--#endregion-->
 
 			<!--#region Glyph-->
+			<StaticResource x:Key="CheckBoxGlyphForeground" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="CheckBoxGlyphForegroundUnchecked" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="CheckBoxGlyphForegroundUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="CheckBoxGlyphForegroundUncheckedPressed" ResourceKey="SystemControlTransparentBrush" />
@@ -127,7 +130,6 @@
 
 			<!--#region States-->
 			<StaticResource x:Key="CheckBoxStateCircleFillUnchecked" ResourceKey="OnSurfaceBrush" />
-
 			<StaticResource x:Key="CheckBoxStateCircleFillChecked" ResourceKey="PrimaryBrush" />
 
 			<StaticResource x:Key="CheckBoxStateCircleOpacityPointerOver" ResourceKey="HoverOpacity" />
@@ -202,6 +204,7 @@
 			<!-- endregion -->
 
 			<!--#region Check Background Stroke-->
+			<StaticResource x:Key="CheckBoxCheckBackgroundStroke" ResourceKey="OnSurfaceVariantBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundStrokeUnchecked" ResourceKey="OnSurfaceVariantBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPointerOver" ResourceKey="OnSurfaceBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPressed" ResourceKey="OnSurfaceBrush" />
@@ -219,6 +222,7 @@
 			<!--#endregion-->
 
 			<!--#region Check Background Fill-->
+			<StaticResource x:Key="CheckBoxCheckBackgroundFill" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundFillUnchecked" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="CheckBoxCheckBackgroundFillUncheckedPressed" ResourceKey="SystemControlTransparentBrush" />
@@ -243,6 +247,8 @@
 			<!--#endregion-->
 
 			<!--#region Glyph-->
+			<StaticResource x:Key="CheckBoxGlyphForeground" ResourceKey="SystemControlTransparentBrush" />
+
 			<StaticResource x:Key="CheckBoxGlyphForegroundUnchecked" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="CheckBoxGlyphForegroundUncheckedPointerOver" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="CheckBoxGlyphForegroundUncheckedPressed" ResourceKey="SystemControlTransparentBrush" />
@@ -264,7 +270,6 @@
 
 			<!--#region States-->
 			<StaticResource x:Key="CheckBoxStateCircleFillUnchecked" ResourceKey="OnSurfaceBrush" />
-
 			<StaticResource x:Key="CheckBoxStateCircleFillChecked" ResourceKey="PrimaryBrush" />
 
 			<StaticResource x:Key="CheckBoxStateCircleOpacityPointerOver" ResourceKey="HoverOpacity" />
@@ -514,7 +519,9 @@
 							<VisualStateGroup x:Name="FocusStates">
 								<VisualState x:Name="Focused">
 									<VisualState.Setters>
+										<Setter Target="UncheckedFocusStateCircle.Fill" Value="{ThemeResource CheckBoxStateCircleFillUnchecked}" />
 										<Setter Target="UncheckedFocusStateCircle.Opacity" Value="{ThemeResource CheckBoxStateCircleOpacityFocused}" />
+										<Setter Target="CheckedFocusStateCircle.Fill" Value="{ThemeResource CheckBoxStateCircleFillChecked}" />
 										<Setter Target="CheckedFocusStateCircle.Opacity" Value="{ThemeResource CheckBoxStateCircleOpacityFocused}" />
 									</VisualState.Setters>
 								</VisualState>
@@ -536,7 +543,7 @@
 								 Stretch="Uniform"
 								 Width="{ThemeResource CheckBoxFocusAreaSize}"
 								 Height="{ThemeResource CheckBoxFocusAreaSize}"
-								 Fill="{ThemeResource CheckBoxStateCircleFillUnchecked}"
+								 Fill="Transparent"
 								 Visibility="{Binding IsChecked, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource CheckBoxIsCheckedToFocusStateCircleCollapsed}, TargetNullValue=Collapsed, FallbackValue=Collapsed}"
 								 IsHitTestVisible="False"
 								 Opacity="0" />
@@ -547,7 +554,7 @@
 								 Stretch="Uniform"
 								 Width="{ThemeResource CheckBoxFocusAreaSize}"
 								 Height="{ThemeResource CheckBoxFocusAreaSize}"
-								 Fill="{ThemeResource CheckBoxStateCircleFillChecked}"
+								 Fill="Transparent"
 								 Visibility="{Binding IsChecked, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource CheckBoxIsCheckedToFocusStateCircleVisible}, TargetNullValue=Collapsed, FallbackValue=Collapsed}"
 								 IsHitTestVisible="False"
 								 Opacity="0" />
@@ -558,7 +565,7 @@
 								 Stretch="Uniform"
 								 Width="{ThemeResource CheckBoxFocusAreaSize}"
 								 Height="{ThemeResource CheckBoxFocusAreaSize}"
-								 Fill="{ThemeResource CheckBoxStateCircleFillChecked}"
+								 Fill="Transparent"
 								 IsHitTestVisible="False"
 								 Opacity="0" />
 
@@ -568,13 +575,13 @@
 							  CornerRadius="{TemplateBinding CornerRadius}">
 
 							<Grid x:Name="BackgroundBorder"
-								  Background="{ThemeResource CheckBoxCheckBackgroundFillUnchecked}"
-								  BorderBrush="{ThemeResource CheckBoxCheckBackgroundStrokeUnchecked}"
+								  Background="{ThemeResource CheckBoxCheckBackgroundFill}"
+								  BorderBrush="{ThemeResource CheckBoxCheckBackgroundStroke}"
 								  BorderThickness="{ThemeResource CheckBoxCheckAreaBorderThickness}" />
 
 							<Path x:Name="HyphenGlyph"
 								  Data="{ThemeResource CheckBoxHyphenGlyphPathData}"
-								  Fill="{ThemeResource CheckBoxGlyphForegroundIndeterminate}"
+								  Fill="{ThemeResource CheckBoxGlyphForeground}"
 								  VerticalAlignment="Center"
 								  HorizontalAlignment="Center"
 								  Stretch="Uniform"
@@ -586,7 +593,7 @@
 
 							<Path x:Name="CheckGlyph"
 								  Data="{ThemeResource CheckBoxCheckGlyphPathData}"
-								  Fill="{ThemeResource CheckBoxGlyphForegroundChecked}"
+								  Fill="{ThemeResource CheckBoxGlyphForeground}"
 								  VerticalAlignment="Center"
 								  HorizontalAlignment="Center"
 								  Stretch="Uniform"

diff --git a/src/library/Uno.Material/Styles/Controls/v2/Slider.xaml b/src/library/Uno.Material/Styles/Controls/v2/Slider.xaml
@@ -36,7 +36,7 @@
 			<x:Double x:Key="SliderHorizontalInlineTickBarHeight">2</x:Double>
 			<x:Double x:Key="SliderLeftTickBarWidth">4</x:Double>
 			<x:Double x:Key="SliderRightTickBarWidth">4</x:Double>
-			<x:Double x:Key="SliderVerticallInlineTickBarWidth">2</x:Double>
+			<x:Double x:Key="SliderVerticalInlineTickBarWidth">2</x:Double>
 			<Thickness x:Key="SliderTopTickBarMargin">0,0,0,4</Thickness>
 			<Thickness x:Key="SliderBottomTickBarMargin">0,4,0,0</Thickness>
 			<Thickness x:Key="SliderLeftTickBarMargin">0,0,4,0</Thickness>
@@ -84,7 +84,7 @@
 			<x:Double x:Key="SliderHorizontalInlineTickBarHeight">2</x:Double>
 			<x:Double x:Key="SliderLeftTickBarWidth">4</x:Double>
 			<x:Double x:Key="SliderRightTickBarWidth">4</x:Double>
-			<x:Double x:Key="SliderVerticallInlineTickBarWidth">2</x:Double>
+			<x:Double x:Key="SliderVerticalInlineTickBarWidth">2</x:Double>
 			<Thickness x:Key="SliderTopTickBarMargin">0,0,0,4</Thickness>
 			<Thickness x:Key="SliderBottomTickBarMargin">0,4,0,0</Thickness>
 			<Thickness x:Key="SliderLeftTickBarMargin">0,0,4,0</Thickness>
@@ -334,7 +334,7 @@
 								<TickBar x:Name="VerticalInlineTickBar"
 										 Grid.RowSpan="3"
 										 Grid.Column="1"
-										 Width="{ThemeResource SliderVerticallInlineTickBarWidth}"
+										 Width="{ThemeResource SliderVerticalInlineTickBarWidth}"
 										 Fill="{ThemeResource SliderInlineTickBarFill}"
 										 Visibility="Collapsed" />
 

diff --git a/src/library/Uno.Material/Styles/Controls/v2/ToggleButton.xaml b/src/library/Uno.Material/Styles/Controls/v2/ToggleButton.xaml
@@ -26,17 +26,17 @@
 			<!--#endregion-->
 
 			<!--#region Foreground-->
-			<StaticResource x:Key="TextToggleButtonForeground" ResourceKey="PrimaryColor" />
-			<StaticResource x:Key="TextToggleButtonForegroundPointerOver" ResourceKey="PrimaryColor" />
-			<StaticResource x:Key="TextToggleButtonForegroundPressed" ResourceKey="PrimaryColor" />
+			<StaticResource x:Key="TextToggleButtonForeground" ResourceKey="PrimaryBrush" />
+			<StaticResource x:Key="TextToggleButtonForegroundPointerOver" ResourceKey="PrimaryBrush" />
+			<StaticResource x:Key="TextToggleButtonForegroundPressed" ResourceKey="PrimaryBrush" />
 			<StaticResource x:Key="TextToggleButtonForegroundDisabled" ResourceKey="OnSurfaceLowBrush" />
-			<StaticResource x:Key="TextToggleButtonForegroundChecked" ResourceKey="PrimaryColor" />
-			<StaticResource x:Key="TextToggleButtonForegroundCheckedPointerOver" ResourceKey="PrimaryColor" />
-			<StaticResource x:Key="TextToggleButtonForegroundCheckedPressed" ResourceKey="PrimaryColor" />
+			<StaticResource x:Key="TextToggleButtonForegroundChecked" ResourceKey="PrimaryBrush" />
+			<StaticResource x:Key="TextToggleButtonForegroundCheckedPointerOver" ResourceKey="PrimaryBrush" />
+			<StaticResource x:Key="TextToggleButtonForegroundCheckedPressed" ResourceKey="PrimaryBrush" />
 			<StaticResource x:Key="TextToggleButtonForegroundCheckedDisabled" ResourceKey="OnSurfaceLowBrush" />
-			<StaticResource x:Key="TextToggleButtonForegroundIndeterminate" ResourceKey="PrimaryColor" />
-			<StaticResource x:Key="TextToggleButtonForegroundIndeterminatePointerOver" ResourceKey="PrimaryColor" />
-			<StaticResource x:Key="TextToggleButtonForegroundIndeterminatePressed" ResourceKey="PrimaryColor" />
+			<StaticResource x:Key="TextToggleButtonForegroundIndeterminate" ResourceKey="PrimaryBrush" />
+			<StaticResource x:Key="TextToggleButtonForegroundIndeterminatePointerOver" ResourceKey="PrimaryBrush" />
+			<StaticResource x:Key="TextToggleButtonForegroundIndeterminatePressed" ResourceKey="PrimaryBrush" />
 			<StaticResource x:Key="TextToggleButtonForegroundIndeterminateDisabled" ResourceKey="OnSurfaceLowBrush" />
 			<!--#endregion-->
 
@@ -153,17 +153,17 @@
 			<!--#endregion-->
 
 			<!--#region Foreground-->
-			<StaticResource x:Key="TextToggleButtonForeground" ResourceKey="PrimaryColor" />
-			<StaticResource x:Key="TextToggleButtonForegroundPointerOver" ResourceKey="PrimaryColor" />
-			<StaticResource x:Key="TextToggleButtonForegroundPressed" ResourceKey="PrimaryColor" />
+			<StaticResource x:Key="TextToggleButtonForeground" ResourceKey="PrimaryBrush" />
+			<StaticResource x:Key="TextToggleButtonForegroundPointerOver" ResourceKey="PrimaryBrush" />
+			<StaticResource x:Key="TextToggleButtonForegroundPressed" ResourceKey="PrimaryBrush" />
 			<StaticResource x:Key="TextToggleButtonForegroundDisabled" ResourceKey="OnSurfaceLowBrush" />
-			<StaticResource x:Key="TextToggleButtonForegroundChecked" ResourceKey="PrimaryColor" />
-			<StaticResource x:Key="TextToggleButtonForegroundCheckedPointerOver" ResourceKey="PrimaryColor" />
-			<StaticResource x:Key="TextToggleButtonForegroundCheckedPressed" ResourceKey="PrimaryColor" />
+			<StaticResource x:Key="TextToggleButtonForegroundChecked" ResourceKey="PrimaryBrush" />
+			<StaticResource x:Key="TextToggleButtonForegroundCheckedPointerOver" ResourceKey="PrimaryBrush" />
+			<StaticResource x:Key="TextToggleButtonForegroundCheckedPressed" ResourceKey="PrimaryBrush" />
 			<StaticResource x:Key="TextToggleButtonForegroundCheckedDisabled" ResourceKey="OnSurfaceLowBrush" />
-			<StaticResource x:Key="TextToggleButtonForegroundIndeterminate" ResourceKey="PrimaryColor" />
-			<StaticResource x:Key="TextToggleButtonForegroundIndeterminatePointerOver" ResourceKey="PrimaryColor" />
-			<StaticResource x:Key="TextToggleButtonForegroundIndeterminatePressed" ResourceKey="PrimaryColor" />
+			<StaticResource x:Key="TextToggleButtonForegroundIndeterminate" ResourceKey="PrimaryBrush" />
+			<StaticResource x:Key="TextToggleButtonForegroundIndeterminatePointerOver" ResourceKey="PrimaryBrush" />
+			<StaticResource x:Key="TextToggleButtonForegroundIndeterminatePressed" ResourceKey="PrimaryBrush" />
 			<StaticResource x:Key="TextToggleButtonForegroundIndeterminateDisabled" ResourceKey="OnSurfaceLowBrush" />
 			<!--#endregion-->