From 1227fb6c4c12c9990fe38227cdc32c33e31e7336 Mon Sep 17 00:00:00 2001
From: PieroCastillo <39932324+PieroCastillo@users.noreply.github.com>
Date: Wed, 7 Oct 2020 00:48:12 -0500
Subject: [PATCH] Update Main Source

---
 src/Aura.UI/Assembly.cs              |  4 ++--
 src/Aura.UI/Aura.UI.csproj           | 12 ------------
 src/Aura.UI/AuraUI.xaml              |  5 ++---
 src/Aura.UI/Reveal.cs                | 15 ---------------
 src/Aura.UI/RevealStyles/Button.xaml | 15 ---------------
 5 files changed, 4 insertions(+), 47 deletions(-)
 delete mode 100644 src/Aura.UI/Reveal.cs
 delete mode 100644 src/Aura.UI/RevealStyles/Button.xaml

diff --git a/src/Aura.UI/Assembly.cs b/src/Aura.UI/Assembly.cs
index 7cc10cd..e144698 100644
--- a/src/Aura.UI/Assembly.cs
+++ b/src/Aura.UI/Assembly.cs
@@ -4,11 +4,11 @@
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Aura.UI.Windows")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Aura.UI.Controls")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Aura.UI.Controls.Primitives")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Aura.UI.Controls.Navigation")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Aura.UI.Animate")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Aura.UI.Controls.Indicators")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Aura.UI.Controls.Ribbon")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Aura.UI.Controls.Navigation")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Xaml.Interactivity")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Xaml.Interactions")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Aura.UI.Xaml")]
+//[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Aura.UI.Xaml")]
 //[assembly: XmlnsDefinition("https://github.com/PieroCastillo/Aura.UI", "Aura.UI.Xaml")]
\ No newline at end of file
diff --git a/src/Aura.UI/Aura.UI.csproj b/src/Aura.UI/Aura.UI.csproj
index 974eeb0..6669deb 100644
--- a/src/Aura.UI/Aura.UI.csproj
+++ b/src/Aura.UI/Aura.UI.csproj
@@ -64,18 +64,12 @@
      <AvaloniaResource Update="AuraDark.xaml">
        <Generator>MSBuild:Compile</Generator>
      </AvaloniaResource>
-     <AvaloniaResource Update="RevealStyles\Button.xaml">
-       <Generator>MSBuild:Compile</Generator>
-     </AvaloniaResource>
      <AvaloniaResource Update="Styles\AuraTabViewStyles.xaml">
        <Generator>MSBuild:Compile</Generator>
      </AvaloniaResource>
      <AvaloniaResource Update="Styles\FilledSliderStyles.xaml">
        <Generator>MSBuild:Compile</Generator>
      </AvaloniaResource>
-     <AvaloniaResource Update="Styles\FollowerStyles.xaml">
-       <Generator>MSBuild:Compile</Generator>
-     </AvaloniaResource>
      <AvaloniaResource Update="Styles\GroupBoxStyles.xaml">
        <Generator>MSBuild:Compile</Generator>
      </AvaloniaResource>
@@ -94,12 +88,6 @@
      <AvaloniaResource Update="Styles\ModernSliderStyles.xaml">
        <Generator>MSBuild:Compile</Generator>
      </AvaloniaResource>
-     <AvaloniaResource Update="Styles\NavigationViewItemStyles.xaml">
-       <Generator>MSBuild:Compile</Generator>
-     </AvaloniaResource>
-     <AvaloniaResource Update="Styles\NavigationViewStyles.xaml">
-       <Generator>MSBuild:Compile</Generator>
-     </AvaloniaResource>
      <AvaloniaResource Update="Styles\PageStyles.xaml">
        <Generator>MSBuild:Compile</Generator>
      </AvaloniaResource>
diff --git a/src/Aura.UI/AuraUI.xaml b/src/Aura.UI/AuraUI.xaml
index 8466f66..f9df558 100644
--- a/src/Aura.UI/AuraUI.xaml
+++ b/src/Aura.UI/AuraUI.xaml
@@ -30,10 +30,9 @@
 
 	<!--New Controls added to 0.1.3-preview4-->
 	<StyleInclude Source="/Styles/ShadowButtonStyles.xaml"/>
-	<StyleInclude Source="/Styles/FollowerStyles.xaml"/>
-	<StyleInclude Source="/Styles/NavigationViewStyles.xaml"/>
-	<StyleInclude Source="/Styles/NavigationViewItemStyles.xaml"/>
 	<StyleInclude Source="/AvaloniaStyles/AvaloniaStyles.xaml"/>
+	<StyleInclude Source="/Styles/Navigation/NavigationViewStyles.xaml"/>
+	<StyleInclude Source="/Styles/Navigation/NavigationViewItemStyles.xaml"/>
 	
 	<!--I do not the reason of why when I write the ModernSlider Styles in its xaml, that does not compile-->
 	<Style Selector="ModernSlider /template/ MaterialButton#PART_IncreaseButton">
diff --git a/src/Aura.UI/Reveal.cs b/src/Aura.UI/Reveal.cs
deleted file mode 100644
index 72ab8b0..0000000
--- a/src/Aura.UI/Reveal.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Aura.UI
-{
-    public class Reveal : TemplatedControl
-    {
-        public static readonly AttachedProperty<bool> EnabledProperty =
-            AvaloniaProperty.RegisterAttached<Reveal, Control, bool>("Enabled", false);
-    }
-}
diff --git a/src/Aura.UI/RevealStyles/Button.xaml b/src/Aura.UI/RevealStyles/Button.xaml
deleted file mode 100644
index 1b062db..0000000
--- a/src/Aura.UI/RevealStyles/Button.xaml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-	   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-	<Style Selector="Button:pressed">
-		<Setter Property="BorderThickness" Value="5"/>
-		<Setter Property="RenderTransform" Value="scale(0.95)"/>
-	</Style>
-	<Style Selector="Button:pointerover">
-		<Setter Property="BorderBrush" Value="Transparent"/>
-	</Style>
-	<Design.PreviewWith>
-		<Border Padding="10">
-			<Button>wenas</Button>
-		</Border>
-	</Design.PreviewWith>
-</Styles>
\ No newline at end of file