dan/TheXamlGuy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Map FluentStyles to XamlControlsResources

Browse Source
This commit is contained in:
Daniel Clark
2022-11-01 22:55:17 +00:00
parent eb44c983d7
commit 854d393b43
8 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/WeddingBuilder/App.axaml
+2 -3
View File
@@ -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}" />
App/WeddingBuilder/App.axaml.cs
+1
View File
@@ -1,5 +1,6 @@
using Avalonia;
using Avalonia.Markup.Xaml;
using FluentAvalonia.Styling;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using PropertyChanged;
App/WeddingBuilder/Builder.csproj
-1
View File
@@ -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" />
Framework/Avalonia/Avalonia.csproj
+1 -2
View File
@@ -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>
Framework/Avalonia/Templates/TemplateSelector.cs
+1 -1
View File
@@ -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;
UI/Avalonia.Controls/DataTemplateSelector/DataTemplateSelector.cs
+6
View File
@@ -0,0 +1,6 @@
namespace TheXamlGuy.UI.Avalonia.Controls
{
public class DataTemplateSelector : FluentAvalonia.UI.Controls.DataTemplateSelector
{
}
}
UI/Avalonia/Avalonia.csproj
+1
View File
@@ -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" />
UI/Avalonia/XamlControlsResources.cs
+14
View File
@@ -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)
{
}
}