From 025eb95812f04ae889df76e481cb34634920598f Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 15 Dec 2021 21:34:05 +0000
Subject: [PATCH] Revert "refactor how colour schemes are loaded."

This reverts commit 317684b70a26252ef835c616a163e93627a663ff.
---
 samples/ControlCatalog/App.xaml.cs              | 17 +++++------------
 .../Accents/BaseDark.xaml                       |  8 ++++----
 .../Accents/BaseLight.xaml                      |  8 ++++----
 src/Avalonia.Themes.Fluent/FluentDark.xaml      |  1 +
 src/Avalonia.Themes.Fluent/FluentLight.xaml     |  3 ++-
 5 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/samples/ControlCatalog/App.xaml.cs b/samples/ControlCatalog/App.xaml.cs
index 7763eaa7dc..36b6fc2dcd 100644
--- a/samples/ControlCatalog/App.xaml.cs
+++ b/samples/ControlCatalog/App.xaml.cs
@@ -30,24 +30,18 @@ namespace ControlCatalog
         {
             new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
             {
-                Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/BaseDarkColors.xaml")
-            }
+                Source = new Uri("avares://Avalonia.Themes.Fluent/FluentDark.xaml")
+            },
+            DataGridFluent
         };
 
         public static Styles FluentLight = new Styles
-        {
-            new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
-            {
-                Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/BaseLightColors.xaml")
-            }
-        };
-        
-        public static Styles FluentLightTheme = new Styles
         {
             new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
             {
                 Source = new Uri("avares://Avalonia.Themes.Fluent/FluentLight.xaml")
-            }
+            },
+            DataGridFluent
         };
 
         public static Styles DefaultLight = new Styles
@@ -103,7 +97,6 @@ namespace ControlCatalog
         public override void Initialize()
         {
             Styles.Insert(0, FluentLight);
-            Styles.Insert(1, FluentLightTheme);
 
             AvaloniaXamlLoader.Load(this);
         }
diff --git a/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml b/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml
index fc5f5b478d..99d01e40a5 100644
--- a/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/BaseDark.xaml
@@ -1,7 +1,7 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<Style xmlns="https://github.com/avaloniaui"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        xmlns:sys="clr-namespace:System;assembly=netstandard">
-  <Styles.Resources>
+  <Style.Resources>
     <SolidColorBrush x:Key="SystemControlBackgroundAccentBrush" Color="{DynamicResource SystemAccentColor}" />
     <SolidColorBrush x:Key="SystemControlBackgroundAltHighBrush" Color="{StaticResource SystemAltHighColor}" />
     <SolidColorBrush x:Key="SystemControlBackgroundAltMediumHighBrush" Color="{StaticResource SystemAltMediumHighColor}" />
@@ -145,5 +145,5 @@
 
     <!-- Moved from Menu.xaml -->
     <Thickness x:Key="MenuBarItemPadding">12,0,12,0</Thickness> 
-  </Styles.Resources>
-</Styles>
+  </Style.Resources>
+</Style>
diff --git a/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml b/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml
index b780ce41df..b984e84300 100644
--- a/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/BaseLight.xaml
@@ -1,7 +1,7 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<Style xmlns="https://github.com/avaloniaui"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        xmlns:sys="clr-namespace:System;assembly=netstandard">
-  <Styles.Resources>
+  <Style.Resources>
     <SolidColorBrush x:Key="SystemControlBackgroundAccentBrush" Color="{DynamicResource SystemAccentColor}" />
     <SolidColorBrush x:Key="SystemControlBackgroundAltHighBrush" Color="{StaticResource SystemAltHighColor}" />
     <SolidColorBrush x:Key="SystemControlBackgroundAltMediumHighBrush" Color="{StaticResource SystemAltMediumHighColor}" />
@@ -148,5 +148,5 @@
 
     <!-- Moved from Menu.xaml -->
     <Thickness x:Key="MenuBarItemPadding">12,0,12,0</Thickness>
-  </Styles.Resources>
-</Styles>
+  </Style.Resources>
+</Style>
diff --git a/src/Avalonia.Themes.Fluent/FluentDark.xaml b/src/Avalonia.Themes.Fluent/FluentDark.xaml
index 50b12efd78..30cabaac6b 100644
--- a/src/Avalonia.Themes.Fluent/FluentDark.xaml
+++ b/src/Avalonia.Themes.Fluent/FluentDark.xaml
@@ -3,6 +3,7 @@
        xmlns:sys="clr-namespace:System;assembly=netstandard">
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/AccentColors.xaml" />
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/BaseDark.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/BaseDarkColors.xaml" />
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/Base.xaml" />
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml" />
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FluentControls.xaml" />
diff --git a/src/Avalonia.Themes.Fluent/FluentLight.xaml b/src/Avalonia.Themes.Fluent/FluentLight.xaml
index 6947420acc..08766e0d0e 100644
--- a/src/Avalonia.Themes.Fluent/FluentLight.xaml
+++ b/src/Avalonia.Themes.Fluent/FluentLight.xaml
@@ -2,7 +2,8 @@
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        xmlns:sys="clr-namespace:System;assembly=netstandard">
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/AccentColors.xaml" />
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/BaseLight.xaml" />  
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/BaseLight.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/BaseLightColors.xaml" />
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/Base.xaml" />  
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml" />
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FluentControls.xaml" />