fix: adjust color palette and progress bar

unoplatform · Jun 3, 2022 · ead526e · ead526e
1 parent 631e2f5
commit ead526e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/library/Uno.Material/Styles/Application/v2/SharedColorPalette.xaml b/src/library/Uno.Material/Styles/Application/v2/SharedColorPalette.xaml
@@ -64,15 +64,15 @@
         <!--  Dark Theme  -->
         <ResourceDictionary x:Key="Dark">
             <!--  Primary  -->
-			<Color x:Key="PrimaryColor">#C8BFFF</Color>
-			<Color x:Key="OnPrimaryColor">#2800A1</Color>
+			<Color x:Key="PrimaryColor">#544794</Color>
+			<Color x:Key="OnPrimaryColor">#FFFFFF</Color>
 			<Color x:Key="PrimaryContainerColor">#4128BA</Color>
 			<Color x:Key="OnPrimaryContainerColor">#E5DEFF</Color>
 			<Color x:Key="PrimaryInverseColor">#5946D2</Color>
 
 			<!-- Primary Variant Legacy Colors -->
-			<Color x:Key="PrimaryVariantDarkColor">#353FE5</Color>
-			<Color x:Key="PrimaryVariantLightColor">#D4CBFC</Color>
+			<Color x:Key="PrimaryVariantDarkColor">#4128BA</Color>
+			<Color x:Key="PrimaryVariantLightColor">#C8BFFF</Color>
 
 			<!--  Secondary  -->
 			<Color x:Key="SecondaryColor">#63DCA6</Color>

diff --git a/src/library/Uno.Material/Styles/Controls/v2/ProgressBar.xaml b/src/library/Uno.Material/Styles/Controls/v2/ProgressBar.xaml
@@ -5,14 +5,19 @@
 					xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
 					mc:Ignorable="d">
 
+	<x:Double x:Key="MaterialProgressBarMinWidth">250</x:Double>
+	<x:Double x:Key="MaterialProgressBarHeight">4</x:Double>
+
 	<Style x:Key="MaterialProgressBarStyle"
 		   TargetType="muxc:ProgressBar">
 		<Setter Property="Foreground"
 				Value="{StaticResource PrimaryVariantDarkBrush}" />
 		<Setter Property="Background"
 				Value="{StaticResource PrimaryVariantLightBrush}" />
-		<Setter Property="Width"
-				Value="250" />
+		<Setter Property="MinWidth"
+				Value="{StaticResource MaterialProgressBarMinWidth}" />
+		<Setter Property="Height"
+				Value="{StaticResource MaterialProgressBarHeight}" />
 	</Style>
 
 </ResourceDictionary>