Main source Updated

PieroCastillo · Oct 15, 2020 · 7ab1e53 · 7ab1e53
1 parent ab480d0
commit 7ab1e53
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/src/Aura.UI/75000.jpg b/src/Aura.UI/75000.jpg
diff --git a/src/Aura.UI/Assembly.cs b/src/Aura.UI/Assembly.cs
@@ -10,5 +10,6 @@
 [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.Controls.Status")]
 //[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
@@ -31,6 +31,15 @@
       <SubType>Designer</SubType>
     </AvaloniaResource>
   </ItemGroup>
+   <ItemGroup>
+     <None Remove="75000.jpg" />
+     <None Remove="Styles\CircularProgressBarStyles.xaml" />
+     <None Remove="Styles\TileCollectionStyles.xaml" />
+     <None Remove="Styles\TileControlStyles.xaml" />
+   </ItemGroup>
+   <ItemGroup>
+     <AvaloniaResource Include="75000.jpg" />
+   </ItemGroup>
    <ItemGroup>
      <None Include="..\..\.editorconfig" Link=".editorconfig" />
      <EmbeddedResource Include="..\..\DesignSources\auraui-logov2.png">
@@ -62,6 +71,9 @@
      <AvaloniaResource Update="Styles\AuraTabViewStyles.xaml">
        <Generator>MSBuild:Compile</Generator>
      </AvaloniaResource>
+     <AvaloniaResource Update="Styles\CircularProgressBarStyles.xaml">
+       <Generator>MSBuild:Compile</Generator>
+     </AvaloniaResource>
      <AvaloniaResource Update="Styles\FilledSliderStyles.xaml">
        <Generator>MSBuild:Compile</Generator>
      </AvaloniaResource>
@@ -113,12 +125,15 @@
      <AvaloniaResource Update="Styles\SuperListBoxItemStyles.xaml">
        <Generator>MSBuild:Compile</Generator>
      </AvaloniaResource>
-	   <AvaloniaResource Update="AvaloniaStyles\AvaloniaStyles.xaml">
-		   <Generator>MSBuild:Compile</Generator>
-	   </AvaloniaResource>
 	   <AvaloniaResource Update="AvaloniaStyles\ContentPresenterStyles.xaml">
 		   <Generator>MSBuild:Compile</Generator>
 	   </AvaloniaResource>
+	   <AvaloniaResource Update="Styles\TileCollectionStyles.xaml">
+	     <Generator>MSBuild:Compile</Generator>
+	   </AvaloniaResource>
+	   <AvaloniaResource Update="Styles\TileControlStyles.xaml">
+	     <Generator>MSBuild:Compile</Generator>
+	   </AvaloniaResource>
    </ItemGroup>
    <ItemGroup>
      <Compile Update="Controls\ColorWheel.axaml.cs">

diff --git a/src/Aura.UI/AuraUI.xaml b/src/Aura.UI/AuraUI.xaml
@@ -33,6 +33,10 @@
 	<StyleInclude Source="/AvaloniaStyles/AvaloniaStyles.xaml"/>
 	<StyleInclude Source="/Styles/Navigation/NavigationViewStyles.xaml"/>
 	<StyleInclude Source="/Styles/Navigation/NavigationViewItemStyles.xaml"/>
+
+	<!--New Controls added to 0.1.3-preview7-->
+	<StyleInclude Source="/Styles/TileControlStyles.xaml"/>
+	<StyleInclude Source="/Styles/TileCollectionStyles.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">
@@ -55,8 +59,10 @@
 	</Style>
 	<Design.PreviewWith>
 		<Border Padding="20">
-			<ModernSlider Orientation="Horizontal" Height="50"
-						  Width="150"></ModernSlider>
+			<!--<ModernSlider Orientation="Horizontal" Height="50"
+						  Width="150"></ModernSlider>-->
+
+			<Image Source="avares://Aura.UI/75000.jpg" Height="60"/>
 		</Border>
 	</Design.PreviewWith>  
 </Styles>