From 2a439bddf99ac65154b1112877259a37723ce37d Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sun, 5 Jul 2020 18:43:01 -0300
Subject: [PATCH] use avares for fluent theme.

---
 samples/ControlCatalog/App.xaml.cs            |  18 +--
 .../Accents/FluentDark.xaml                   |  10 +-
 .../Accents/FluentLight.xaml                  |  10 +-
 .../Avalonia.Themes.Fluent.csproj             |   8 +-
 src/Avalonia.Themes.Fluent/FluentTheme.xaml   | 109 +++++++++---------
 5 files changed, 75 insertions(+), 80 deletions(-)

diff --git a/samples/ControlCatalog/App.xaml.cs b/samples/ControlCatalog/App.xaml.cs
index a6754143a2..130c000440 100644
--- a/samples/ControlCatalog/App.xaml.cs
+++ b/samples/ControlCatalog/App.xaml.cs
@@ -11,25 +11,25 @@ namespace ControlCatalog
     {
         public static Styles FluentDark = new Styles
         {
-            new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
+            new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
             {
-                Source = new Uri("resm:Avalonia.Themes.Default.Accents.BaseDark.xaml?assembly=Avalonia.Themes.Default")
+                Source = new Uri("avares://Avalonia.Themes.Default/Accents/BaseDark.xaml")
             },
-            new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
+            new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
             {
-                Source = new Uri("resm:Avalonia.Themes.Fluent.Accents.FluentDark.xaml?assembly=Avalonia.Themes.Fluent")
+                Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/FluentDark.xaml")
             },
         };
 
         public static Styles FluentLight = new Styles
         {
-            new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
+            new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
             {
-                Source = new Uri("resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default")
+                Source = new Uri("avares://Avalonia.Themes.Default/Accents/BaseLight.xaml")
             },
-            new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
+            new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
             {
-                Source = new Uri("resm:Avalonia.Themes.Fluent.Accents.FluentLight.xaml?assembly=Avalonia.Themes.Fluent")
+                Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/FluentLight.xaml")
             },
         };
 
@@ -61,7 +61,7 @@ namespace ControlCatalog
         {
             AvaloniaXamlLoader.Load(this);
 
-            Styles.Insert(0, FluentDark);
+            Styles.Insert(0, FluentLight);
         }
 
         public override void OnFrameworkInitializationCompleted()
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentDark.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentDark.xaml
index d29db79e7b..9ef92a44d5 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentDark.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentDark.xaml
@@ -1,9 +1,9 @@
 <Styles xmlns="https://github.com/avaloniaui"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        xmlns:sys="clr-namespace:System;assembly=netstandard">  
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.Accents.BaseDark.xaml?assembly=Avalonia.Themes.Fluent" />
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.Accents.Base.xaml?assembly=Avalonia.Themes.Fluent" />
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.Accents.FluentBaseDark.xaml?assembly=Avalonia.Themes.Fluent" />
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.Accents.FluentControlResourcesDark.xaml?assembly=Avalonia.Themes.Fluent" />
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.FluentTheme.xaml?assembly=Avalonia.Themes.Fluent" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/BaseDark.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/Base.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/FluentTheme.xaml" />
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentLight.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentLight.xaml
index 43867f6e97..8c92040122 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentLight.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentLight.xaml
@@ -1,9 +1,9 @@
 <Styles xmlns="https://github.com/avaloniaui"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        xmlns:sys="clr-namespace:System;assembly=netstandard">
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Fluent" />
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.Accents.Base.xaml?assembly=Avalonia.Themes.Fluent" />  
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.Accents.FluentBaseLight.xaml?assembly=Avalonia.Themes.Fluent" />
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.Accents.FluentControlResourcesLight.xaml?assembly=Avalonia.Themes.Fluent" />
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.FluentTheme.xaml?assembly=Avalonia.Themes.Fluent" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/BaseLight.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/Base.xaml" />  
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/FluentTheme.xaml" />
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
index 84bf799d8d..c5eb016fe8 100644
--- a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
+++ b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
@@ -11,12 +11,8 @@
     <ProjectReference Include="..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
     <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
     <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <AvaloniaResource Include="FluentTheme.xaml" />
-    <AvaloniaResource Include="Accents/*.xaml" />
-    <AvaloniaResource Include="DensityStyles/*.xaml" />
-    <!-- Compatibility with old apps, probably need to replace with AvaloniaResource -->
-    <EmbeddedResource Include="**/*.xaml" />
+    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />    
+    <AvaloniaResource Include="**/*.xaml" />    
   </ItemGroup>
   <Import Project="..\..\build\BuildTargets.targets" />
   <Import Project="..\..\build\Rx.props" />
diff --git a/src/Avalonia.Themes.Fluent/FluentTheme.xaml b/src/Avalonia.Themes.Fluent/FluentTheme.xaml
index 2cb34431fa..3d54f082bd 100644
--- a/src/Avalonia.Themes.Fluent/FluentTheme.xaml
+++ b/src/Avalonia.Themes.Fluent/FluentTheme.xaml
@@ -2,60 +2,59 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="Avalonia.Themes.Fluent.FluentTheme">
   <!-- Define ToolTip first so its styles can be overriden by other controls (e.g. TextBox) -->  
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.ToolTip.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.DataValidationErrors.xaml?assembly=Avalonia.Themes.Fluent"/>
-
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.FocusAdorner.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.Button.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.CaptionButtons.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.Carousel.xaml?assembly=Avalonia.Themes.Fluent"/>  
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.CheckBox.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.ComboBox.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.ComboBoxItem.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.ContentControl.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.GridSplitter.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.ItemsControl.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.ListBox.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.ListBoxItem.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.Menu.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.ContextMenu.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.MenuItem.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.OverlayPopupHost.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.PopupRoot.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.ProgressBar.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.RadioButton.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.RepeatButton.xaml?assembly=Avalonia.Themes.Fluent" />
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.Separator.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.Slider.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.ScrollBar.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.ScrollViewer.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.TabStrip.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.TabStripItem.xaml?assembly=Avalonia.Themes.Fluent"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ToolTip.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/DataValidationErrors.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/FocusAdorner.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Button.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/CaptionButtons.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Carousel.xaml"/>  
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/CheckBox.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ComboBox.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ComboBoxItem.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ContentControl.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/GridSplitter.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ItemsControl.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ListBox.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ListBoxItem.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Menu.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ContextMenu.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/MenuItem.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/OverlayPopupHost.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/PopupRoot.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ProgressBar.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/RadioButton.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/RepeatButton.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Separator.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Slider.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ScrollBar.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ScrollViewer.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/TabStrip.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/TabStripItem.xaml"/>
   <!-- TabControl needs to come after TabStrip as it redefines the inner TabStrip.ItemsPanel-->
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.TabControl.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.TabItem.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.TextBox.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.ToggleButton.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.Expander.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.TitleBar.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.TreeView.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.TreeViewItem.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.UserControl.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.Window.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.EmbeddableControlRoot.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.CalendarButton.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.CalendarDayButton.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.CalendarItem.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.Calendar.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.CalendarDatePicker.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.ButtonSpinner.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.NumericUpDown.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.AutoCompleteBox.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.WindowNotificationManager.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.NotificationCard.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.NativeMenuBar.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.ToggleSwitch.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.SplitView.xaml?assembly=Avalonia.Themes.Fluent"/>
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.DatePicker.xaml?assembly=Avalonia.Themes.Fluent"/>  
-  <StyleInclude Source="resm:Avalonia.Themes.Fluent.TimePicker.xaml?assembly=Avalonia.Themes.Fluent"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/TabControl.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/TabItem.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/TextBox.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ToggleButton.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Expander.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/TitleBar.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/TreeView.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/TreeViewItem.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/UserControl.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Window.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/EmbeddableControlRoot.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/CalendarButton.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/CalendarDayButton.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/CalendarItem.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Calendar.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/CalendarDatePicker.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ButtonSpinner.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/NumericUpDown.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/AutoCompleteBox.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/WindowNotificationManager.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/NotificationCard.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/NativeMenuBar.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ToggleSwitch.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/SplitView.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/DatePicker.xaml"/>  
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/TimePicker.xaml"/>
 </Styles>