From 43b4664536884648a9310fd3d7371822c98508dc Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Tue, 14 Nov 2023 17:27:40 +0100
Subject: [PATCH] feat: modernize TemplateControl template

---
 .../NewTemplatedControl.axaml                 | 36 ++++++++++++++----
 .../NewTemplatedControl.axaml.cs              |  2 +
 .../NewTemplatedControl.axaml                 | 37 +++++++++++++++----
 .../NewTemplatedControl.axaml.fs              |  2 +
 4 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/templates/csharp/templatedcontrol/NewTemplatedControl.axaml b/templates/csharp/templatedcontrol/NewTemplatedControl.axaml
index 9634f151..fe6c4b69 100644
--- a/templates/csharp/templatedcontrol/NewTemplatedControl.axaml
+++ b/templates/csharp/templatedcontrol/NewTemplatedControl.axaml
@@ -1,16 +1,38 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:controls="using:AvaloniaAppTemplate.Namespace">
   <Design.PreviewWith>
-    <controls:NewTemplatedControl />
+    
+    <StackPanel Width="400" MinHeight="400">
+       <ThemeVariantScope RequestedThemeVariant="Default">
+          <controls:NewTemplatedControl />      
+       </ThemeVariantScope>
+       <ThemeVariantScope RequestedThemeVariant="Light">
+          <controls:NewTemplatedControl />      
+       </ThemeVariantScope>
+       <ThemeVariantScope RequestedThemeVariant="Dark">
+          <controls:NewTemplatedControl />      
+       </ThemeVariantScope>
+    </StackPanel>
   </Design.PreviewWith>
 
-  <Style Selector="controls|NewTemplatedControl">
-    <!-- Set Defaults -->
+  <ResourceDictionary.ThemeDictionaries>
+      <ResourceDictionary x:Key="Default">
+        <SolidColorBrush x:Key="MyForegroud" Color="Black"/>
+      </ResourceDictionary>
+      <ResourceDictionary x:Key="Light">
+        <SolidColorBrush x:Key="MyForegroud" Color="Black"/>
+      </ResourceDictionary>
+      <ResourceDictionary x:Key="Dark">
+        <SolidColorBrush x:Key="MyForegroud" Color="White"/>
+      </ResourceDictionary>
+  </ResourceDictionary.ThemeDictionaries>
+
+  <ControlTheme x:Key="{x:Type controls:NewTemplatedControl}" TargetType="controls:NewTemplatedControl">
     <Setter Property="Template">
       <ControlTemplate>
-        <TextBlock Text="Templated Control" />
+        <TextBlock Text="Templated Control" Foreground="{DynamicResourceKey MyForegroud}" />
       </ControlTemplate>
     </Setter>
-  </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/templates/csharp/templatedcontrol/NewTemplatedControl.axaml.cs b/templates/csharp/templatedcontrol/NewTemplatedControl.axaml.cs
index cba31245..bbc9fe4a 100644
--- a/templates/csharp/templatedcontrol/NewTemplatedControl.axaml.cs
+++ b/templates/csharp/templatedcontrol/NewTemplatedControl.axaml.cs
@@ -4,4 +4,6 @@ namespace AvaloniaAppTemplate.Namespace;
 
 public class NewTemplatedControl : TemplatedControl
 {
+    protected override Type StyleKeyOverride => 
+        typeof(Avalonia.Labs.Controls.ContentDialog);
 }
\ No newline at end of file
diff --git a/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml b/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml
index 9634f151..89c35615 100644
--- a/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml
+++ b/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml
@@ -1,16 +1,37 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:controls="using:AvaloniaAppTemplate.Namespace">
-  <Design.PreviewWith>
-    <controls:NewTemplatedControl />
+  <Design.PreviewWith>    
+    <StackPanel Width="400" MinHeight="400">
+       <ThemeVariantScope RequestedThemeVariant="Default">
+          <controls:NewTemplatedControl />      
+       </ThemeVariantScope>
+       <ThemeVariantScope RequestedThemeVariant="Light">
+          <controls:NewTemplatedControl />      
+       </ThemeVariantScope>
+       <ThemeVariantScope RequestedThemeVariant="Dark">
+          <controls:NewTemplatedControl />      
+       </ThemeVariantScope>
+    </StackPanel>
   </Design.PreviewWith>
 
-  <Style Selector="controls|NewTemplatedControl">
-    <!-- Set Defaults -->
+  <ResourceDictionary.ThemeDictionaries>
+      <ResourceDictionary x:Key="Default">
+        <SolidColorBrush x:Key="MyForegroud" Color="Black"/>
+      </ResourceDictionary>
+      <ResourceDictionary x:Key="Light">
+        <SolidColorBrush x:Key="MyForegroud" Color="Black"/>
+      </ResourceDictionary>
+      <ResourceDictionary x:Key="Dark">
+        <SolidColorBrush x:Key="MyForegroud" Color="White"/>
+      </ResourceDictionary>
+  </ResourceDictionary.ThemeDictionaries>
+
+  <ControlTheme x:Key="{x:Type controls:NewTemplatedControl}" TargetType="controls:NewTemplatedControl">
     <Setter Property="Template">
       <ControlTemplate>
-        <TextBlock Text="Templated Control" />
+        <TextBlock Text="Templated Control" Foreground="{DynamicResourceKey MyForegroud}" />
       </ControlTemplate>
     </Setter>
-  </Style>
-</Styles>
+  </ControlTheme>
+</ResourceDictionary>
diff --git a/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml.fs b/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml.fs
index 0fb74e09..1f67d247 100644
--- a/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml.fs
+++ b/templates/fsharp/templatedcontrol/NewTemplatedControl.axaml.fs
@@ -4,3 +4,5 @@ open Avalonia.Controls.Primitives
 
 type NewTemplatedControl () = 
     inherit TemplatedControl ()
+        override StyleKeyOverride
+            with get() = typedefof<NewTemplatedControl>