From bd29bc333afc9eb9858fd3f3730dcb6fdf2cd0b9 Mon Sep 17 00:00:00 2001
From: Maksym Katsydan <maxkatz6@outlook.com>
Date: Mon, 29 Jun 2020 23:44:45 -0400
Subject: [PATCH] Remove duplicated colors from fluent theme editor with
 non-standard values

---
 .../Accents/FluentBaseDark.xaml               | 38 +-----------------
 .../Accents/FluentBaseLight.xaml              | 39 +------------------
 2 files changed, 4 insertions(+), 73 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
index b12a639d31..b5d502787d 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml
@@ -2,35 +2,8 @@
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
   xmlns:sys="clr-namespace:System;assembly=netstandard">
   <Style.Resources>
-    <Color x:Key="SystemAccentColor">#FF0078D7</Color>
-    <Color x:Key="SystemAltHighColor">#FF000000</Color>
-    <Color x:Key="SystemAltLowColor">#FF000000</Color>
-    <Color x:Key="SystemAltMediumColor">#FF000000</Color>
-    <Color x:Key="SystemAltMediumHighColor">#FF000000</Color>
-    <Color x:Key="SystemAltMediumLowColor">#FF000000</Color>
-    <Color x:Key="SystemBaseHighColor">#FFFFFFFF</Color>
-    <Color x:Key="SystemBaseLowColor">#FF333333</Color>
-    <Color x:Key="SystemBaseMediumColor">#FF9A9A9A</Color>
-    <Color x:Key="SystemBaseMediumHighColor">#FFB4B4B4</Color>
-    <Color x:Key="SystemBaseMediumLowColor">#FF676767</Color>
-    <Color x:Key="SystemChromeAltLowColor">#FFB4B4B4</Color>
-    <Color x:Key="SystemChromeBlackHighColor">#FF000000</Color>
-    <Color x:Key="SystemChromeBlackLowColor">#FFB4B4B4</Color>
-    <Color x:Key="SystemChromeBlackMediumColor">#FF000000</Color>
-    <Color x:Key="SystemChromeBlackMediumLowColor">#FF000000</Color>
-    <Color x:Key="SystemChromeDisabledHighColor">#FF333333</Color>
-    <Color x:Key="SystemChromeGrayColor">#FF808080</Color>
-    <Color x:Key="SystemChromeHighColor">#FF808080</Color>
-    <Color x:Key="SystemChromeLowColor">#FF151515</Color>
-    <Color x:Key="SystemChromeMediumColor">#FF1D1D1D</Color>
-    <Color x:Key="SystemChromeMediumLowColor">#FF2C2C2C</Color>
-    <Color x:Key="SystemChromeWhiteColor">#FFFFFFFF</Color>
-    <Color x:Key="SystemListLowColor">#FF1D1D1D</Color>
-    <Color x:Key="SystemListMediumColor">#FF333333</Color>
-    <Color x:Key="SystemChromeAltMediumHighColor">#CC000000</Color>
-    <Color x:Key="SystemChromeAltHighColor">#FF333333</Color>
-    <Color x:Key="SystemRevealListLowColor">#FF1D1D1D</Color>
-    <Color x:Key="SystemRevealListMediumColor">#FF333333</Color>
+    <Color x:Key="SystemRevealListLowColor">#18FFFFFF</Color>
+    <Color x:Key="SystemRevealListMediumColor">#30FFFFFF</Color>
     <!--<AcrylicBrush x:Key="SystemControlAcrylicWindowBrush" BackgroundSource="HostBackdrop" TintColor="{ThemeResource SystemChromeAltHighColor}" TintOpacity="0.8" FallbackColor="{ThemeResource SystemChromeMediumColor}" />-->
     <!--<RevealBackgroundBrush x:Key="SystemControlTransparentRevealBackgroundBrush" TargetTheme="Dark" Color="Transparent" FallbackColor="Transparent" />-->
     <SolidColorBrush x:Key="SystemControlTransparentRevealBackgroundBrush" Color="Transparent" />
@@ -67,13 +40,6 @@
     <Thickness x:Key="ComboBoxItemRevealBorderThemeThickness">1,1,1,1</Thickness>
     <x:Double x:Key="PersonPictureEllipseBadgeStrokeThickness">1</x:Double>
     
-    <!-- Override system generated accent colors -->
-    <Color x:Key="SystemAccentColorDark1">#FF005A9E</Color>
-    <Color x:Key="SystemAccentColorDark2">#FF004275</Color>
-    <Color x:Key="SystemAccentColorDark3">#FF002642</Color>
-    <Color x:Key="SystemAccentColorLight1">#FF429CE3</Color>
-    <Color x:Key="SystemAccentColorLight2">#FF76B9ED</Color>
-    <Color x:Key="SystemAccentColorLight3">#FFA6D8FF</Color>
     <Color x:Key="RegionColor">#FF000000</Color>
     <SolidColorBrush x:Key="RegionBrush" Color="{StaticResource RegionColor}" />
     
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
index 31c2f592b9..0806a6e9ef 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml
@@ -2,36 +2,8 @@
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
   xmlns:sys="clr-namespace:System;assembly=netstandard">
   <Style.Resources>
-    <Color x:Key="SystemAccentColor">#FF0078D7</Color>
-    <Color x:Key="SystemAltHighColor">#FFFFFFFF</Color>
-    <Color x:Key="SystemAltLowColor">#FFFFFFFF</Color>
-    <Color x:Key="SystemAltMediumColor">#FFFFFFFF</Color>
-    <Color x:Key="SystemAltMediumHighColor">#FFFFFFFF</Color>
-    <Color x:Key="SystemAltMediumLowColor">#FFFFFFFF</Color>
-    <Color x:Key="SystemBaseHighColor">#FF000000</Color>
-    <Color x:Key="SystemBaseLowColor">#FFCCCCCC</Color>
-    <Color x:Key="SystemBaseMediumColor">#FF898989</Color>
-    <Color x:Key="SystemBaseMediumHighColor">#FF5D5D5D</Color>
-    <Color x:Key="SystemBaseMediumLowColor">#FF737373</Color>
-    <Color x:Key="SystemChromeAltLowColor">#FF5D5D5D</Color>
-    <Color x:Key="SystemChromeBlackHighColor">#FF000000</Color>
-    <Color x:Key="SystemChromeBlackLowColor">#FFCCCCCC</Color>
-    <Color x:Key="SystemChromeBlackMediumColor">#FF5D5D5D</Color>
-    <Color x:Key="SystemChromeBlackMediumLowColor">#FF898989</Color>
-    <Color x:Key="SystemChromeDisabledHighColor">#FFCCCCCC</Color>
-    <Color x:Key="SystemChromeDisabledLowColor">#FF898989</Color>
-    <Color x:Key="SystemChromeGrayColor">#FF737373</Color>
-    <Color x:Key="SystemChromeHighColor">#FFCCCCCC</Color>
-    <Color x:Key="SystemChromeLowColor">#FFECECEC</Color>
-    <Color x:Key="SystemChromeMediumColor">#FFE6E6E6</Color>
-    <Color x:Key="SystemChromeMediumLowColor">#FFECECEC</Color>
-    <Color x:Key="SystemChromeWhiteColor">#FFFFFFFF</Color>
-    <Color x:Key="SystemListLowColor">#FFE6E6E6</Color>
-    <Color x:Key="SystemListMediumColor">#FFCCCCCC</Color>
-    <Color x:Key="SystemChromeAltMediumHighColor">#CCFFFFFF</Color>
-    <Color x:Key="SystemChromeAltHighColor">#FFCCCCCC</Color>
-    <Color x:Key="SystemRevealListLowColor">#FFE6E6E6</Color>
-    <Color x:Key="SystemRevealListMediumColor">#FFCCCCCC</Color>
+    <Color x:Key="SystemRevealListLowColor">#17000000</Color>
+    <Color x:Key="SystemRevealListMediumColor">#2E000000</Color>
     <!--<AcrylicBrush x:Key="SystemControlAcrylicWindowBrush" BackgroundSource="HostBackdrop" TintColor="{ThemeResource SystemChromeAltHighColor}" TintOpacity="0.8" FallbackColor="{ThemeResource SystemChromeMediumColor}" />-->
     <!--<RevealBackgroundBrush x:Key="SystemControlTransparentRevealBackgroundBrush" TargetTheme="Dark" Color="Transparent" FallbackColor="Transparent" />-->
     <SolidColorBrush x:Key="SystemControlTransparentRevealBackgroundBrush" Color="Transparent" />
@@ -68,13 +40,6 @@
     <Thickness x:Key="ComboBoxItemRevealBorderThemeThickness">1,1,1,1</Thickness>
     <x:Double x:Key="PersonPictureEllipseBadgeStrokeThickness">1</x:Double>
     
-    <!-- Override system generated accent colors -->
-    <Color x:Key="SystemAccentColorDark1">#FF005A9E</Color>
-    <Color x:Key="SystemAccentColorDark2">#FF004275</Color>
-    <Color x:Key="SystemAccentColorDark3">#FF002642</Color>
-    <Color x:Key="SystemAccentColorLight1">#FF429CE3</Color>
-    <Color x:Key="SystemAccentColorLight2">#FF76B9ED</Color>
-    <Color x:Key="SystemAccentColorLight3">#FFA6D8FF</Color>
     <!--<RevealBackgroundBrush x:Key="SystemControlHighlightListLowRevealBackgroundBrush" TargetTheme="Light" Color="{ThemeResource SystemRevealListMediumColor}" FallbackColor="{ StaticResource SystemListMediumColor}" />-->
     <Color x:Key="RegionColor">#FFFFFFFF</Color>
     <SolidColorBrush x:Key="RegionBrush" Color="{StaticResource RegionColor}" />