working in lightsytem

PieroCastillo · Dec 5, 2020 · 7de2e46 · 7de2e46
1 parent 602e890
commit 7de2e46
Show file tree

Hide file tree

Showing 21 changed files with 482 additions and 114 deletions.
diff --git a/.idea/.idea.Aura.UI/.idea/contentModel.xml b/.idea/.idea.Aura.UI/.idea/contentModel.xml
diff --git a/.idea/.idea.Aura.UI/.idea/workspace.xml b/.idea/.idea.Aura.UI/.idea/workspace.xml
diff --git a/Aura.UI.sln b/Aura.UI.sln
@@ -26,6 +26,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UI.Tests.Mobile.NetCore", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aura.UI.Dragging", "src\Aura.UI.Dragging\Aura.UI.Dragging.csproj", "{7AC54D85-99E6-4A9B-A5B3-14D0A812805F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aura.UI.Lighting", "src\Aura.UI.Lighting\Aura.UI.Lighting.csproj", "{D9A38989-6708-49BB-8E78-16A14199EC59}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -186,6 +188,30 @@ Global
 		{7AC54D85-99E6-4A9B-A5B3-14D0A812805F}.Release|x64.Build.0 = Release|Any CPU
 		{7AC54D85-99E6-4A9B-A5B3-14D0A812805F}.Release|x86.ActiveCfg = Release|Any CPU
 		{7AC54D85-99E6-4A9B-A5B3-14D0A812805F}.Release|x86.Build.0 = Release|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Debug|ARM.Build.0 = Debug|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Debug|x64.Build.0 = Debug|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Debug|x86.Build.0 = Debug|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Release|ARM.ActiveCfg = Release|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Release|ARM.Build.0 = Release|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Release|iPhone.Build.0 = Release|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Release|x64.ActiveCfg = Release|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Release|x64.Build.0 = Release|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Release|x86.ActiveCfg = Release|Any CPU
+		{D9A38989-6708-49BB-8E78-16A14199EC59}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -197,6 +223,7 @@ Global
 		{1748D8FA-FB7F-4B4F-B1BA-049364CCEB33} = {42648CDA-16AC-4D09-8480-CA6600A1CF6D}
 		{FDDAC139-62DD-49B4-88BC-4B714B10926E} = {42648CDA-16AC-4D09-8480-CA6600A1CF6D}
 		{7AC54D85-99E6-4A9B-A5B3-14D0A812805F} = {E0772EFF-1A2A-466C-83C7-A81D93213336}
+		{D9A38989-6708-49BB-8E78-16A14199EC59} = {E0772EFF-1A2A-466C-83C7-A81D93213336}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B04BDC4F-181C-461F-BB14-4E7516DB6B4A}

diff --git a/Tests/UI.Tests/App.xaml.cs b/Tests/UI.Tests/App.xaml.cs
@@ -1,5 +1,4 @@
-using Aura.UI.Managers;
-using Aura.UI.UIExtensions;
+using Aura.UI.UIExtensions;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;

diff --git a/Tests/UI.Tests/MainWindow.xaml b/Tests/UI.Tests/MainWindow.xaml
@@ -61,7 +61,7 @@
 						<Button VerticalAlignment="Center"
 							HorizontalAlignment="Right" Name="cbtn">DeleteTab</Button>
 					</Grid>
-		</NavigationViewItem>
+				</NavigationViewItem>
 				<NavigationViewItem Header="TitleBox" Title="TitleBox">
 					<Border Padding="10">
 						<Border.Resources>
@@ -286,6 +286,9 @@
 						</TextBlock>
 					</Grid>
 				</NavigationViewItem>
+				<NavigationViewItem Header="LightBox" Title="2D Lighting System">
+					<l:LightSystemView></l:LightSystemView>
+				</NavigationViewItem>
 			</NavigationView>	
 			<Follower LayerControl="{Binding #nav}">
 				<Follower.CanvasLayer>

diff --git a/Tests/UI.Tests/MainWindow.xaml.cs b/Tests/UI.Tests/MainWindow.xaml.cs
@@ -40,7 +40,10 @@ public MainWindow()
             tabc = this.Find<TabControl>("tabview");
 
             tabvw = this.Find<AuraTabView>("tabvw_");
-            tabvw.AddActionToAdderButton(AddTab);
+            tabvw.ClickOnAddingButton += delegate(object? sender, RoutedEventArgs args)
+            {
+                AddTab();
+            };
 
             addbtn = this.Find<Button>("btn");
             cbtn = this.Find<Button>("cbtn");

diff --git a/Tests/UI.Tests/UI.Tests.csproj b/Tests/UI.Tests/UI.Tests.csproj
@@ -87,6 +87,7 @@
     <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview6" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\src\Aura.UI.Lighting\Aura.UI.Lighting.csproj" />
     <ProjectReference Include="..\..\src\Aura.UI\Aura.UI.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Tests/UI.Tests/Views/LightSystemView.axaml b/Tests/UI.Tests/Views/LightSystemView.axaml
@@ -0,0 +1,12 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignHeight="50" d:DesignWidth="100"
+             x:Class="UI.Tests.Views.LightSystemView">
+    <LightBox LightHeight="5" LightPoint="Center">
+        <Grid>
+            <Button LightBox.LightCornerRadius="10" Margin="50,50"/>
+        </Grid>
+    </LightBox>
+</UserControl>
diff --git a/Tests/UI.Tests/Views/LightSystemView.axaml.cs b/Tests/UI.Tests/Views/LightSystemView.axaml.cs
@@ -0,0 +1,18 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace UI.Tests.Views
+{
+    public class LightSystemView : UserControl
+    {
+        public LightSystemView()
+        {
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}
diff --git a/src/Aura.UI.Lighting/Aura.UI.Lighting.csproj b/src/Aura.UI.Lighting/Aura.UI.Lighting.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.1</TargetFramework>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Avalonia" Version="0.10.0-preview6" />
+    </ItemGroup>
+
+</Project>