Update Main Source

PieroCastillo · Oct 7, 2020 · 1227fb6 · 1227fb6
1 parent d4949b6
commit 1227fb6
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 47 deletions.
diff --git 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")]
diff --git 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
@@ -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
diff --git a/src/Aura.UI/RevealStyles/Button.xaml b/src/Aura.UI/RevealStyles/Button.xaml