From fe0139a648450c2f9710ec00b069660b2ef493b8 Mon Sep 17 00:00:00 2001
From: Piero Castillo <pierocastillo2005@gmail.com>
Date: Tue, 6 Feb 2024 22:14:05 -0500
Subject: [PATCH] ...

---
 .../Controls/CodeExample.axaml                |  4 +--
 .../Controls/CodeExample.axaml.cs             | 36 +++++++++++++++----
 samples/Aura.UI.Gallery/Pages/BadgePage.axaml |  4 +--
 samples/Aura.UI.Gallery/ViewLocator.cs        |  2 +-
 samples/Aura.UI.Gallery/Views/MainView.axaml  |  2 +-
 .../Controls/NavigationViewItemStyles.xaml    |  4 +--
 6 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/samples/Aura.UI.Gallery/Controls/CodeExample.axaml b/samples/Aura.UI.Gallery/Controls/CodeExample.axaml
index a264f23..bedc362 100644
--- a/samples/Aura.UI.Gallery/Controls/CodeExample.axaml
+++ b/samples/Aura.UI.Gallery/Controls/CodeExample.axaml
@@ -42,13 +42,13 @@ using System;
 						                  BorderThickness="1" Padding="15"
 						                  Content="{TemplateBinding Control}"/>
 						<StackPanel Background="{DynamicResource SystemControlBackgroundBaseLowBrush}">
-							<ae:TextEditor Name="editor_xaml" SyntaxHighlighting="XML"
+							<ae:TextEditor Name="PART_editor_xaml" SyntaxHighlighting="XML"
 							               HorizontalScrollBarVisibility="Auto"
 							               Background="Transparent"
 							               IsVisible="{TemplateBinding XAMLVisible}"
 							               IsReadOnly="True"
 							               Padding="15"/>
-							<ae:TextEditor Name="editor_csharp" SyntaxHighlighting="C#"
+							<ae:TextEditor Name="PART_editor_csharp" SyntaxHighlighting="C#"
 							               HorizontalScrollBarVisibility="Auto"
 							               Background="Transparent"
 							               IsVisible="{TemplateBinding CSharpVisible}"
diff --git a/samples/Aura.UI.Gallery/Controls/CodeExample.axaml.cs b/samples/Aura.UI.Gallery/Controls/CodeExample.axaml.cs
index 4b57ac0..ffe68b0 100644
--- a/samples/Aura.UI.Gallery/Controls/CodeExample.axaml.cs
+++ b/samples/Aura.UI.Gallery/Controls/CodeExample.axaml.cs
@@ -8,17 +8,21 @@
 using System;
 using Avalonia.Collections;
 using Avalonia.LogicalTree;
+using Avalonia.Controls.Metadata;
+using TextMateSharp.Grammars;
+using AvaloniaEdit.TextMate;
+using Avalonia.Styling;
 
 namespace Aura.UI.Gallery.Controls
 {
+    [TemplatePart(Name = "PART_editor_xaml", Type = typeof(TextEditor))]
+    [TemplatePart(Name = "PART_editor_csharp", Type = typeof(TextEditor))]
     public class CodeExample : TemplatedControl
     {
         static CodeExample()
         {
             ControlProperty.Changed.Subscribe(ControlChildChanged);
         }
-        private TextEditor xaml_edit;
-        private TextEditor c_edit;
 
         private static void ControlChildChanged(AvaloniaPropertyChangedEventArgs e)
         {
@@ -39,14 +43,32 @@ private static void ControlChildChanged(AvaloniaPropertyChangedEventArgs e)
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             base.OnApplyTemplate(e);
+            this.GetControl(e, "PART_editor_csharp", out TextEditor editor_csharp);
+            this.GetControl(e, "PART_editor_xaml", out TextEditor editor_xaml);
 
-            xaml_edit = this.GetControl<TextEditor>(e, "editor_xaml");
-            c_edit = this.GetControl<TextEditor>(e, "editor_csharp");
+            editor_xaml.Text = XAMLText;
+            editor_csharp.Text = CSharpText;
 
-            c_edit.TextArea.IndentationStrategy = new CSharpIndentationStrategy();
+            editor_xaml.ShowLineNumbers = true;
+            editor_csharp.ShowLineNumbers = true;
 
-            xaml_edit.Text = XAMLText;
-            c_edit.Text = CSharpText;
+            RegistryOptions _registryOptions;
+            if (App.Current.RequestedThemeVariant == ThemeVariant.Light)
+            {
+                _registryOptions = new RegistryOptions(ThemeName.Light);
+            }
+            else
+            {
+               _registryOptions = new RegistryOptions(ThemeName.Dark);
+            }
+            
+
+            //Initial setup of TextMate.
+            var _textMateCSharp = editor_csharp.InstallTextMate(_registryOptions);
+            _textMateCSharp.SetGrammar(_registryOptions.GetScopeByLanguageId(_registryOptions.GetLanguageByExtension(".cs").Id));
+
+            var _textMateXaml = editor_xaml.InstallTextMate(_registryOptions);
+            _textMateXaml.SetGrammar(_registryOptions.GetScopeByLanguageId(_registryOptions.GetLanguageByExtension(".axaml").Id));
         }
 
         [Content]
diff --git a/samples/Aura.UI.Gallery/Pages/BadgePage.axaml b/samples/Aura.UI.Gallery/Pages/BadgePage.axaml
index 2179d5e..4eaaf32 100644
--- a/samples/Aura.UI.Gallery/Pages/BadgePage.axaml
+++ b/samples/Aura.UI.Gallery/Pages/BadgePage.axaml
@@ -50,8 +50,8 @@
     <CodeExample Title="Badge" TitleTwo="RightTop" CSharpVisible="False">
       <Badge BadgePosition="RightTop" BadgeContent="9+">
         <Button Content="Messages"/>
-      </Badge>
-      <CodeExample.XAMLText>
+      </Badge> 
+      <CodeExample.XAMLText> 
 &lt;Badge BadgePosition="RightTop" BadgeContent="9+">
   &lt;Button Content="Messages"/>
 &lt;/Badge>
diff --git a/samples/Aura.UI.Gallery/ViewLocator.cs b/samples/Aura.UI.Gallery/ViewLocator.cs
index 1ea0229..ccadc03 100644
--- a/samples/Aura.UI.Gallery/ViewLocator.cs
+++ b/samples/Aura.UI.Gallery/ViewLocator.cs
@@ -14,7 +14,7 @@ public Control Build(object data)
             var name = data.GetType().FullName!.Replace("ViewModel", "View");
             var type = Type.GetType(name);
 
-            if (type != null)
+            if (type != null) 
             {
                 return (Control)Activator.CreateInstance(type)!;
             }
diff --git a/samples/Aura.UI.Gallery/Views/MainView.axaml b/samples/Aura.UI.Gallery/Views/MainView.axaml
index 739e03b..f7acccb 100644
--- a/samples/Aura.UI.Gallery/Views/MainView.axaml
+++ b/samples/Aura.UI.Gallery/Views/MainView.axaml
@@ -78,7 +78,7 @@
         </GroupBox>
       </NavigationViewItem.Content>
     </NavigationViewItem>
-    <Separator/>
+    <!--<Separator/>-->
     <NavigationViewItem Header="Basic Input" Title="Basic Input"
               Icon="{DynamicResource FontAwesome.CheckSquareRegular}">
       <NavigationViewItem.Content>
diff --git a/src/Aura.UI.FluentTheme/Controls/NavigationViewItemStyles.xaml b/src/Aura.UI.FluentTheme/Controls/NavigationViewItemStyles.xaml
index 52331d9..17f6406 100644
--- a/src/Aura.UI.FluentTheme/Controls/NavigationViewItemStyles.xaml
+++ b/src/Aura.UI.FluentTheme/Controls/NavigationViewItemStyles.xaml
@@ -37,7 +37,7 @@
 											  x:Key="LevelConv" />
 		
 	</Styles.Resources>
-	<Style Selector="NavigationViewItemBase">
+	<Style Selector=":is(NavigationViewItemBase)">
 		<Setter Property="Padding" Value="0 5" />
 		<Setter Property="MinWidth" Value="0" />
 		<Setter Property="DockPanel.Dock" Value="Top" />
@@ -129,7 +129,7 @@
 	</Style>
   
   
-  <Style Selector="NavigationViewItemBase /template/ ContentPresenter#PART_ContentPresenter">
+  <Style Selector=":is(NavigationViewItemBase) /template/ ContentPresenter#PART_ContentPresenter">
     <Setter Property="FontSize" Value="14"/>
     <Setter Property="FontFamily" Value="Segoe UI"/>
     <Setter Property="HorizontalAlignment" Value="Left"/>