fix: Fixes Material Card themed backgrounds

unoplatform · May 25, 2023 · ebbde41 · ebbde41
1 parent cccd79f
commit ebbde41
Showing 1 changed file with 50 additions and 30 deletions.
diff --git a/src/library/Uno.Toolkit.Material/Styles/Controls/v2/Card.xaml b/src/library/Uno.Toolkit.Material/Styles/Controls/v2/Card.xaml
@@ -3,24 +3,44 @@
                     xmlns:utu="using:Uno.Toolkit.UI"
                     xmlns:um="using:Uno.Material"
                     xmlns:toolkit="using:Uno.UI.Toolkit">
-
-    <!-- Card Brushes Resources -->
-    <!-- Elevated -->
-    <StaticResource x:Key="MaterialElevatedCardBackground"
-	                ResourceKey="SurfaceBrush" />
-
-    <!-- Filled -->
-    <StaticResource x:Key="MaterialFilledCardBackground"
-	                ResourceKey="SurfaceVariantBrush" />
-
-    <!-- Outlined -->
-    <StaticResource x:Key="MaterialOutlinedCardBackground"
-	                ResourceKey="SurfaceBrush" />
-    <StaticResource x:Key="MaterialOutlinedCardBorderBrush"
-	                ResourceKey="OutlineBrush" />
-
-    <!--  Card Other Resources  -->
-    <!-- Double -->
+	<ResourceDictionary.ThemeDictionaries>
+		<!-- Card Brushes Theme Resources -->
+		<ResourceDictionary x:Key="Default">
+			<!-- Filled -->
+			<StaticResource x:Key="MaterialFilledCardBackground"
+							ResourceKey="SurfaceBrush" />
+
+			<!-- Outlined -->
+			<StaticResource x:Key="MaterialOutlinedCardBackground"
+							ResourceKey="SurfaceBrush" />
+
+			<!-- Elevated -->
+			<StaticResource x:Key="MaterialElevatedCardBackground"
+							ResourceKey="SurfaceBrush" />
+		</ResourceDictionary>
+
+		<ResourceDictionary x:Key="Light">
+			<!-- Filled -->
+			<StaticResource x:Key="MaterialFilledCardBackground"
+							ResourceKey="SurfaceBrush" />
+
+			<!-- Outlined -->
+			<StaticResource x:Key="MaterialOutlinedCardBackground"
+							ResourceKey="SurfaceBrush" />
+
+			<!-- Elevated -->
+			<StaticResource x:Key="MaterialElevatedCardBackground"
+							ResourceKey="SurfaceBrush" />
+		</ResourceDictionary>
+
+		<ResourceDictionary x:Key="HighContrast" />
+	</ResourceDictionary.ThemeDictionaries>
+
+	<!--  Card Other Resources  -->
+	<StaticResource x:Key="MaterialOutlinedCardBorderBrush"
+					ResourceKey="OutlineBrush" />
+
+	<!-- Double -->
     <x:Double x:Key="MaterialCardMinHeight">72</x:Double>
     <x:Double x:Key="MaterialCardMaxWidth">344</x:Double>
 
@@ -154,7 +174,7 @@
            TargetType="utu:Card"
            BasedOn="{StaticResource MaterialBaseCardStyle}">
         <Setter Property="Background"
-                Value="{StaticResource MaterialFilledCardBackground}" />
+                Value="{ThemeResource MaterialFilledCardBackground}" />
         <Setter Property="VerticalAlignment"
                 Value="Stretch" />
         <Setter Property="VerticalContentAlignment"
@@ -337,9 +357,9 @@
            BasedOn="{StaticResource MaterialFilledCardStyle}">
 
         <Setter Property="Background"
-                Value="{StaticResource MaterialOutlinedCardBackground}" />
+                Value="{ThemeResource MaterialOutlinedCardBackground}" />
         <Setter Property="BorderBrush"
-                Value="{ThemeResource MaterialOutlinedCardBorderBrush}" />
+                Value="{StaticResource MaterialOutlinedCardBorderBrush}" />
         <Setter Property="BorderThickness"
                 Value="{StaticResource MaterialCardBorderThickness}" />
     </Style>
@@ -348,7 +368,7 @@
            BasedOn="{StaticResource MaterialBaseCardStyle}"
            TargetType="utu:Card">
         <Setter Property="Background"
-                Value="{StaticResource MaterialElevatedCardBackground}" />
+                Value="{ThemeResource MaterialElevatedCardBackground}" />
         <Setter Property="VerticalAlignment"
                 Value="Stretch" />
         <Setter Property="VerticalContentAlignment"
@@ -534,7 +554,7 @@
            TargetType="utu:Card">
 
         <Setter Property="Background"
-                Value="{StaticResource MaterialFilledCardBackground}" />
+                Value="{ThemeResource MaterialFilledCardBackground}" />
 
         <Setter Property="Template">
             <Setter.Value>
@@ -733,9 +753,9 @@
            TargetType="utu:Card">
 
         <Setter Property="Background"
-                Value="{StaticResource MaterialOutlinedCardBackground}" />
+                Value="{ThemeResource MaterialOutlinedCardBackground}" />
         <Setter Property="BorderBrush"
-                Value="{ThemeResource MaterialOutlinedCardBorderBrush}" />
+                Value="{StaticResource MaterialOutlinedCardBorderBrush}" />
         <Setter Property="BorderThickness"
                 Value="{StaticResource MaterialCardBorderThickness}" />
     </Style>
@@ -745,7 +765,7 @@
            TargetType="utu:Card">
 
         <Setter Property="Background"
-                Value="{StaticResource MaterialElevatedCardBackground}" />
+                Value="{ThemeResource MaterialElevatedCardBackground}" />
         <Setter Property="Elevation"
                 Value="{StaticResource MaterialCardElevation}" />
 
@@ -949,7 +969,7 @@
            TargetType="utu:Card">
 
         <Setter Property="Background"
-                Value="{StaticResource MaterialFilledCardBackground}" />
+                Value="{ThemeResource MaterialFilledCardBackground}" />
 
         <Setter Property="Template">
             <Setter.Value>
@@ -1137,9 +1157,9 @@
         <Setter Property="Padding"
                 Value="0" />
         <Setter Property="Background"
-                Value="{StaticResource MaterialOutlinedCardBackground}" />
+                Value="{ThemeResource MaterialOutlinedCardBackground}" />
         <Setter Property="BorderBrush"
-                Value="{ThemeResource MaterialOutlinedCardBorderBrush}" />
+                Value="{StaticResource MaterialOutlinedCardBorderBrush}" />
         <Setter Property="BorderThickness"
                 Value="{StaticResource MaterialCardBorderThickness}" />
     </Style>
@@ -1149,7 +1169,7 @@
            TargetType="utu:Card">
 
         <Setter Property="Background"
-                Value="{StaticResource MaterialElevatedCardBackground}" />
+                Value="{ThemeResource MaterialElevatedCardBackground}" />
         <Setter Property="Elevation"
                 Value="{StaticResource MaterialCardElevation}" />