Feature: Adjusted the mica tint color (#10645)

files-community · Dec 7, 2022 · 6bb0724 · 6bb0724
1 parent 5eab84f
commit 6bb0724
Show file tree

Hide file tree

Showing 23 changed files with 5 additions and 640 deletions.
diff --git a/src/Files.App/App.xaml b/src/Files.App/App.xaml
@@ -24,15 +24,14 @@
 				<ResourceDictionary>
 					<ResourceDictionary.ThemeDictionaries>
 						<ResourceDictionary x:Key="Light">
-							<Color x:Key="SolidBackgroundAcrylic">#FFFFFF</Color>
 							<SolidColorBrush x:Key="TabViewItemHeaderBackground" Color="{StaticResource SubtleFillColorTransparent}" />
-							<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource LayerFillColorDefault}" />
+							<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
 							<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
 							<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
 							<SolidColorBrush x:Key="TabViewItemSeparator" Color="{StaticResource DividerStrokeColorDefault}" />
 							<SolidColorBrush x:Key="TabContainerFillColorPrimary" Color="{StaticResource SolidBackgroundFillColorTertiary}" />
 							<SolidColorBrush x:Key="TabContainerFillColorSecondary" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
-							<SolidColorBrush x:Key="NavigationToolbarBackgroundBrush" Color="{StaticResource LayerFillColorDefault}" />
+							<SolidColorBrush x:Key="NavigationToolbarBackgroundBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
 							<SolidColorBrush x:Key="NavigationToolbarBreadcrumbBackgroundBrush" Color="Transparent" />
 							<SolidColorBrush x:Key="FileBrowserHeaderBackgroundBrush" Color="Transparent" />
 							<SolidColorBrush x:Key="RootBackgroundBrush" Color="Transparent" />
@@ -41,15 +40,14 @@
 							<SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
 						</ResourceDictionary>
 						<ResourceDictionary x:Key="Dark">
-							<Color x:Key="SolidBackgroundAcrylic">#2C2C2C</Color>
 							<SolidColorBrush x:Key="TabViewItemHeaderBackground" Color="{StaticResource SubtleFillColorTransparent}" />
-							<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource LayerFillColorDefault}" />
+							<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
 							<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
 							<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
 							<SolidColorBrush x:Key="TabViewItemSeparator" Color="{StaticResource DividerStrokeColorDefault}" />
 							<SolidColorBrush x:Key="TabContainerFillColorPrimary" Color="{StaticResource SolidBackgroundFillColorTertiary}" />
 							<SolidColorBrush x:Key="TabContainerFillColorSecondary" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
-							<SolidColorBrush x:Key="NavigationToolbarBackgroundBrush" Color="{StaticResource LayerFillColorDefault}" />
+							<SolidColorBrush x:Key="NavigationToolbarBackgroundBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
 							<SolidColorBrush x:Key="NavigationToolbarBreadcrumbBackgroundBrush" Color="Transparent" />
 							<SolidColorBrush x:Key="FileBrowserHeaderBackgroundBrush" Color="Transparent" />
 							<SolidColorBrush x:Key="RootBackgroundBrush" Color="Transparent" />
@@ -58,7 +56,6 @@
 							<SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
 						</ResourceDictionary>
 						<ResourceDictionary x:Key="HighContrast">
-							<Color x:Key="SolidBackgroundAcrylic">#2C2C2C</Color>
 							<SolidColorBrush x:Key="TabViewItemHeaderBackground" Color="{StaticResource SystemColorWindowColor}" />
 							<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource LayerFillColorDefault}" />
 							<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="{StaticResource SystemColorHighlightColor}" />

diff --git a/src/Files.App/MainWindow.xaml b/src/Files.App/MainWindow.xaml
@@ -8,7 +8,7 @@
 	mc:Ignorable="d">
 
 	<winuiex:WindowEx.Backdrop>
-		<winuiex:MicaSystemBackdrop DarkTintOpacity="0.8" />
+		<winuiex:MicaSystemBackdrop DarkTintOpacity="0.8" LightTintColor="#CCf3f3f3"/>
 	</winuiex:WindowEx.Backdrop>
 
 	<Grid />

diff --git a/src/Files.App/Themes/Acrylic.xaml b/src/Files.App/Themes/Acrylic.xaml
diff --git a/src/Files.App/Themes/Blue Acrylic.xaml b/src/Files.App/Themes/Blue Acrylic.xaml
diff --git a/src/Files.App/Themes/Bound to be Blue.xaml b/src/Files.App/Themes/Bound to be Blue.xaml
@@ -15,8 +15,6 @@
 			<SolidColorBrush x:Key="SolidBackgroundFillColorSecondaryBrush" Color="{ThemeResource SolidBackgroundFillColorSecondary}" />
 			<SolidColorBrush x:Key="SolidBackgroundFillColorTertiaryBrush" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
 			<SolidColorBrush x:Key="SolidBackgroundFillColorQuarternaryBrush" Color="{ThemeResource SolidBackgroundFillColorQuarternary}" />
-			<!--  Acrylic Resources  -->
-			<Color x:Key="SolidBackgroundAcrylic">#274472</Color>
 			<!--  Accent Color  -->
 			<Color x:Key="SystemAccentColor">#3967B1</Color>
 			<Color x:Key="SystemAccentColorDark1">#3967B1</Color>
@@ -37,8 +35,6 @@
 			<SolidColorBrush x:Key="SolidBackgroundFillColorSecondaryBrush" Color="{ThemeResource SolidBackgroundFillColorSecondary}" />
 			<SolidColorBrush x:Key="SolidBackgroundFillColorTertiaryBrush" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
 			<SolidColorBrush x:Key="SolidBackgroundFillColorQuarternaryBrush" Color="{ThemeResource SolidBackgroundFillColorQuarternary}" />
-			<!--  Acrylic Resources  -->
-			<Color x:Key="SolidBackgroundAcrylic">#4781DE</Color>
 			<!--  Accent Color  -->
 			<Color x:Key="SystemAccentColor">#82B0FE</Color>
 			<Color x:Key="SystemAccentColorDark1">#82B0FE</Color>

diff --git a/src/Files.App/Themes/Bronze.xaml b/src/Files.App/Themes/Bronze.xaml
@@ -15,8 +15,6 @@
 			<SolidColorBrush x:Key="SolidBackgroundFillColorSecondaryBrush" Color="{ThemeResource SolidBackgroundFillColorSecondary}" />
 			<SolidColorBrush x:Key="SolidBackgroundFillColorTertiaryBrush" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
 			<SolidColorBrush x:Key="SolidBackgroundFillColorQuarternaryBrush" Color="{ThemeResource SolidBackgroundFillColorQuarternary}" />
-			<!--  Acrylic Resources  -->
-			<Color x:Key="SolidBackgroundAcrylic">#A26829</Color>
 			<!--  Accent Color  -->
 			<Color x:Key="SystemAccentColor">#FFDF87</Color>
 			<Color x:Key="SystemAccentColorDark1">#FFDF87</Color>
@@ -37,8 +35,6 @@
 			<SolidColorBrush x:Key="SolidBackgroundFillColorSecondaryBrush" Color="{ThemeResource SolidBackgroundFillColorSecondary}" />
 			<SolidColorBrush x:Key="SolidBackgroundFillColorTertiaryBrush" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
 			<SolidColorBrush x:Key="SolidBackgroundFillColorQuarternaryBrush" Color="{ThemeResource SolidBackgroundFillColorQuarternary}" />
-			<!--  Acrylic Resources  -->
-			<Color x:Key="SolidBackgroundAcrylic">#D5B18A</Color>
 			<!--  Accent Color  -->
 			<Color x:Key="SystemAccentColor">#A26829</Color>
 			<Color x:Key="SystemAccentColorDark1">#D5B18A</Color>

diff --git a/src/Files.App/Themes/Burgundy.xaml b/src/Files.App/Themes/Burgundy.xaml
@@ -15,8 +15,6 @@
 			<SolidColorBrush x:Key="SolidBackgroundFillColorSecondaryBrush" Color="{ThemeResource SolidBackgroundFillColorSecondary}" />
 			<SolidColorBrush x:Key="SolidBackgroundFillColorTertiaryBrush" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
 			<SolidColorBrush x:Key="SolidBackgroundFillColorQuarternaryBrush" Color="{ThemeResource SolidBackgroundFillColorQuarternary}" />
-			<!--  Acrylic Resources  -->
-			<Color x:Key="SolidBackgroundAcrylic">#592A37</Color>
 			<!--  Accent Color  -->
 			<Color x:Key="SystemAccentColor">#CB607C</Color>
 			<Color x:Key="SystemAccentColorDark1">#CB607C</Color>
@@ -37,8 +35,6 @@
 			<SolidColorBrush x:Key="SolidBackgroundFillColorSecondaryBrush" Color="{ThemeResource SolidBackgroundFillColorSecondary}" />
 			<SolidColorBrush x:Key="SolidBackgroundFillColorTertiaryBrush" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
 			<SolidColorBrush x:Key="SolidBackgroundFillColorQuarternaryBrush" Color="{ThemeResource SolidBackgroundFillColorQuarternary}" />
-			<!--  Acrylic Resources  -->
-			<Color x:Key="SolidBackgroundAcrylic">#CB607C</Color>
 			<!--  Accent Color  -->
 			<Color x:Key="SystemAccentColor">#97475C</Color>
 			<Color x:Key="SystemAccentColorDark1">#97475C</Color>