Add auto-including Material.DataGrid styles if present

AvaloniaCommunity · Aug 9, 2023 · 2b2ef38 · 2b2ef38
1 parent 0b4c1dd
commit 2b2ef38
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 6 deletions.
diff --git a/Material.DataGrid/Material.DataGrid.csproj b/Material.DataGrid/Material.DataGrid.csproj
@@ -12,4 +12,10 @@
     <ProjectReference Include="..\Material.Styles\Material.Styles.csproj"/>
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Include="*.props">
+      <Pack>true</Pack>
+      <PackagePath>build\;buildTransitive\</PackagePath>
+    </Content>
+  </ItemGroup>
 </Project>
diff --git a/Material.DataGrid/Material.DataGrid.props b/Material.DataGrid/Material.DataGrid.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <RuntimeHostConfigurationOption Include="MaterialThemeIncludeDataGrid" Value="true" />
+  </PropertyGroup>
+</Project>
diff --git a/Material.Demo/App.axaml b/Material.Demo/App.axaml
@@ -12,7 +12,6 @@
     <themes:MaterialTheme PrimaryColor="Purple" SecondaryColor="Indigo" />
 
     <avalonia:MaterialIconStyles />
-    <StyleInclude Source="avares://Material.DataGrid/DataGrid.xaml" />
     <dialogHostAvalonia:DialogHostStyles />
 
     <!-- AvaloniaEdit styles -->

diff --git a/Material.Demo/Material.Demo.csproj b/Material.Demo/Material.Demo.csproj
@@ -23,6 +23,10 @@
     <ProjectReference Include="..\Material.DataGrid\Material.DataGrid.csproj"/>
     <ProjectReference Include="..\Material.Dialog\Material.Dialog.csproj"/>
   </ItemGroup>
+
+  <ItemGroup>
+    <RuntimeHostConfigurationOption Include="MaterialThemeIncludeDataGrid" Value="true" />
+  </ItemGroup>
 
   <ItemGroup>
     <AvaloniaResource Include="Assets\**"/>

diff --git a/Material.Styles/MaterialToolKit.xaml.cs b/Material.Styles/MaterialToolKit.xaml.cs
@@ -1,16 +1,26 @@
+using System;
 using Avalonia;
 using Avalonia.Animation;
 using Avalonia.Markup.Xaml;
+using Avalonia.Markup.Xaml.Styling;
 using Material.Styles.Additional;
 
-namespace Material.Styles {
-    public class MaterialToolKit : Avalonia.Styling.Styles {
-        static MaterialToolKit() {
+namespace Material.Styles
+{
+    public class MaterialToolKit : Avalonia.Styling.Styles
+    {
+        static MaterialToolKit()
+        {
             Animation.RegisterCustomAnimator<RelativePoint, RelativePointAnimator>();
         }
 
-        public MaterialToolKit() {
+        public MaterialToolKit()
+        {
             AvaloniaXamlLoader.Load(this);
+            if (AppContext.TryGetSwitch("MaterialThemeIncludeDataGrid", out var includeDataGrid) && includeDataGrid)
+            {
+                Add(new StyleInclude((Uri?)null) { Source = new Uri("avares://Material.DataGrid/DataGrid.xaml") });
+            }
         }
     }
-}
+}