From 854d393b438c15e50331e5b45f4e9fde2d08b673 Mon Sep 17 00:00:00 2001
From: Daniel Clark <dan_clark@outlook.com>
Date: Tue, 1 Nov 2022 22:55:17 +0000
Subject: [PATCH] Map FluentStyles to XamlControlsResources

---
 App/WeddingBuilder/App.axaml                       |  5 ++---
 App/WeddingBuilder/App.axaml.cs                    |  1 +
 App/WeddingBuilder/Builder.csproj                  |  1 -
 Framework/Avalonia/Avalonia.csproj                 |  3 +--
 Framework/Avalonia/Templates/TemplateSelector.cs   |  2 +-
 .../DataTemplateSelector/DataTemplateSelector.cs   |  6 ++++++
 UI/Avalonia/Avalonia.csproj                        |  1 +
 UI/Avalonia/XamlControlsResources.cs               | 14 ++++++++++++++
 8 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 UI/Avalonia.Controls/DataTemplateSelector/DataTemplateSelector.cs
 create mode 100644 UI/Avalonia/XamlControlsResources.cs

diff --git a/App/WeddingBuilder/App.axaml b/App/WeddingBuilder/App.axaml
index 1218238..4668d1f 100644
--- a/App/WeddingBuilder/App.axaml
+++ b/App/WeddingBuilder/App.axaml
@@ -1,10 +1,9 @@
 <Application
     x:Class="Builder.App"
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:style="using:FluentAvalonia.Styling">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Application.Styles>
-        <style:FluentAvaloniaTheme />
+		<XamlControlsResources />
         <Style Selector="Button.Icon">
             <Setter Property="FontSize" Value="16" />
             <Setter Property="FontFamily" Value="{StaticResource SymbolThemeFontFamily}" />
diff --git a/App/WeddingBuilder/App.axaml.cs b/App/WeddingBuilder/App.axaml.cs
index 3b4e3a7..6df1daf 100644
--- a/App/WeddingBuilder/App.axaml.cs
+++ b/App/WeddingBuilder/App.axaml.cs
@@ -1,5 +1,6 @@
 using Avalonia;
 using Avalonia.Markup.Xaml;
+using FluentAvalonia.Styling;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using PropertyChanged;
diff --git a/App/WeddingBuilder/Builder.csproj b/App/WeddingBuilder/Builder.csproj
index 2b81d92..65e6b67 100644
--- a/App/WeddingBuilder/Builder.csproj
+++ b/App/WeddingBuilder/Builder.csproj
@@ -15,7 +15,6 @@
 		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-preview3" />
 		<PackageReference Include="PropertyChanged.Fody" Version="4.0.5" />
 		<PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
-		<PackageReference Include="FluentAvaloniaUI" Version="2.0.0-preview3" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\Framework\Avalonia\Avalonia.csproj" />
diff --git a/Framework/Avalonia/Avalonia.csproj b/Framework/Avalonia/Avalonia.csproj
index d011a6e..4133f32 100644
--- a/Framework/Avalonia/Avalonia.csproj
+++ b/Framework/Avalonia/Avalonia.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -10,7 +10,6 @@
 
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="11.0.0-preview3" />
-    <PackageReference Include="MicroCom.Runtime" Version="0.10.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Framework/Avalonia/Templates/TemplateSelector.cs b/Framework/Avalonia/Templates/TemplateSelector.cs
index ff57e06..fe7b7fd 100644
--- a/Framework/Avalonia/Templates/TemplateSelector.cs
+++ b/Framework/Avalonia/Templates/TemplateSelector.cs
@@ -2,8 +2,8 @@
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Markup.Xaml.Templates;
-using FluentAvalonia.UI.Controls;
 using TheXamlGuy.Framework.Core;
+using TheXamlGuy.UI.Avalonia.Controls;
 
 namespace TheXamlGuy.Framework.Avalonia;
 
diff --git a/UI/Avalonia.Controls/DataTemplateSelector/DataTemplateSelector.cs b/UI/Avalonia.Controls/DataTemplateSelector/DataTemplateSelector.cs
new file mode 100644
index 0000000..6333719
--- /dev/null
+++ b/UI/Avalonia.Controls/DataTemplateSelector/DataTemplateSelector.cs
@@ -0,0 +1,6 @@
+namespace TheXamlGuy.UI.Avalonia.Controls
+{
+    public class DataTemplateSelector : FluentAvalonia.UI.Controls.DataTemplateSelector
+    {
+    }
+}
diff --git a/UI/Avalonia/Avalonia.csproj b/UI/Avalonia/Avalonia.csproj
index 62d94d6..f5645ed 100644
--- a/UI/Avalonia/Avalonia.csproj
+++ b/UI/Avalonia/Avalonia.csproj
@@ -8,6 +8,7 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Avalonia" Version="11.0.0-preview3" />
+		<PackageReference Include="FluentAvaloniaUI" Version="2.0.0-preview3" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\UI\UI.csproj" />
diff --git a/UI/Avalonia/XamlControlsResources.cs b/UI/Avalonia/XamlControlsResources.cs
new file mode 100644
index 0000000..e2c41e3
--- /dev/null
+++ b/UI/Avalonia/XamlControlsResources.cs
@@ -0,0 +1,14 @@
+using FluentAvalonia.Styling;
+
+namespace TheXamlGuy.UI.Avalonia;
+
+public class XamlControlsResources : FluentAvaloniaTheme
+{
+    public XamlControlsResources(Uri baseUri) : base(baseUri)
+    {
+    }
+
+    public XamlControlsResources(IServiceProvider serviceProvider) : base(serviceProvider)
+    {
+    }
+}