From 3d5bd492ff05c22e77fa1f338bee6f4a25a4d348 Mon Sep 17 00:00:00 2001
From: Aleksandar Toplek <aleksandar.toplek@gmail.com>
Date: Mon, 22 Dec 2014 03:12:51 +0100
Subject: [PATCH 01/11] Added sidebar left/right styles

---
 .../Controls/SideBar/SideBarControl.xaml      | 51 ++++++++++++++-----
 .../Controls/SideBar/SideBarControl.xaml.cs   | 28 ++++++++--
 .../SparkiyClient.Windows/Views/EditPage.xaml |  2 +-
 3 files changed, 65 insertions(+), 16 deletions(-)

diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/SideBar/SideBarControl.xaml b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/SideBar/SideBarControl.xaml
index bccff57..08becb2 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/SideBar/SideBarControl.xaml
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/SideBar/SideBarControl.xaml
@@ -54,6 +54,43 @@
 			<Setter Property="BorderThickness" Value="0 1 1 1" />
 			<Setter Property="HorizontalAlignment" Value="Right" />
 		</Style>
+		<Style x:Key="SideBarToggleTabRightStyle" BasedOn="{StaticResource SideBarToggleTabStyle}" TargetType="Button">
+			<Setter Property="BorderThickness" Value="1 1 0 1" />
+			<Setter Property="HorizontalAlignment" Value="Left" />
+		</Style>
+		
+		<!-- Shadow style -->
+		<Style x:Key="SideBarShadowStyle" TargetType="Rectangle">
+			<Setter Property="Width" Value="32" />
+			<Setter Property="VerticalAlignment" Value="Stretch" />
+		</Style>
+		
+		<Style x:Key="SideBarShadowLeftStyle" BasedOn="{StaticResource SideBarShadowStyle}" TargetType="Rectangle">
+			<Setter Property="Margin" Value="0 0 -32 0" />
+			<Setter Property="HorizontalAlignment" Value="Right" />
+			<Setter Property="Fill">
+				<Setter.Value>
+					<LinearGradientBrush StartPoint="0,1" EndPoint="1,0.9998" MappingMode="RelativeToBoundingBox">
+						<GradientStop Offset="0" Color="#22000000" />
+						<GradientStop Offset="0.2" Color="#08000000" />
+						<GradientStop Offset="1" Color="#00FFFFFF" />
+					</LinearGradientBrush>
+				</Setter.Value>
+			</Setter>
+		</Style>
+		<Style x:Key="SideBarShadowRightStyle" BasedOn="{StaticResource SideBarShadowStyle}" TargetType="Rectangle">
+			<Setter Property="Margin" Value="-32 0 0 0" />
+			<Setter Property="HorizontalAlignment" Value="Left" />
+			<Setter Property="Fill">
+				<Setter.Value>
+					<LinearGradientBrush StartPoint="1,1" EndPoint="0,0.9998"  MappingMode="RelativeToBoundingBox">
+						<GradientStop Offset="0" Color="#22000000" />
+						<GradientStop Offset="0.2" Color="#08000000" />
+						<GradientStop Offset="1" Color="#00FFFFFF" />
+					</LinearGradientBrush>
+				</Setter.Value>
+			</Setter>
+		</Style>
 		
 		<!-- Scripts sidebar animations -->
 		<Storyboard x:Name="SideBarLeftHideStoryboard">
@@ -80,23 +117,13 @@
 		</Storyboard>
 	</UserControl.Resources>
 
+	<!-- Content -->
 	<Grid x:Name="SideBarGrid"
 		  Style="{StaticResource SideBarStyle}">
 		
 		<!-- Shadow -->
 		<Rectangle x:Name="SideBarShadow" 
-				   Width="32" 
-				   Margin="0 0 -32 0"
-				   HorizontalAlignment="Right" 
-				   VerticalAlignment="Stretch">
-			<Rectangle.Fill>
-				<LinearGradientBrush StartPoint="0,1" EndPoint="1,0.9998" MappingMode="RelativeToBoundingBox">
-					<GradientStop Offset="0" Color="#22000000" />
-					<GradientStop Offset="0.2" Color="#08000000" />
-					<GradientStop Offset="1" Color="#00FFFFFF" />
-				</LinearGradientBrush>
-			</Rectangle.Fill>
-		</Rectangle>
+				   Style="{StaticResource SideBarShadowLeftStyle}" />
 
 		<!-- Toggle Tab -->
 		<Button x:Name="SideBarToggleButton" 
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/SideBar/SideBarControl.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/SideBar/SideBarControl.xaml.cs
index 5915dbe..96c75b4 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/SideBar/SideBarControl.xaml.cs
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/SideBar/SideBarControl.xaml.cs
@@ -22,10 +22,20 @@ public sealed partial class SideBarControl : UserControl
     {
 		private double toggleButtonOpacity;
 
+	    private readonly Style SideBarLeftToggleButtonStyle;
+		private readonly Style SideBarRightToggleButtonStyle;
+		private readonly Style SideBarLeftShadowStyle;
+		private readonly Style SideBarRightShadowStyle;
+
 		public SideBarControl()
         {
             this.InitializeComponent();
 
+			// Retrive styles
+			this.SideBarLeftToggleButtonStyle = (Style)this.Resources["SideBarToggleTabLeftStyle"];
+			this.SideBarRightToggleButtonStyle = (Style)this.Resources["SideBarToggleTabRightStyle"];
+			this.SideBarLeftShadowStyle = (Style)this.Resources["SideBarShadowLeftStyle"];
+			this.SideBarRightShadowStyle = (Style)this.Resources["SideBarShadowRightStyle"];
 
 			// Opacity to 1 on pointer hover
 			this.SideBarToggleButton.PointerEntered += (s, e) =>
@@ -83,10 +93,22 @@ public bool IsLeft
 			set { SetValue(IsLeftProperty, value); }
 		}
 		public static readonly DependencyProperty IsLeftProperty =
-			DependencyProperty.Register("IsLeft", typeof(bool), typeof(SideBarControl), new PropertyMetadata(true));
-		
+			DependencyProperty.Register("IsLeft", typeof(bool), typeof(SideBarControl), new PropertyMetadata(true, IsLeftPropertyChangedCallback));
+
+	    private static void IsLeftPropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
+	    {
+			var sender = dependencyObject as SideBarControl;
+			if (sender == null)
+				throw new NullReferenceException("Couldn't retrieve SideBar from dependency object");
+
+		    bool isLeft = (bool) dependencyPropertyChangedEventArgs.NewValue;
+
+		    sender.SideBarShadow.Style = isLeft ? sender.SideBarLeftShadowStyle : sender.SideBarRightShadowStyle;
+			sender.SideBarToggleButton.Style = isLeft ? sender.SideBarLeftToggleButtonStyle : sender.SideBarRightToggleButtonStyle;
+		}
+
 
-		public bool IsOpen
+	    public bool IsOpen
 		{
 			get { return (bool)GetValue(IsOpenProperty); }
 			set { SetValue(IsOpenProperty, value); }
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml
index f04eb44..c1a662d 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml
@@ -269,7 +269,7 @@
 			</sideBar:SideBarControl.Content>
 		</sideBar:SideBarControl>
 		
-		<sideBar:SideBarControl x:Name="SideBarAssets" IsLeft="false" Grid.Column="2">
+		<sideBar:SideBarControl x:Name="SideBarAssets" IsLeft="False" Grid.Column="2">
 			<sideBar:SideBarControl.Content>
 				<Grid>
 					<Grid.RowDefinitions>

From 64a43348b5848559ba3bae5375212ec09982210c Mon Sep 17 00:00:00 2001
From: Aleksandar Toplek <aleksandar.toplek@gmail.com>
Date: Mon, 22 Dec 2014 23:42:30 +0100
Subject: [PATCH 02/11] Added EngineProviderService

---
 .../SparkiyClient.Shared/App.xaml.cs          |   3 +-
 .../Controls/PlayView/PlayViewControl.xaml    |  15 ++
 .../Controls/PlayView/PlayViewControl.xaml.cs | 146 ++++++++++++++++++
 .../Services/EngineProviderService.cs         |  22 +++
 .../SparkiyClient.Shared.projitems            |  14 +-
 .../SparkiyClient.Shared/Views/DebugPage.xaml |  13 --
 .../SparkiyClient.Windows.csproj              |  11 +-
 .../Views/DebugPage.xaml                      |  27 ++++
 .../Views/DebugPage.xaml.cs                   |   0
 9 files changed, 227 insertions(+), 24 deletions(-)
 create mode 100644 SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml
 create mode 100644 SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml.cs
 create mode 100644 SparkiyClient/SparkiyClient/SparkiyClient.Shared/Services/EngineProviderService.cs
 delete mode 100644 SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/DebugPage.xaml
 create mode 100644 SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml
 rename SparkiyClient/SparkiyClient/{SparkiyClient.Shared => SparkiyClient.Windows}/Views/DebugPage.xaml.cs (100%)

diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/App.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/App.xaml.cs
index 84e3b97..4a6f707 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/App.xaml.cs
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/App.xaml.cs
@@ -195,10 +195,11 @@ private void OnContainerRegistration(IUnityContainer container)
 
 			// Register instances
 			this.container.RegisterInstance<IUnityContainer>(this.container);
-
+			
 			// Register services
 			this.container.RegisterType<IAlertMessageService, AlertMessageService>(new ContainerControlledLifetimeManager());
 			this.container.RegisterType<INavigationService, NavigationService>(new ContainerControlledLifetimeManager());
+			this.container.RegisterType<EngineProviderService, EngineProviderService>(new ContainerControlledLifetimeManager());
 			this.container.RegisterType<IStorageService, StorageService>(new ContainerControlledLifetimeManager());
 			this.container.RegisterType<IProjectService, ProjectService>(new ContainerControlledLifetimeManager());
 
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml
new file mode 100644
index 0000000..7165aef
--- /dev/null
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml
@@ -0,0 +1,15 @@
+<UserControl
+    x:Class="SparkiyClient.Controls.PlayView.PlayViewControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:SparkiyClient.Controls.PlayView"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    d:DesignHeight="300"
+    d:DesignWidth="400">
+    
+    <Grid>
+	    <SwapChainPanel x:Name="SwapChainPanel" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" />
+    </Grid>
+</UserControl>
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml.cs
new file mode 100644
index 0000000..5debc27
--- /dev/null
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml.cs
@@ -0,0 +1,146 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using System.Threading.Tasks;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Notifications;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+using MetroLog;
+using Microsoft.Practices.ServiceLocation;
+using SparkiyClient.Services;
+using SparkiyClient.UILogic.Models;
+using SparkiyEngine.Bindings.Component.Engine;
+
+// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236
+
+namespace SparkiyClient.Controls.PlayView
+{
+	public interface IProjectPlayStateManagment
+	{
+		Task AssignProjectAsync(Project project);
+
+		void PlayProject();
+
+		void PauseProject();
+
+		void RestartProject();
+
+		void TakeScreenshot();
+
+
+		bool IsInitialized { get; }
+
+		bool IsPlaying { get; }
+
+		bool IsPause { get; }
+	}
+
+	public interface IProjectPlayEngineManagement
+	{
+		IEngineBindings Engine { get; }
+	}
+
+    public sealed partial class PlayViewControl : UserControl, IProjectPlayStateManagment, IProjectPlayEngineManagement
+    {
+	    private static ILogger Log = LogManagerFactory.DefaultLogManager.GetLogger<PlayViewControl>();
+
+	    private Project project;
+	    private IEngineBindings engine;
+
+		// State tracking
+	    private bool isPaused;
+	    private bool isInitialized;
+
+
+	    public PlayViewControl()
+        {
+            this.InitializeComponent();
+        }
+
+
+	    public async Task AssignProjectAsync(Project project)
+	    {
+			// Stop currently running project
+		    if (this.IsInitialized)
+			    this.StopProject();
+
+			// Assign new project
+		    this.project = project;
+
+			// TODO Load Scripts and Classes from project
+			// TODO Load assets from project
+
+			// TODO Combine Classes with scripts
+
+		    this.engine = ServiceLocator.Current.GetInstance<EngineProviderService>().GetLuaDxEngine(this.SwapChainPanel);
+			// TODO Add scripts to the engine
+			
+			throw new NotImplementedException();
+
+			this.isInitialized = true;
+		}
+
+	    private void StopProject()
+	    {
+			this.isInitialized = false;
+
+			this.Engine.Pause();
+			this.Engine.Reset();
+		    throw new NotImplementedException();
+	    }
+
+	    public void PlayProject()
+	    {
+			if (this.IsPlaying)
+				return;
+
+			this.Engine.Play();
+
+		    throw new NotImplementedException();
+
+		    this.isPaused = false;
+	    }
+
+	    public void PauseProject()
+	    {
+		    if (this.IsPause)
+			    return;
+
+			this.Engine.Pause();
+
+			throw new NotImplementedException();
+
+			this.isPaused = true;
+		}
+
+	    public void RestartProject()
+	    {
+			this.StopProject();
+			// TODO Restart project (Re-add scripts)
+			this.Engine.Play();
+		    throw new NotImplementedException();
+	    }
+
+	    public void TakeScreenshot()
+	    {
+			throw new NotImplementedException();
+	    }
+
+	    public bool IsInitialized => this.isInitialized;
+
+	    public bool IsPlaying => !this.isPaused;
+
+	    public bool IsPause => this.isPaused;
+
+	    public IEngineBindings Engine => this.engine;
+    }
+}
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Services/EngineProviderService.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Services/EngineProviderService.cs
new file mode 100644
index 0000000..34d79f3
--- /dev/null
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Services/EngineProviderService.cs
@@ -0,0 +1,22 @@
+using SparkiyEngine.Bindings.Component.Engine;
+using SparkiyEngine.Engine;
+using SparkiyEngine.Graphics.DirectX;
+using SparkiyEngine_Language_LuaImplementation;
+
+namespace SparkiyClient.Services
+{
+	public class EngineProviderService
+	{
+		public IEngineBindings GetLuaDxEngine(object panel)
+		{
+			var engine = new Sparkiy();
+			var language = LuaImplementation.Instantiate(engine);
+			var graphics = new Renderer(engine);
+
+			engine.AssignBindings(language.GetLanguageBindings(), graphics);
+			engine.AssignPanel(panel);
+
+			return engine;
+		}
+	}
+}
\ No newline at end of file
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/SparkiyClient.Shared.projitems b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/SparkiyClient.Shared.projitems
index 3b97e53..655a2bb 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/SparkiyClient.Shared.projitems
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/SparkiyClient.Shared.projitems
@@ -47,15 +47,15 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\MessagesPopupControl.xaml.cs">
       <DependentUpon>MessagesPopupControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\PlayView\PlayViewControl.xaml.cs">
+      <DependentUpon>PlayViewControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Controls\SideBar\SideBarControl.xaml.cs">
       <DependentUpon>SideBarControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Converters\BooleanToVisibilityConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Services\AlertMessageService.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Services\ViewModelProviderService.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Views\DebugPage.xaml.cs">
-      <DependentUpon>DebugPage.xaml</DependentUpon>
-    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Views\MainPage.xaml.cs">
       <DependentUpon>MainPage.xaml</DependentUpon>
     </Compile>
@@ -78,6 +78,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\PlayView\PlayViewControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Controls\SideBar\SideBarControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -89,10 +93,6 @@
     <Page Include="$(MSBuildThisFileDirectory)Themes\Generic.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Views\DebugPage.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Views\MainPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/DebugPage.xaml b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/DebugPage.xaml
deleted file mode 100644
index 2135fdd..0000000
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/DebugPage.xaml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Page
-    x:Class="SparkiyClient.Views.DebugPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:SparkiyClient.Views"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
-    </Grid>
-</Page>
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/SparkiyClient.Windows.csproj b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/SparkiyClient.Windows.csproj
index 1ead028..29bb3da 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/SparkiyClient.Windows.csproj
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/SparkiyClient.Windows.csproj
@@ -111,6 +111,9 @@
     <Compile Include="Views\CreateProjectPage.xaml.cs">
       <DependentUpon>CreateProjectPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\DebugPage.xaml.cs">
+      <DependentUpon>DebugPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\EditPage.xaml.cs">
       <DependentUpon>EditPage.xaml</DependentUpon>
     </Compile>
@@ -242,6 +245,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\DebugPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\EditPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -261,6 +268,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
-
-
+</Project>
\ No newline at end of file
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml
new file mode 100644
index 0000000..b21cd0b
--- /dev/null
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml
@@ -0,0 +1,27 @@
+<Page
+    x:Class="SparkiyClient.Views.DebugPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:SparkiyClient.Views"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:sideBar="using:SparkiyClient.Controls.SideBar"
+    mc:Ignorable="d"
+	RequestedTheme="Light"
+	DataContext="{Binding Source={StaticResource Locator}, Path=DebugPage}">
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="Auto" />
+			<ColumnDefinition />
+		</Grid.ColumnDefinitions>
+		
+		<sideBar:SideBarControl>
+			<sideBar:SideBarControl.Content>
+				<Grid>
+					<TextBlock>SideBar Content</TextBlock>
+				</Grid>
+			</sideBar:SideBarControl.Content>
+		</sideBar:SideBarControl>
+    </Grid>
+</Page>
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/DebugPage.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml.cs
similarity index 100%
rename from SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/DebugPage.xaml.cs
rename to SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml.cs

From 1378bb6cc214b5820cc16f35c9f513b3603db020 Mon Sep 17 00:00:00 2001
From: Aleksandar Toplek <aleksandar.toplek@gmail.com>
Date: Tue, 23 Dec 2014 14:47:38 +0100
Subject: [PATCH 03/11] Added PlayView to DebugPage, connected

---
 .../SparkiyClient.Common.csproj               |  2 +-
 .../ViewModels/DebugPageViewModel.cs          | 35 ++++++++-
 .../ViewModels/EditPageViewModel.cs           |  2 +-
 .../Models/{Image.cs => ImageAsset.cs}        |  6 +-
 .../SparkiyClient.UILogic/Models/Project.cs   |  2 +-
 .../Services/IProjectPlayEngineManagement.cs  | 13 ++++
 .../Services/IProjectPlayStateManagment.cs    | 20 ++++++
 .../Services/ProjectService.cs                |  2 +-
 .../SparkiyClient.UILogic.csproj              |  6 +-
 .../Controls/PlayView/PlayViewControl.xaml.cs | 71 +++++++++----------
 .../SparkiyClient.Shared.projitems            |  1 +
 .../Views/DebugPage.xaml                      |  8 ++-
 .../Views/DebugPage.xaml.cs                   | 28 +++++++-
 .../SparkiyClient.Windows/Views/EditPage.xaml |  2 +-
 .../Views/EditPage.xaml.cs                    |  3 +-
 15 files changed, 144 insertions(+), 57 deletions(-)
 rename SparkiyClient/SparkiyClient.UILogic/Models/{Image.cs => ImageAsset.cs} (77%)
 create mode 100644 SparkiyClient/SparkiyClient.UILogic/Services/IProjectPlayEngineManagement.cs
 create mode 100644 SparkiyClient/SparkiyClient.UILogic/Services/IProjectPlayStateManagment.cs

diff --git a/SparkiyClient/SparkiyClient.Common/SparkiyClient.Common.csproj b/SparkiyClient/SparkiyClient.Common/SparkiyClient.Common.csproj
index cffe72f..146f3ce 100644
--- a/SparkiyClient/SparkiyClient.Common/SparkiyClient.Common.csproj
+++ b/SparkiyClient/SparkiyClient.Common/SparkiyClient.Common.csproj
@@ -99,4 +99,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/DebugPageViewModel.cs b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/DebugPageViewModel.cs
index 1ae460f..e1ab049 100644
--- a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/DebugPageViewModel.cs
+++ b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/DebugPageViewModel.cs
@@ -1,14 +1,43 @@
-using SparkiyClient.Common;
+using System.Threading.Tasks;
+using SparkiyClient.Common;
+using SparkiyClient.UILogic.Models;
+using SparkiyClient.UILogic.Services;
 
 namespace SparkiyClient.UILogic.ViewModels
 {
 	public interface IDebugPageViewModel
 	{
-		
+		void AssignProjectPlayEngineManager(IProjectPlayEngineManagement projectPlayEngineManagement);
+
+		void AssignProjectPlayStateManager(IProjectPlayStateManagment projectPlayStateManagment);
+
+		Task AssignProjectAsync(Project project);
 	}
 
 	public class DebugPageViewModel : ExtendedViewModel, IDebugPageViewModel
 	{
-		
+		private IProjectPlayEngineManagement projectPlayEngineManager;
+		private IProjectPlayStateManagment projectPlayStateManager;
+		private Project project;
+
+
+
+		public void AssignProjectPlayEngineManager(IProjectPlayEngineManagement projectPlayEngineManager)
+		{
+			this.projectPlayEngineManager = projectPlayEngineManager;
+		}
+
+		public void AssignProjectPlayStateManager(IProjectPlayStateManagment projectPlayStateManager)
+		{
+			this.projectPlayStateManager = projectPlayStateManager;
+		}
+
+		public async Task AssignProjectAsync(Project project)
+		{
+			this.project = project;
+			this.projectPlayEngineManager.AssignProject(this.project);
+
+			this.projectPlayStateManager.PlayProject();
+		}
 	}
 }
\ No newline at end of file
diff --git a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/EditPageViewModel.cs b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/EditPageViewModel.cs
index fe378fe..3c1b8d3 100644
--- a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/EditPageViewModel.cs
+++ b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/EditPageViewModel.cs
@@ -159,7 +159,7 @@ private async void AddNewAssetCommandExecuteAsync()
 			foreach (var selectedFile in selectedFiles)
 				await this.projectService.ImportAsset(this.Project, selectedFile);
 
-			var img = new Image();
+			var img = new ImageAsset();
 			
 		}
 
diff --git a/SparkiyClient/SparkiyClient.UILogic/Models/Image.cs b/SparkiyClient/SparkiyClient.UILogic/Models/ImageAsset.cs
similarity index 77%
rename from SparkiyClient/SparkiyClient.UILogic/Models/Image.cs
rename to SparkiyClient/SparkiyClient.UILogic/Models/ImageAsset.cs
index 720826f..f294602 100644
--- a/SparkiyClient/SparkiyClient.UILogic/Models/Image.cs
+++ b/SparkiyClient/SparkiyClient.UILogic/Models/ImageAsset.cs
@@ -5,9 +5,9 @@
 
 namespace SparkiyClient.UILogic.Models
 {
-	public class Image : AssetWithData<BitmapImage>
+	public class ImageAsset : AssetWithData<BitmapImage>
 	{
-		private static readonly ILogger Log = LogManagerFactory.DefaultLogManager.GetLogger<Image>();
+		private static readonly ILogger Log = LogManagerFactory.DefaultLogManager.GetLogger<ImageAsset>();
 
 		/// <summary>
 		/// Gets the data asynchronously from given path.
@@ -17,7 +17,7 @@ public class Image : AssetWithData<BitmapImage>
 		public override async Task GetDataAsync()
 		{
 			this.Data = new BitmapImage(new Uri(this.Path, UriKind.Absolute));
-			Log.Debug("Loaded Image \"{0}\"", this.Name);
+			Log.Debug("Loaded ImageAsset \"{0}\"", this.Name);
 		}
 #pragma warning restore 1998
 	}
diff --git a/SparkiyClient/SparkiyClient.UILogic/Models/Project.cs b/SparkiyClient/SparkiyClient.UILogic/Models/Project.cs
index f127a11..c233b63 100644
--- a/SparkiyClient/SparkiyClient.UILogic/Models/Project.cs
+++ b/SparkiyClient/SparkiyClient.UILogic/Models/Project.cs
@@ -28,7 +28,7 @@ public async Task LoadAsync(IProjectService projectService)
 				await file.GetCodeAsync();
 
 			// Load images
-			foreach (var image in this.Assets.Result.OfType<Image>())
+			foreach (var image in this.Assets.Result.OfType<ImageAsset>())
 				await image.GetDataAsync();
 		}
 
diff --git a/SparkiyClient/SparkiyClient.UILogic/Services/IProjectPlayEngineManagement.cs b/SparkiyClient/SparkiyClient.UILogic/Services/IProjectPlayEngineManagement.cs
new file mode 100644
index 0000000..3e62901
--- /dev/null
+++ b/SparkiyClient/SparkiyClient.UILogic/Services/IProjectPlayEngineManagement.cs
@@ -0,0 +1,13 @@
+using System.Threading.Tasks;
+using SparkiyClient.UILogic.Models;
+using SparkiyEngine.Bindings.Component.Engine;
+
+namespace SparkiyClient.UILogic.Services
+{
+	public interface IProjectPlayEngineManagement
+	{
+		void AssignProject(Project project);
+
+		IEngineBindings Engine { get; }
+	}
+}
\ No newline at end of file
diff --git a/SparkiyClient/SparkiyClient.UILogic/Services/IProjectPlayStateManagment.cs b/SparkiyClient/SparkiyClient.UILogic/Services/IProjectPlayStateManagment.cs
new file mode 100644
index 0000000..666d9a8
--- /dev/null
+++ b/SparkiyClient/SparkiyClient.UILogic/Services/IProjectPlayStateManagment.cs
@@ -0,0 +1,20 @@
+namespace SparkiyClient.UILogic.Services
+{
+	public interface IProjectPlayStateManagment
+	{
+		void PlayProject();
+
+		void PauseProject();
+
+		void RestartProject();
+
+		void TakeScreenshot();
+
+
+		bool IsInitialized { get; }
+
+		bool IsPlaying { get; }
+
+		bool IsPause { get; }
+	}
+}
\ No newline at end of file
diff --git a/SparkiyClient/SparkiyClient.UILogic/Services/ProjectService.cs b/SparkiyClient/SparkiyClient.UILogic/Services/ProjectService.cs
index e63f5e5..35699f4 100644
--- a/SparkiyClient/SparkiyClient.UILogic/Services/ProjectService.cs
+++ b/SparkiyClient/SparkiyClient.UILogic/Services/ProjectService.cs
@@ -61,7 +61,7 @@ public async Task ImportAsset(Project project, StorageFile file)
 		private Asset ResolveAsset(StorageFile file)
 		{
 			if (file.ContentType == "image/png")
-				return new Image()
+				return new ImageAsset()
 				{
 					Name = file.DisplayName,
 					Path = file.Path
diff --git a/SparkiyClient/SparkiyClient.UILogic/SparkiyClient.UILogic.csproj b/SparkiyClient/SparkiyClient.UILogic/SparkiyClient.UILogic.csproj
index 2e35523..bd6a887 100644
--- a/SparkiyClient/SparkiyClient.UILogic/SparkiyClient.UILogic.csproj
+++ b/SparkiyClient/SparkiyClient.UILogic/SparkiyClient.UILogic.csproj
@@ -60,7 +60,7 @@
     <Compile Include="Models\Asset.cs" />
     <Compile Include="Models\AssetWithData.cs" />
     <Compile Include="Models\Class.cs" />
-    <Compile Include="Models\Image.cs" />
+    <Compile Include="Models\ImageAsset.cs" />
     <Compile Include="Models\ImageSources.cs" />
     <Compile Include="Models\ImageReference.cs" />
     <Compile Include="Models\Project.cs" />
@@ -70,6 +70,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Services\DialogCommand.cs" />
     <Compile Include="Services\IAlertMessageService.cs" />
+    <Compile Include="Services\IProjectPlayEngineManagement.cs" />
+    <Compile Include="Services\IProjectPlayStateManagment.cs" />
     <Compile Include="Services\IProjectService.cs" />
     <Compile Include="Services\IStorageService.cs" />
     <Compile Include="Services\ProjectService.cs" />
@@ -140,4 +142,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml.cs
index 5debc27..783af34 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml.cs
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml.cs
@@ -18,38 +18,14 @@
 using Microsoft.Practices.ServiceLocation;
 using SparkiyClient.Services;
 using SparkiyClient.UILogic.Models;
+using SparkiyClient.UILogic.Services;
 using SparkiyEngine.Bindings.Component.Engine;
 
 // The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236
 
 namespace SparkiyClient.Controls.PlayView
 {
-	public interface IProjectPlayStateManagment
-	{
-		Task AssignProjectAsync(Project project);
-
-		void PlayProject();
-
-		void PauseProject();
-
-		void RestartProject();
-
-		void TakeScreenshot();
-
-
-		bool IsInitialized { get; }
-
-		bool IsPlaying { get; }
-
-		bool IsPause { get; }
-	}
-
-	public interface IProjectPlayEngineManagement
-	{
-		IEngineBindings Engine { get; }
-	}
-
-    public sealed partial class PlayViewControl : UserControl, IProjectPlayStateManagment, IProjectPlayEngineManagement
+	public sealed partial class PlayViewControl : UserControl, IProjectPlayStateManagment, IProjectPlayEngineManagement
     {
 	    private static ILogger Log = LogManagerFactory.DefaultLogManager.GetLogger<PlayViewControl>();
 
@@ -57,8 +33,8 @@ public sealed partial class PlayViewControl : UserControl, IProjectPlayStateMana
 	    private IEngineBindings engine;
 
 		// State tracking
-	    private bool isPaused;
-	    private bool isInitialized;
+	    private bool isPaused = true;
+	    private bool isInitialized = false;
 
 
 	    public PlayViewControl()
@@ -67,7 +43,7 @@ public PlayViewControl()
         }
 
 
-	    public async Task AssignProjectAsync(Project project)
+	    public void AssignProject(Project project)
 	    {
 			// Stop currently running project
 		    if (this.IsInitialized)
@@ -76,15 +52,34 @@ public async Task AssignProjectAsync(Project project)
 			// Assign new project
 		    this.project = project;
 
-			// TODO Load Scripts and Classes from project
-			// TODO Load assets from project
-
-			// TODO Combine Classes with scripts
-
+			// Load assets from project
+		    var imageAssets = new List<ImageAsset>();
+		    foreach (var asset in this.project.Assets.Result)
+		    {
+			    if (asset is ImageAsset)
+			    {
+				    var imageAsset = asset as ImageAsset;
+					imageAssets.Add(imageAsset);
+			    }
+				else { 
+					throw new NotSupportedException("Provided asset type is not supported by this player.");
+				}
+			}
+
+			// Combine all classes into one string
+		    var classesCombined = project.Files.Result
+			    .OfType<Class>()
+			    .Aggregate(
+				    String.Empty,
+				    (combined, current) => combined + current.Code);
+
+			// Instantiate new engine
 		    this.engine = ServiceLocator.Current.GetInstance<EngineProviderService>().GetLuaDxEngine(this.SwapChainPanel);
-			// TODO Add scripts to the engine
-			
-			throw new NotImplementedException();
+			this.engine.Initialize();
+
+			// Add scripts to the engine
+		    foreach (var script in project.Files.Result.OfType<Script>())
+			    this.engine.AddScript(script.Name, classesCombined + script.Code);
 
 			this.isInitialized = true;
 		}
@@ -105,8 +100,6 @@ public void PlayProject()
 
 			this.Engine.Play();
 
-		    throw new NotImplementedException();
-
 		    this.isPaused = false;
 	    }
 
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/SparkiyClient.Shared.projitems b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/SparkiyClient.Shared.projitems
index 655a2bb..8029b58 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/SparkiyClient.Shared.projitems
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/SparkiyClient.Shared.projitems
@@ -55,6 +55,7 @@
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Converters\BooleanToVisibilityConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Services\AlertMessageService.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Services\EngineProviderService.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Services\ViewModelProviderService.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Views\MainPage.xaml.cs">
       <DependentUpon>MainPage.xaml</DependentUpon>
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml
index b21cd0b..0493462 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml
@@ -1,4 +1,4 @@
-<Page
+<common:PageBase
     x:Class="SparkiyClient.Views.DebugPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -6,6 +6,8 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:sideBar="using:SparkiyClient.Controls.SideBar"
+    xmlns:playView="using:SparkiyClient.Controls.PlayView"
+    xmlns:common="using:SparkiyClient.Common"
     mc:Ignorable="d"
 	RequestedTheme="Light"
 	DataContext="{Binding Source={StaticResource Locator}, Path=DebugPage}">
@@ -23,5 +25,7 @@
 				</Grid>
 			</sideBar:SideBarControl.Content>
 		</sideBar:SideBarControl>
+		
+		<playView:PlayViewControl x:Name="PlayView" Grid.Column="1" />
     </Grid>
-</Page>
+</common:PageBase>
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml.cs
index 9567c92..96d2777 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml.cs
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml.cs
@@ -12,6 +12,11 @@
 using Windows.UI.Xaml.Input;
 using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Navigation;
+using SparkiyClient.Common;
+using SparkiyClient.Controls.PlayView;
+using SparkiyClient.UILogic.Models;
+using SparkiyClient.UILogic.Services;
+using SparkiyClient.UILogic.ViewModels;
 
 // The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
 
@@ -20,11 +25,32 @@ namespace SparkiyClient.Views
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.
     /// </summary>
-    public sealed partial class DebugPage : Page
+    public sealed partial class DebugPage : PageBase
     {
         public DebugPage()
         {
             this.InitializeComponent();
         }
+
+
+	    protected override async void OnNavigatedTo(NavigationEventArgs e)
+	    {
+		    var project = e.Parameter as Project;
+			if (project == null)
+				throw new NullReferenceException("Passed data is not in expected format.");
+
+			this.ViewModel.AssignProjectPlayEngineManager(this.PlayView as IProjectPlayEngineManagement);
+			this.ViewModel.AssignProjectPlayStateManager(this.PlayView as IProjectPlayStateManagment);
+
+#pragma warning disable 4014
+			// Note: We want this to run asynchronously to navigation
+			this.ViewModel.AssignProjectAsync(project);
+#pragma warning restore 4014
+
+		    base.OnNavigatedTo(e);
+	    }
+
+
+	    public IDebugPageViewModel ViewModel => this.DataContext as IDebugPageViewModel;
     }
 }
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml
index c1a662d..8248249 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml
@@ -291,7 +291,7 @@
 							<extensions:AssetDataTemplateSelector>
 								<extensions:AssetDataTemplateSelector.ImageDataTemplate>
 									<DataTemplate>
-										<StackPanel Orientation="Horizontal" d:DataContext="{d:DesignInstance Type=models:Image, IsDesignTimeCreatable=True}">
+										<StackPanel Orientation="Horizontal" d:DataContext="{d:DesignInstance Type=models:ImageAsset, IsDesignTimeCreatable=True}">
 											<Border Margin="8 3" Background="{StaticResource AccentBrushDark}" VerticalAlignment="Center">
 												<Image Source="{Binding Data.UriSource}" Width="36" Height="36" Stretch="Uniform" />
 											</Border>
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml.cs
index c052db4..8092dd5 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml.cs
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml.cs
@@ -20,7 +20,6 @@
 using SparkiyClient.Common.Controls;
 using SparkiyClient.UILogic.Models;
 using SparkiyClient.UILogic.ViewModels;
-using Image = SparkiyClient.UILogic.Models.Image;
 
 namespace SparkiyClient.Views
 {
@@ -1253,7 +1252,7 @@ public class AssetDataTemplateSelector : DataTemplateSelector
 		/// <returns>DataTemplate cooresponsing to passed CodeFile Type</returns>
 		protected override DataTemplate SelectTemplateCore(object item)
 		{
-			if (item is Image)
+			if (item is ImageAsset)
 				return this.ImageDataTemplate;
 
 			return base.SelectTemplateCore(item);

From 86ff252a68ff2bbf7e944ee19be5b505915bc768 Mon Sep 17 00:00:00 2001
From: Aleksandar Toplek <aleksandar.toplek@gmail.com>
Date: Mon, 29 Dec 2014 15:14:43 +0100
Subject: [PATCH 04/11] Update README.md

---
 README.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 60f086f..616f750 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
-# Sparkiy for Windows
-_Sparkiy/sparkiy-client_
+# Sparkiy
+_[Sparkiy/sparkiy-client](https://github.com/Sparkiy/sparkiy-client)_
+
+[![Bountysource](https://www.bountysource.com/badge/team?team_id=54298&style=bounties_posted)](https://www.bountysource.com/teams/sparkiy-client/bounties?utm_source=sparkiy-client&utm_medium=shield&utm_campaign=bounties_posted)
 
 ## Overview
 Bring your ideas to life. Make something everyone can play on their computer, tablet, phone and console.
@@ -12,6 +14,7 @@ Sparkiy is fully-featured platform for game and application development. Touch f
 - Xbox One
 
 ## Project status
+
 |               | master | beta | development | edge |
 | ------------- | ------ | ---- | ----------- | ---- |
 | Windows       | [![master build status](https://ci.appveyor.com/api/projects/status/gvxevc5yih5oodnn/branch/master?svg=true&pendingText=pending...&passingText=OK&failingText=failed)](https://ci.appveyor.com/project/AleksandarDev/sparkiy-client/branch/master) | [![beta build status](https://ci.appveyor.com/api/projects/status/gvxevc5yih5oodnn/branch/beta?svg=true&pendingText=pending...&passingText=OK&failingText=failed)](https://ci.appveyor.com/project/AleksandarDev/sparkiy-client/branch/beta) | [![development build status](https://ci.appveyor.com/api/projects/status/gvxevc5yih5oodnn/branch/development?svg=true&pendingText=pending...&passingText=OK&failingText=failed)](https://ci.appveyor.com/project/AleksandarDev/sparkiy-client/branch/development) | [![edge build status](https://ci.appveyor.com/api/projects/status/gvxevc5yih5oodnn/branch/edge?svg=true&pendingText=pending...&passingText=OK&failingText=failed)](https://ci.appveyor.com/project/AleksandarDev/sparkiy-client/branch/edge) |

From e3ca21a97440d3f4dbbc365a3e4ada226d421df1 Mon Sep 17 00:00:00 2001
From: Aleksandar Toplek <aleksandar.toplek@gmail.com>
Date: Mon, 29 Dec 2014 15:20:44 +0100
Subject: [PATCH 05/11] Added global tips

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 616f750..580ffd9 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # Sparkiy
 _[Sparkiy/sparkiy-client](https://github.com/Sparkiy/sparkiy-client)_
 
+[![GratiPay Tips](https://img.shields.io/gratipay/sparkiy.svg?style=flat-square)](https://gratipay.com/sparkiy/)
 [![Bountysource](https://www.bountysource.com/badge/team?team_id=54298&style=bounties_posted)](https://www.bountysource.com/teams/sparkiy-client/bounties?utm_source=sparkiy-client&utm_medium=shield&utm_campaign=bounties_posted)
 
 ## Overview

From 984b8788cee31690e900015fc63834212449da96 Mon Sep 17 00:00:00 2001
From: Aleksandar Toplek <aleksandar.toplek@gmail.com>
Date: Tue, 30 Dec 2014 20:23:15 +0100
Subject: [PATCH 06/11] Added DELTA and TOTAL variables

---
 .../Controls/PlayView/PlayViewControl.xaml.cs |  5 +++
 .../Views/DebugPage.xaml                      |  2 +-
 SparkiyClient/SparkiyEngine.Engine/Sparkiy.cs | 32 +++++++++++++++----
 .../SparkiyEngine.Engine.csproj               |  5 ++-
 .../SparkiyEngine.Engine/packages.config      |  1 +
 .../SparkiyEngine.Input/PointerManager.cs     |  9 +++---
 6 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml.cs
index 783af34..f908507 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml.cs
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/PlayView/PlayViewControl.xaml.cs
@@ -45,6 +45,8 @@ public PlayViewControl()
 
 	    public void AssignProject(Project project)
 	    {
+			Log.Debug("Assigned project \"{0}\" to the PlayView", project.Name);
+
 			// Stop currently running project
 		    if (this.IsInitialized)
 			    this.StopProject();
@@ -60,6 +62,7 @@ public void AssignProject(Project project)
 			    {
 				    var imageAsset = asset as ImageAsset;
 					imageAssets.Add(imageAsset);
+					Log.Debug("Added Asset:Image \"{0}\"", imageAsset.Name);
 			    }
 				else { 
 					throw new NotSupportedException("Provided asset type is not supported by this player.");
@@ -77,6 +80,8 @@ public void AssignProject(Project project)
 		    this.engine = ServiceLocator.Current.GetInstance<EngineProviderService>().GetLuaDxEngine(this.SwapChainPanel);
 			this.engine.Initialize();
 
+			// TODO Add assets to the engine
+
 			// Add scripts to the engine
 		    foreach (var script in project.Files.Result.OfType<Script>())
 			    this.engine.AddScript(script.Name, classesCombined + script.Code);
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml
index 0493462..4fd7fc1 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml
@@ -21,7 +21,7 @@
 		<sideBar:SideBarControl>
 			<sideBar:SideBarControl.Content>
 				<Grid>
-					<TextBlock>SideBar Content</TextBlock>
+					
 				</Grid>
 			</sideBar:SideBarControl.Content>
 		</sideBar:SideBarControl>
diff --git a/SparkiyClient/SparkiyEngine.Engine/Sparkiy.cs b/SparkiyClient/SparkiyEngine.Engine/Sparkiy.cs
index 5b3ddef..ef06987 100644
--- a/SparkiyClient/SparkiyEngine.Engine/Sparkiy.cs
+++ b/SparkiyClient/SparkiyEngine.Engine/Sparkiy.cs
@@ -9,6 +9,7 @@
 using System.Diagnostics.Contracts;
 using System.Linq;
 using Windows.UI.Xaml;
+using MetroLog;
 using SparkiyEngine.Input;
 
 namespace SparkiyEngine.Engine
@@ -37,6 +38,8 @@ public void Reset()
 
 	public class Sparkiy : IEngineBindings
 	{
+		private static ILogger Log = LogManagerFactory.DefaultLogManager.GetLogger<Sparkiy>();
+
 		private ILanguageBindings languageBindings;
 		private IGraphicsBindings graphicsBindings;
 	    private IGraphicsSettings graphicsSettings;
@@ -48,6 +51,7 @@ public class Sparkiy : IEngineBindings
 	    private bool isReset;
 
 	    private DateTime startedTime;
+		private DateTime lastFrameTime;
 
 
 		/// <summary>
@@ -108,10 +112,12 @@ public void Play()
 	        if (!this.isInitialized)
                 throw new InvalidOperationException("Initialize engine before calling play.");
 
-	        if (this.isReset)
-	            this.startedTime = DateTime.Now;
+		    if (this.isReset)
+		    {
+			    this.startedTime = this.lastFrameTime = DateTime.Now;
+		    }
 
-	        this.GraphicsBindings.Play();
+		    this.GraphicsBindings.Play();
 
             if (this.scriptManager.HasInactiveScripts)
                 throw new NotImplementedException();
@@ -131,8 +137,12 @@ public void Pause()
 
 	    public void AddScript(string name, string code)
 	    {
+			Contract.Requires(!String.IsNullOrWhiteSpace(name));
+
+			Log.Debug("Added script \"{0}\"", name);
+
 	        this.scriptManager.AddScript(name);
-	        this.LanguageBindings.LoadScript(name, code);
+	        this.LanguageBindings.LoadScript(name, code ?? String.Empty);
             this.CallCreated(name);
 	    }
 
@@ -141,10 +151,18 @@ public void CallDrawFunction()
             if (this.scriptManager.HasInactiveScripts)
                 throw new NotImplementedException();
 
-            this.LanguageBindings.SetVariable("DELTA", (double)(DateTime.Now - this.startedTime).TotalMilliseconds, DataTypes.Number);
+			// Calculate delta
+		    var delta = DateTime.Now - this.lastFrameTime;
+		    this.lastFrameTime = DateTime.Now;
+
+			// Calculate total time
+		    var total = DateTime.Now - this.startedTime;
+
+			this.LanguageBindings.SetVariable("DELTA", delta.TotalMilliseconds, DataTypes.Number);
+			this.LanguageBindings.SetVariable("TOTAL", total.TotalMilliseconds, DataTypes.Number);
 
-            // Call touched method if there are any pointers active
-	        if (this.pointerManager.PrimaryPointer != null)
+			// Call touched method if there are any pointers active
+			if (this.pointerManager.PrimaryPointer != null)
 	        {
 	            if (this.pointerManager.PrimaryPointer.InGameType != InputTypes.NotTracked)
 	                this.CallTouched(
diff --git a/SparkiyClient/SparkiyEngine.Engine/SparkiyEngine.Engine.csproj b/SparkiyClient/SparkiyEngine.Engine/SparkiyEngine.Engine.csproj
index ea615aa..930fa36 100644
--- a/SparkiyClient/SparkiyEngine.Engine/SparkiyEngine.Engine.csproj
+++ b/SparkiyClient/SparkiyEngine.Engine/SparkiyEngine.Engine.csproj
@@ -61,6 +61,9 @@
     <Compile Include="Sparkiy.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="MetroLog">
+      <HintPath>..\packages\MetroLog.0.8.6.1\lib\portable-net45+wp8+win8+wpa81\MetroLog.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Practices.Unity">
       <HintPath>$(SolutionDir)packages\Unity.3.5.1405-prerelease\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll</HintPath>
     </Reference>
@@ -86,4 +89,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/SparkiyClient/SparkiyEngine.Engine/packages.config b/SparkiyClient/SparkiyEngine.Engine/packages.config
index 918ebbe..21bc6b4 100644
--- a/SparkiyClient/SparkiyEngine.Engine/packages.config
+++ b/SparkiyClient/SparkiyEngine.Engine/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="MetroLog" version="0.8.6.1" targetFramework="portable-win81+wpa81" />
   <package id="Unity" version="3.5.1405-prerelease" targetFramework="portable-win81+wpa81" />
 </packages>
\ No newline at end of file
diff --git a/SparkiyClient/SparkiyEngine.Input/PointerManager.cs b/SparkiyClient/SparkiyEngine.Input/PointerManager.cs
index f9fd236..0d12778 100644
--- a/SparkiyClient/SparkiyEngine.Input/PointerManager.cs
+++ b/SparkiyClient/SparkiyEngine.Input/PointerManager.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Text;
 using Windows.Devices.Enumeration;
+using Windows.UI.Core;
 using Windows.UI.Input;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Input;
@@ -56,9 +57,9 @@ private void SurfaceOnPointerPressed(object sender, PointerRoutedEventArgs point
             Contract.Requires(pointerRoutedEventArgs != null);
             Contract.Requires(this.surface != null);
 
-            this.RegisterPointer(
-                pointerRoutedEventArgs.Pointer,
-                pointerRoutedEventArgs.GetCurrentPoint(this.surface));
+	        this.RegisterPointer(
+		        pointerRoutedEventArgs.Pointer,
+		        pointerRoutedEventArgs.GetCurrentPoint(this.surface));
         }
 
         private void RegisterPointer(Pointer pointer, PointerPoint point)
@@ -75,7 +76,7 @@ private void RegisterPointer(Pointer pointer, PointerPoint point)
                     new TrackingPointer(pointer, point));
             this.trackedPointers[pointer.PointerId].RealType = InputTypes.Down;
 
-            // Assign primary pointer if first on tracking
+            // Assign primary pointer if first or changed input type
             if (this.trackedPointers.Count == 1 ||
                 this.PrimaryPointer.Pointer.PointerDeviceType != pointer.PointerDeviceType)
                 this.primaryPointerId = pointer.PointerId;

From dd8d568c0cf8e098892c90b29c5362b430cca30e Mon Sep 17 00:00:00 2001
From: Aleksandar Toplek <aleksandar.toplek@gmail.com>
Date: Tue, 30 Dec 2014 20:42:01 +0100
Subject: [PATCH 07/11] Default SideBar state in EditPage is not Closed

---
 .../Controls/SideBar/SideBarControl.xaml        |  1 +
 .../Controls/SideBar/SideBarControl.xaml.cs     | 13 +++++++++++--
 .../SparkiyClient.Windows/Views/EditPage.xaml   |  4 ++--
 .../Views/EditPage.xaml.cs                      | 17 -----------------
 4 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/SideBar/SideBarControl.xaml b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/SideBar/SideBarControl.xaml
index 08becb2..d36e300 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/SideBar/SideBarControl.xaml
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/SideBar/SideBarControl.xaml
@@ -6,6 +6,7 @@
     xmlns:local="using:SparkiyClient.Controls.SideBar"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	Loaded="SideBarControlOnLoaded"
     mc:Ignorable="d"
     d:DesignHeight="300"
     d:DesignWidth="400">
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/SideBar/SideBarControl.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/SideBar/SideBarControl.xaml.cs
index 96c75b4..1bbfa0b 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/SideBar/SideBarControl.xaml.cs
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/SideBar/SideBarControl.xaml.cs
@@ -53,7 +53,17 @@ public SideBarControl()
 			this.SideBarRightShowStoryboard.Completed += SideBarToggleStoryboardCompleted;
 		}
 
-	    private void SideBarToggleStoryboardCompleted(object sender, object e)
+		private void SideBarControlOnLoaded(object sender, RoutedEventArgs e)
+		{
+			// Fast hide if we are hidding on loaded
+			if (!this.IsOpen)
+			{
+				if (this.IsLeft) this.SideBarLeftHideStoryboard.SkipToFill();
+				else this.SideBarRightHideStoryboard.SkipToFill();
+			}
+		}
+
+		private void SideBarToggleStoryboardCompleted(object sender, object e)
 	    {
 			this.SideBarToggleButton.IsEnabled = true;
 		}
@@ -107,7 +117,6 @@ private static void IsLeftPropertyChangedCallback(DependencyObject dependencyObj
 			sender.SideBarToggleButton.Style = isLeft ? sender.SideBarLeftToggleButtonStyle : sender.SideBarRightToggleButtonStyle;
 		}
 
-
 	    public bool IsOpen
 		{
 			get { return (bool)GetValue(IsOpenProperty); }
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml
index c1a662d..c14f2b1 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml
@@ -141,7 +141,7 @@
 			
 		</Grid>
 		
-		<sideBar:SideBarControl x:Name="SideBarFiles">
+		<sideBar:SideBarControl x:Name="SideBarFiles" IsOpen="False">
 			<sideBar:SideBarControl.Content>
 				<Grid>
 					<Grid.RowDefinitions>
@@ -269,7 +269,7 @@
 			</sideBar:SideBarControl.Content>
 		</sideBar:SideBarControl>
 		
-		<sideBar:SideBarControl x:Name="SideBarAssets" IsLeft="False" Grid.Column="2">
+		<sideBar:SideBarControl x:Name="SideBarAssets" IsLeft="False" IsOpen="False" Grid.Column="2">
 			<sideBar:SideBarControl.Content>
 				<Grid>
 					<Grid.RowDefinitions>
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml.cs
index c052db4..5446f46 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml.cs
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml.cs
@@ -15,7 +15,6 @@
 using Windows.UI.Xaml.Data;
 using Windows.UI.Xaml.Input;
 using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
 using SparkiyClient.Common;
 using SparkiyClient.Common.Controls;
 using SparkiyClient.UILogic.Models;
@@ -1269,22 +1268,6 @@ public EditPage()
 			this.ViewModel.AssignEditor(this.CodeEditor);
 		}
 
-		protected override void OnNavigatedTo(NavigationEventArgs e)
-		{
-			base.OnNavigatedTo(e);
-
-			// Hide sidebars
-			var timer = new DispatcherTimer();
-			timer.Interval = TimeSpan.FromMilliseconds(400);
-			timer.Tick += (sender, o) =>
-			{
-				this.SideBarFiles.IsOpen = false;
-				this.SideBarAssets.IsOpen = false;
-				timer.Stop();
-			};
-			timer.Start();
-		}
-
 		public new IEditPageViewModel ViewModel => this.DataContext as IEditPageViewModel;
 	}
 }

From 2e58af2f06f2acdbf159767262fdf4c8a6f6679e Mon Sep 17 00:00:00 2001
From: Aleksandar Toplek <aleksandar.toplek@gmail.com>
Date: Wed, 31 Dec 2014 06:33:07 +0100
Subject: [PATCH 08/11] Added DesignTime View Models

---
 .../ViewModels/CreateProjectPageViewModel.cs     | 16 +++++++++-------
 .../ViewModels/DebugPageViewModel.cs             |  7 ++++++-
 .../ViewModels/EditPageViewModel.cs              |  6 ++----
 .../ViewModels/PlayPageViewModel.cs              |  5 +++++
 .../SparkiyClient.Shared/App.xaml.cs             |  1 +
 .../Services/ViewModelProviderService.cs         |  7 ++++---
 .../SparkiyClient.Windows/Views/DebugPage.xaml   | 15 ++++++++++++---
 .../Views/DebugPage.xaml.cs                      |  1 +
 .../SparkiyClient.Windows/Views/EditPage.xaml.cs |  1 +
 .../SparkiyGame.cs                               |  4 ++--
 10 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/CreateProjectPageViewModel.cs b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/CreateProjectPageViewModel.cs
index ad90221..dfaf35e 100644
--- a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/CreateProjectPageViewModel.cs
+++ b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/CreateProjectPageViewModel.cs
@@ -1,15 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Command;
 using GalaSoft.MvvmLight.Views;
 using SparkiyClient.Common;
 using SparkiyClient.UILogic.Models;
 using SparkiyClient.UILogic.Services;
 
-namespace SparkiyClient.UILogic.ViewModels
+namespace SparkiyClient.UILogic.Windows.ViewModels
 {
 	public interface ICreateProjectPageViewModel
 	{
@@ -47,4 +42,11 @@ public Project Project
 
 		public RelayCommand CreateProjectCommand { get; }
 	}
+
+	public sealed class CreateProjectPageViewModelDesignTime : CreateProjectPageViewModel
+	{
+		public CreateProjectPageViewModelDesignTime() : base(null, null)
+		{
+		}
+	}
 }
diff --git a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/DebugPageViewModel.cs b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/DebugPageViewModel.cs
index e1ab049..0a811a6 100644
--- a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/DebugPageViewModel.cs
+++ b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/DebugPageViewModel.cs
@@ -3,7 +3,7 @@
 using SparkiyClient.UILogic.Models;
 using SparkiyClient.UILogic.Services;
 
-namespace SparkiyClient.UILogic.ViewModels
+namespace SparkiyClient.UILogic.Windows.ViewModels
 {
 	public interface IDebugPageViewModel
 	{
@@ -40,4 +40,9 @@ public async Task AssignProjectAsync(Project project)
 			this.projectPlayStateManager.PlayProject();
 		}
 	}
+
+	public sealed class DebugPageViewModelDesignTime : DebugPageViewModel
+	{
+		
+	}
 }
\ No newline at end of file
diff --git a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/EditPageViewModel.cs b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/EditPageViewModel.cs
index 3c1b8d3..6649e0e 100644
--- a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/EditPageViewModel.cs
+++ b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/EditPageViewModel.cs
@@ -1,10 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
-using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Windows.Storage.Pickers;
 using Windows.UI.Xaml.Navigation;
@@ -16,7 +14,7 @@
 using SparkiyClient.UILogic.Models;
 using SparkiyClient.UILogic.Services;
 
-namespace SparkiyClient.UILogic.ViewModels
+namespace SparkiyClient.UILogic.Windows.ViewModels
 {
 	public interface INewFileViewModel
 	{
@@ -211,7 +209,7 @@ public INewFileViewModel NewFileViewModel
 		public RelayCommand PlayProjectCommand { get; }
 	}
 
-	public class EditPageViewModelDesignTime : EditPageViewModel
+	public sealed class EditPageViewModelDesignTime : EditPageViewModel
 	{
 		public EditPageViewModelDesignTime() : base(null, null)
 		{
diff --git a/SparkiyClient/SparkiyClient.UILogic/ViewModels/PlayPageViewModel.cs b/SparkiyClient/SparkiyClient.UILogic/ViewModels/PlayPageViewModel.cs
index 9d34207..0bfec93 100644
--- a/SparkiyClient/SparkiyClient.UILogic/ViewModels/PlayPageViewModel.cs
+++ b/SparkiyClient/SparkiyClient.UILogic/ViewModels/PlayPageViewModel.cs
@@ -11,4 +11,9 @@ public class PlayPageViewModel : ExtendedViewModel, IPlayPageViewModel
 	{
 		
 	}
+
+	public sealed class PlayPageViewModelDesignTime : PlayPageViewModel
+	{
+		
+	}
 }
\ No newline at end of file
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/App.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/App.xaml.cs
index 4a6f707..5987738 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/App.xaml.cs
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/App.xaml.cs
@@ -42,6 +42,7 @@
 using MetroLog.Internal;
 using Microsoft.Practices.ServiceLocation;
 using SparkiyClient.Common;
+using SparkiyClient.UILogic.Windows.ViewModels;
 using SparkiyClient.Views;
 
 namespace SparkiyClient
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Services/ViewModelProviderService.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Services/ViewModelProviderService.cs
index cb33f2b..6424df2 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Services/ViewModelProviderService.cs
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Services/ViewModelProviderService.cs
@@ -1,6 +1,7 @@
 using Windows.ApplicationModel;
 using Microsoft.Practices.ServiceLocation;
 using SparkiyClient.UILogic.ViewModels;
+using SparkiyClient.UILogic.Windows.ViewModels;
 
 namespace SparkiyClient.Services
 {
@@ -10,14 +11,14 @@ public class ViewModelProviderService
 
 		public IProjectPageViewModel ProjectPage => DesignMode.DesignModeEnabled ? new ProjectPageViewModelDesignTime() : ServiceLocator.Current?.GetInstance<IProjectPageViewModel>();
 
-		public IPlayPageViewModel PlayPage => ServiceLocator.Current?.GetInstance<IPlayPageViewModel>();
+		public IPlayPageViewModel PlayPage => DesignMode.DesignModeEnabled ? new PlayPageViewModelDesignTime() : ServiceLocator.Current?.GetInstance<IPlayPageViewModel>();
 
 #if WINDOWS_APP
-		public ICreateProjectPageViewModel CreateProjectPage => ServiceLocator.Current?.GetInstance<ICreateProjectPageViewModel>();
+		public ICreateProjectPageViewModel CreateProjectPage => DesignMode.DesignModeEnabled ? new CreateProjectPageViewModelDesignTime() : ServiceLocator.Current?.GetInstance<ICreateProjectPageViewModel>();
 
 		public IEditPageViewModel EditPage => DesignMode.DesignModeEnabled ? new EditPageViewModelDesignTime() : ServiceLocator.Current?.GetInstance<IEditPageViewModel>();
 
-		public IDebugPageViewModel DebugPage => ServiceLocator.Current?.GetInstance<IDebugPageViewModel>();
+		public IDebugPageViewModel DebugPage => DesignMode.DesignModeEnabled ? new DebugPageViewModelDesignTime() : ServiceLocator.Current?.GetInstance<IDebugPageViewModel>();
 #endif
 	}
 }
\ No newline at end of file
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml
index 4fd7fc1..cbfcb02 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml
@@ -17,15 +17,24 @@
 			<ColumnDefinition Width="Auto" />
 			<ColumnDefinition />
 		</Grid.ColumnDefinitions>
+	
+		<playView:PlayViewControl x:Name="PlayView" Grid.Column="1" />
 		
-		<sideBar:SideBarControl>
+		<sideBar:SideBarControl Grid.Column="0">
 			<sideBar:SideBarControl.Content>
 				<Grid>
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto" />
+						<RowDefinition />
+					</Grid.RowDefinitions>
+					
+					<TextBlock Text="Output"
+							   Style="{StaticResource HeaderTextBlockStyle}" />
 					
+					<ListBox Grid.Row="1" />
 				</Grid>
 			</sideBar:SideBarControl.Content>
 		</sideBar:SideBarControl>
-		
-		<playView:PlayViewControl x:Name="PlayView" Grid.Column="1" />
+	
     </Grid>
 </common:PageBase>
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml.cs
index 96d2777..72b8325 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml.cs
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/DebugPage.xaml.cs
@@ -17,6 +17,7 @@
 using SparkiyClient.UILogic.Models;
 using SparkiyClient.UILogic.Services;
 using SparkiyClient.UILogic.ViewModels;
+using SparkiyClient.UILogic.Windows.ViewModels;
 
 // The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
 
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml.cs
index 8bb036f..28e62de 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml.cs
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Views/EditPage.xaml.cs
@@ -19,6 +19,7 @@
 using SparkiyClient.Common.Controls;
 using SparkiyClient.UILogic.Models;
 using SparkiyClient.UILogic.ViewModels;
+using SparkiyClient.UILogic.Windows.ViewModels;
 
 namespace SparkiyClient.Views
 {
diff --git a/SparkiyClient/SparkiyEngine.Graphics.DirectX/SparkiyGame.cs b/SparkiyClient/SparkiyEngine.Graphics.DirectX/SparkiyGame.cs
index e4052a5..2cf4a2c 100644
--- a/SparkiyClient/SparkiyEngine.Graphics.DirectX/SparkiyGame.cs
+++ b/SparkiyClient/SparkiyEngine.Graphics.DirectX/SparkiyGame.cs
@@ -182,7 +182,7 @@ public void DrawText(string text, float x, float y)
 
 		private void RebuildFontFormat()
 		{
-			if (String.IsNullOrEmpty(this.FontFamily) || this.FontSize == 0)
+			if (String.IsNullOrEmpty(this.FontFamily) || MathUtil.NearEqual(0, this.FontSize))
 				return;
 
 			this.fontFormat = new TextFormat(this.Canvas.DirectWriteFactory, this.FontFamily, this.FontSize);
@@ -250,7 +250,7 @@ public void DrawRectangle(float x, float y, float width, float height)
 			}
 		}
 
-        public void DrawTexture(string assetName, float x, float y, float width, float height)
+        public void DrawTexture(string assetName, float x, float y, float width = -1f, float height = -1f)
         {
             var texture = this.Services.GetService<ITextureProvider>().GetTexture(assetName);
             this.Canvas.PushObject(

From 5c8f464a153a9bc1b9e339ab1b17300b97cbeb6b Mon Sep 17 00:00:00 2001
From: Aleksandar Toplek <aleksandar.toplek@gmail.com>
Date: Wed, 31 Dec 2014 13:17:41 +0100
Subject: [PATCH 09/11] Fixed Project creation with no scripts bug

---
 .../ViewModels/CreateProjectPageViewModel.cs  | 22 +++++++++++++++++--
 .../CodeEditor/CodeEditorControl.xaml.cs      |  6 -----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/CreateProjectPageViewModel.cs b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/CreateProjectPageViewModel.cs
index dfaf35e..1dd65d5 100644
--- a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/CreateProjectPageViewModel.cs
+++ b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/CreateProjectPageViewModel.cs
@@ -1,5 +1,8 @@
-using GalaSoft.MvvmLight.Command;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+using GalaSoft.MvvmLight.Command;
 using GalaSoft.MvvmLight.Views;
+using Nito.AsyncEx;
 using SparkiyClient.Common;
 using SparkiyClient.UILogic.Models;
 using SparkiyClient.UILogic.Services;
@@ -25,6 +28,21 @@ public CreateProjectPageViewModel(IProjectService projectService, INavigationSer
 			this.projectService = projectService;
 
 			this.CreateProjectCommand = new RelayCommand(this.CreateProjectCommandExecuteAsync);
+
+			this.Project = new Project()
+			{
+				Files = NotifyTaskCompletion.Create(async () =>
+				{
+					return new ObservableCollection<CodeFile>()
+					{
+						new Script()
+						{
+							Name = "Entry",
+							Code = "function Created()\n\nend\n\nfunction Started()\n\nend\n\nfunction Draw()\n\nend\n\nfunction Touched(type, x, y)\n\nend\n\nfunction Stopped()\n\nend\n"
+						}
+					};
+				})
+			};
 		}
 
 
@@ -36,7 +54,7 @@ private async void CreateProjectCommandExecuteAsync()
 
 		public Project Project
 		{
-			get { return this.GetProperty<Project>(defaultValue: new Project()); }
+			get { return this.GetProperty<Project>(); }
 			set { this.SetProperty(value); }
 		}
 
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/CodeEditor/CodeEditorControl.xaml.cs b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/CodeEditor/CodeEditorControl.xaml.cs
index b05d7a8..1120698 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/CodeEditor/CodeEditorControl.xaml.cs
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Controls/CodeEditor/CodeEditorControl.xaml.cs
@@ -10,8 +10,6 @@ public sealed partial class CodeEditorControl : UserControl, ICodeEditor
     {
 	    public event EventHandler OnCodeChanged;
 
-	    private const string DebugTemplate = "function Created()\n\t\nend\n\nfunction Started()\n\t\nend\n\nfunction Draw()\n\t\nend\n\nfunction Touched(state, x, y)\n\t\nend\n\nfunction Stopped()\n\t\nend\n";
-
 
         public CodeEditorControl()
         {
@@ -22,10 +20,6 @@ public CodeEditorControl()
 
 	    private void OnLoaded(object sender, RoutedEventArgs routedEventArgs)
 	    {
-#if DEBUG
-		    this.CodeEditor.Text = DebugTemplate;
-#endif
-
 			this.CodeEditor.TextView.TextChanged += (o, args) =>
 		    {
 		        this.OnCodeChanged?.Invoke(this, null);

From 1da4cef89ddd4fd38b4fd927b2197f82c84426d1 Mon Sep 17 00:00:00 2001
From: Aleksandar Toplek <aleksandar.toplek@gmail.com>
Date: Wed, 31 Dec 2014 13:29:54 +0100
Subject: [PATCH 10/11] Added images to package

---
 .../Assets/Logo.scale-100.png                 | Bin 801 -> 17589 bytes
 .../Assets/SmallLogo.scale-100.png            | Bin 329 -> 15543 bytes
 .../Assets/StoreLogo.scale-100.png            | Bin 429 -> 15950 bytes
 .../Package.appxmanifest                      |   8 ++++++--
 .../SparkiyClient.Windows.csproj              |   2 ++
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Assets/Logo.scale-100.png b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Assets/Logo.scale-100.png
index e26771cb33a49bbef824aa333737181b0a5b09a3..a1b02042f92a97d9739ba29f69aef8c3ad959931 100644
GIT binary patch
literal 17589
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
Sf`3W^a&lO0|L4k}ZT|v$VQ7N@

literal 801
zcmeAS@N?(olHy`uVBq!ia0vp^(?FPm4M^HB7Cr(}k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m=1foIEGZ*dUJQLud<^=L*gE#63Ho!PGzwUb%GPK6&5iF
zt!p@aGNX}6<M7XW5|S^O@_K8GcU#~8zUR`ZM%|n9Dor+T`?Fc{_(!KzcM~{RrX3K9
z5Q<>(PVh|N)M-?0RNcTbjaWgEU8noxUax-n>&3Ay)#!y&O11y2s<nJ)KKpF-5>KEF
zt72@XC1)RvT6Xw=y_`Ce)`nGULLL^lI$kwi^E+dQT7YeXY4GvlRR%kj1x$VZi%Bdd
zz}2Giy=-_$h+v#(S+};)DuE4EM?_^qB_eDeo@&q%StD1F>L|*0ZC2sb-}llSMTM?O
z6{b3iid~yk@VE7q7Wb+P8?H5IYp?pSVcL<YlA&A?-VaXoY4NVHEc9LQYbtA~Rz&fG
zSq@)=-u<?`9I^cOnQHAA^#I!x>E~18m#ygK20HL@6W5woI~Fjlw$fX1U{xQA5a+t0
zH$WNIb=fNpWHo}M9#;K6eszDZKty_|-?j4iocj5#zotrWc;@;w`H@=mjsvS2wXX0_
zY}l$4@^sE?UcC)ji*L=Z&}P!xaL&2((OQlj2dv~pV-ifAS;ZsH1{`D!GY%<eyvhR<
zs$H~ebuZVtCmT*Zk#o4a&4D#MD8fBt_p}ucyx6k+LJCwHx3XyMXgVAv6j~PJY!vd_
zGBEX+sRPiQ|NU7P>yys5WH)f>ZLo5m%6XjuXdbKMR7MEHSyb{m!_{Afji&MT$_sz7
z>1{~MlIFe28FRN(GC_~;#Jp4ADipP+9hh|P#-&`vO-Upt3jE0@YLh(^55uYWl9g)Z
RA3>Rb!PC{xWt~$(69A&hN*MqE

diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Assets/SmallLogo.scale-100.png b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Assets/SmallLogo.scale-100.png
index 1eb0d9d528c42f132872e8af4dc563081b0b9aff..06a89a5059934f1b018b0043ca85498ba0c331e3 100644
GIT binary patch
literal 15543
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

delta 302
zcmV+}0nz@qdC3BhB!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0002%
zNkl<Zc-rjO?Fqvm5C-7f(VrQ^MLLp`I7|k}B977j)`A5IXS@#+DfA$O5W|Bec~wX$
zEi($2Ni_|A9Ip3^y=M#lR?LS7fR{zd-_M#)As>!2)Uh-S<$u8uXym}&iW8{s!ew~X
zIE7NLjQpy#I2S$rous$~?f%DHT#B*+q=#!zc5=0FEqWFpB%UE(L807on!pidHPLgY
zO}XEgorrg;PB=8ipgQ5u5`&g_MQaRdaU7Ao8XQMuuN21-s0PPTs1%38x_Yl3Fs-|Y
z4!C-;M-8<ZZ71}cHA#FLZddLy;J<~rtKI?(0DJW1KucWb%m4rY07*qoM6N<$f^<)Y
AUH||9

diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Assets/StoreLogo.scale-100.png b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Assets/StoreLogo.scale-100.png
index dcb672712c6823a0c91548ded70a8acb85536b4d..cc2d2a1fd5a59960d772ec948496bef42afc8cef 100644
GIT binary patch
literal 15950
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
W4Nvv)gUk!xP)x)k_2C7nMgIY60{!m*

delta 403
zcmV;E0c`%xe60hJB!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0003`
zNkl<Zc-rjR(FwyK5C-6Q^s!@fk&fgf8KA>-k&fYeYQR7qB1Z52J4qBmp#|})F?Sbr
z%d$*YXf$1<4ak6i+9UJ*xASqoZ#N_R7UJcdb3cm##_;fpAAfVao}4ujQU`PD&=L_i
z5O0M!K=@`zx}DT9M~Kp`U0m$im=?t8r<N9`6;bv0MPoRK>NtYJa1l)bQ5qwGXpZbs
z7%2oRMd4y35$s&66(fxhNg8W02!vSndlrL2h^Fx+3=$z;kK{0D#MyeJ8WRWZcLSf(
zPcQ_mLOhrmD1TzSMQMl=@DhL&5MHAMAT(lK6B_jlp%Gg33~3-VFr<Y*V@MN$#E>=u
zg&_+B0z*~^X$)B+Br#--kit+82nh`Jg5YAPCj<xMG6x2>J;b1mDEyJzu2uCOq8TDH
xGpw3@?cme<QIE@%x^5h*8IS?F2jnln06TPzU%P9y@(cg~002ovPDHLkV1i*=s3!mb

diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Package.appxmanifest b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Package.appxmanifest
index 7dfd97f..d24d72d 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Package.appxmanifest
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Package.appxmanifest
@@ -15,7 +15,9 @@
   </Resources>
   <Applications>
     <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="SparkiyClient.Windows.App">
-      <m2:VisualElements DisplayName="Sparkiy" Square150x150Logo="Assets\Logo.png" Square30x30Logo="Assets\SmallLogo.png" Description="SparkiyClient.Windows" ForegroundText="light" BackgroundColor="#464646" ToastCapable="false">
+      <m2:VisualElements DisplayName="Sparkiy" Square150x150Logo="Assets\Logo.png" Square30x30Logo="Assets\SmallLogo.png" Description="SparkiyClient.Windows" ForegroundText="light" BackgroundColor="#2E9DC8" ToastCapable="false">
+        <m2:DefaultTile ShortName="Sparkit" DefaultSize="square150x150Logo">
+        </m2:DefaultTile>
         <m2:SplashScreen Image="Assets\SplashScreen.png" BackgroundColor="#2e9dc8" />
         <m2:InitialRotationPreference>
           <m2:Rotation Preference="landscape" />
@@ -25,6 +27,8 @@
     </Application>
   </Applications>
   <Capabilities>
-    <Capability Name="internetClient" />
+    <Capability Name="musicLibrary" />
+    <Capability Name="picturesLibrary" />
+    <Capability Name="removableStorage" />
   </Capabilities>
 </Package>
\ No newline at end of file
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/SparkiyClient.Windows.csproj b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/SparkiyClient.Windows.csproj
index 29bb3da..9532510 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/SparkiyClient.Windows.csproj
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/SparkiyClient.Windows.csproj
@@ -20,6 +20,8 @@
     <RestorePackages>true</RestorePackages>
     <PackageCertificateThumbprint>C8A1990B51B222792CBFBF1503A0F656387022C8</PackageCertificateThumbprint>
     <NuGetPackageImportStamp>60303db4</NuGetPackageImportStamp>
+    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxBundlePlatforms>x86</AppxBundlePlatforms>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>x86</PlatformTarget>

From b8e86a281a775712e95356adfa7ba72de5e6ff0b Mon Sep 17 00:00:00 2001
From: Aleksandar Toplek <aleksandar.toplek@gmail.com>
Date: Wed, 31 Dec 2014 13:52:34 +0100
Subject: [PATCH 11/11] Added more images to the package

---
 .../Assets/Square310x310Logo.scale-100.png       | Bin 0 -> 6802 bytes
 .../Assets/Square70x70Logo.scale-100.png         | Bin 0 -> 1683 bytes
 .../Assets/Wide310x150Logo.scale-100.png         | Bin 0 -> 3537 bytes
 .../SparkiyClient.Windows/Package.appxmanifest   |   4 ++--
 .../SparkiyClient.Windows.csproj                 |   3 +++
 5 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 SparkiyClient/SparkiyClient/SparkiyClient.Windows/Assets/Square310x310Logo.scale-100.png
 create mode 100644 SparkiyClient/SparkiyClient/SparkiyClient.Windows/Assets/Square70x70Logo.scale-100.png
 create mode 100644 SparkiyClient/SparkiyClient/SparkiyClient.Windows/Assets/Wide310x150Logo.scale-100.png

diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Assets/Square310x310Logo.scale-100.png b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Assets/Square310x310Logo.scale-100.png
new file mode 100644
index 0000000000000000000000000000000000000000..66413330938b10794dd8e741130c41af707fa03f
GIT binary patch
literal 6802
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
W3tXI&R|MH3fQ8u&)2hpud;bSl`4RB|

literal 0
HcmV?d00001

diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Assets/Square70x70Logo.scale-100.png b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Assets/Square70x70Logo.scale-100.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ed1f47d0e3451868e9336ae003389aabcac77ea
GIT binary patch
literal 1683
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

literal 0
HcmV?d00001

diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Assets/Wide310x150Logo.scale-100.png b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Assets/Wide310x150Logo.scale-100.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0ea16421a5d8a7f9f34c4b7a1d7cbb547ec7825
GIT binary patch
literal 3537
zcmbtXi$Bx*8#j`|R_au8Nwl2~atm|6#FTNO>x@~Hn%Imon?y}crE=R>EY|2U<r+1U
z$gGs=Flw8*%+^YB77NGy+HdD?_&uN3=kj`<*X#Xxp6B)XJeM1Xf)0SS4YbwN)WAr8
z#1S<$5L|UGT(?%W9_wXIskXJJ0uLb6e*HJ@wLH#Oan>jJhbF42S?~I9f|AR;$SS55
z33<>@OQvh0yLYc<Z~6lj;t3>T-?8KYrSx(h_DtHl$vH~Cbh+;@Xym#t2R0pwR4cm%
z{lhBe(C!ScwFmTX)n^FF4;sh;n2jvR(W-}8d%Mt>kFMoIx_ik+hc+7DHd`N{f%sGB
z#=2s}PS6$8o$Ei~*!?Y~tLIAU>3nI++~CEZGLxkX{K3%ovWwj>K40vLE*)|4+F@(|
z{}8)Zo6a+U#cZ9}DnBh>6KPtfk5=o{SWMsH&D&VFEm<!a?m<>}qw@78@gX83g81f6
zHwaquuFgx#t7z855A&sQ{b)nWvU`@lLe(Ma`1Bc`uij*xB@qJ0qwZL#%QTi<5`sd{
z&N!TOvnbG%dCF08YdJSFuN7>MhjymGu+SJL%NGcUW!eM`SSyYKh4T_S_RDm5pr8OC
zS9&ZzXT<;~f_`~H71qd+Maf?F<m)|9{%sPIMHhL_`iI>X$0uI>Tw6dYfo`a}(~nn=
zt7JJ=RP_?A%`x4W_T(U>fC6QHr`ji$&-jPY+CL6_nt7-`|HGpDGb8No3dEWHVS8*M
zEbWMZ3kP%JL(n5<9J%BcRsoQ*e2{Ul<jIH&@DsJPNMk9sh|?Na8IIg{mVjqr&<;4;
z8p1h&qz9x_X8S6413BBHR+gY1z|;!YTygsH5>BcD7R(F1`>7Y*8bn*OrnW!wUnCii
zH;W%%yOR`AZk0D(8#fqW2#_RbE6!o*KTbU_vJL{W;d4&xpX)e7u(XzJ-?&;9Bi2|a
z-@#W<c(=oO&^0YUQ0hF`>FOoo_P5`k&0<wSXTBTlUM3iKxEc|=1DZO&;KVPa-DF}#
z4V`q-xYQELG>u`UCrGRnX`a3OYPL_@6PBUG;p2(C=`+aMc=;6ntejNP_GOmEIxY+A
zbloLNfvp^6?ASSfgXNX)z<Jf}43j1yz}F<cK-V-XN-VoC-mS<0AoZc;D?WnVP%G;R
zc2{BjeQHuOR`67o(mCMN_dT$wHd|deqIk(JJ2+o`6xPyuZ)Q2QL_=S^>YhA+eFfKO
z+~{nQygLD<gNoYNXwtY1twp$*N&7ubc7aEs_JFxP8z(^WC9ZF627kaw{s<J9?xYc~
z(WMa-`_(Lvw_pD1H(cw@OsmZkE*i;N6H$=?8S&4-Xk)$L3p(fPLPve~P=z3~uOGBq
zy=a8l^861tAPjU@-AKqgbv<3lt4;r<4hMCETC+1fHZLzMrFVlu^7yom@8K(s^4eVw
zzFBp=!qtEqDtH^x-<f?Ku;}(ECZxQ4nC`-x<i%7tI&E{-z5|;6_m};C<t~PGyi=W{
z#|hA-($%;F2whI&+Gyb5yx<?S%r?O;;dvWhg%wv*gS5(y<Gs+EJm1yZ4Z?whRIaFu
z0fc$&;+a0PE8iCxj4(PYbPZP@MDgG&=*pqI=eBI|*hhOI%qPGpE8PAD{*#TuUeg%X
z@|qrA#34p=i6Y2?99sKsJ;25C;)+VDNDl+;@vA}ZRRq_jHZs!nGSEAG5V#cP-H08n
z=_Gum$Sp0$vX(k_dl$XoxI_q|z~lp^6pDy&iZUo8*<FAcVomd=A;@3{eIh;_$-W_p
z`HU$m`_ha$ozxVWg)GF+lvkaFpK}{)vao*~F=Vk4QB(N1IaxHC{p3OD6h-6*K(g7p
za{Qa51t|ylh5m~~<|}f(<yrAEbNZp9k@BL5a^2$rQ3%6Eyj%0Bb!y)l_V@978^m??
zMEW#2r0UcPYQ+7Nt69ud%ihpsdO4f?cU1bYqdTXRbn;~j3NaW+wx@Q3Y-m_l_|HIU
zAl8NbT~ktayuBA<m`BR6L~%-P!K4<7IpEs6iV;*uhZP)OvPDFu%{fHUI*xN@X8%Nl
zL+<LNZkac>^(IH>pVxu$DQ`QAg|Cy{-<|QnW1kMrFd5&o&~%8w7|r2M*oSRRKFp}f
zz>jurSg*Rj2I4z}<CVk2S1szPI`f6Bd}={O!ONRt`<XaYLS2hTHnS%-k;e9Uv06NA
zL4xEyP0Gnnyc8j%YFcAV?>Fc-b`~Vmg-!;&Ur3t)O@%jHQ;$nAz%*;l7h~cea7&rb
zztY(hiyhH;sA#L&<v_TG*hFI~eJFgp7Gn$kobhM6O;x3hC`gN_#<h)&xWKFuZcjZ{
zpJ+64uQ=}zMmyD<BiR3oc4tW2rLP)2^<y18*fa!l#}DBzI4{Swm$Z-n5z>J@Y$@)%
z+imi@;kIY7D>HjUT~9W}eu+#}>GkMa>gvXRRy(TYZNr**r^?{Q!I4-MlzhczWJ>G9
zleGFt-x`y7_x>Kup95}vge$|$qGfLcfzn^uR7lvm5Y~tvk7Qp_@)wrVtV4Um18;c;
zs4@dg=f!YGl?9`3jj;ED=KIHemCkaD*w(Q>la|lfX)%sZ8gX*j#%oHFKC~w}_NVp5
zcKM{*w!gw%mCzo(C95S5zzo@(hE2&f3pwWtk5u&=5m5J-E@1=>UVQj7yEJ`g#}Ryh
z-cw<j%7~{W{7<JO8p|SBRbLneynIqdFWbsi84=0A>%u`8v#)u9s87SZ(b07cr7uV-
zucHy}$heVbN-cQPsVx}1CDp5Zs0`LCdWGY&pIk#pJmq@y$_If|_NZ<H*t#@>Up$m<
za78(s+4!!^^#P|LlkiNDLR@iJ=l;dQwXfP`2X1-S!wg=F^-;gT4_*!XE9W%y?7nVN
ziPoEaHEnM_7V9NnKv-gsD@XrH`#h}DIZ^5wR24@-3=VHH{shMA-aS6jah>WG?x)3Y
z>}5u+k*M_(0?4eR)chZ*%14=f%KyM#{M0&8F)_YGm4uhv4ALwVEezB)rK+;;v&=te
z2jNGE`e;KvO!$4fjGB^)brG7YZK|vK-!y7EJ5+LJVf0~tVC$nNXFa&v^t8hLRG<Ci
z_#qrZkc*|+jgoR$TE|Q6!}qaoNKeuqGvjkvXNKHs4;+b4`LpP+q!b1#qDL>5a?x@$
zyd<RF*YAxDRI2gPK+mv){H_1=5Ry%O!JAY>Z<wfLZKFynmYQr@xQyNAMZT*sQ)|M<
zYdTdi@f_Ipj|wNvJ_S#cw^!~SIqU59vyIoCt_Ag2>)u;7giL(zm9ezJ>{N@B4O^VV
z!TC2G5v26Qvst-;VZ}br7(b?*fB=`+bGAuSZ5Vp!D0xtL>~0OP>WQ_LS<Nh<y9}0Z
z`SPo0+=#g>{IO~`Xw45`aXBidd!?SWx#f5fCzvw5dZkTij-)5;i}O4@G-8EZq(Vz2
zG2-9d;{8*qSaco8^E6<!vJF2qY2Y>5+Z>nrsT$M73Mo(4f~A#bjQ+d9F}3{{t^N(>
z@Z5xA2iD9i0O0N;2mf-^<R+O+_#wLwAcVnT1rFI`S7uyzS@o$jtPk899y8gH`QCoZ
z7t_dUai6vPM`rQ>hNjAO_JeDoX=~AIs)N!Gz0u?L^Rj_UoAoe^jksIsPJq;2DS8&k
zC{m9h)x{OmgOh(tb~htuPtDdodiQC|B`4j~n`1fVIPrIB?HOQ)mEmtTe={{}N3@Zp
zg`{BD9%!x}GB<GXgsa~$IBL(3RN?IpD=lykVzNR<{*qh;8XQdrJ&*C4tmvdD1Bu0J
z5ONfXwN&&S?r?40^Q}V)jVXEl8@o%pA#eH;(oGxkJQ~WcNMxSat;kmdT*v9>P5UCZ
z6<AH_BIk}ft2gm5H$tPYVS-(qMvGKlE*(YF3(QH7@&z($s&`TFtkup!lrtwjDPH(8
z>xm5Bs!!~G+?*+Df|%T{_uGu$nM8>$#1@^)$Hd~KJytE=0$<Im?RBgTy>){zz!P8^
z2#Z1s_<*N{!UoEp6Gw{EKopeg&AxJg6@dyBXNioB4&hf&g60(^BZ<<eD!DX~zTma(
zmypppPqVlr?e;^re3dkk7B<4-41E3TnqUE}!cq9X40YLQ|MR(Ej8SYGu-d{Pww}gu
za+{ezj((1)-#D%D_0lShwGE>mD-pz4b1T~ko3sYMJbctzy$eAO{9$vkb~7yQ?BRRh
zfTn!{pU)}pJ0aI4(+<|NJ~_7imWmpM2d*se_U~axffA67xqU9~M@xm5ki9+n2}>|+
z$%%{mbbORrfb4v-bOl@-YE{#i>pyU8*nnSkRDX43&DDOHgLQIoD@;{If9ooo-hylv
zq+dJIPy57xVMT9<IP>h%xV&jP@My{KY3yL?^Y9wyNS6fj1Up-kzID3l<AiCY@Zs$p
z89WUhlgHG1D)~%x=_8n3A$lgPt-DFM^8L(dN{bSi+a^J0>75$h*Pt;Us{J>Zw^<d$
zEEuXsYC5)<ewAl;n)1rSVr48))mV*zW&tUf5`q{b4R`*3RIIoRn%4Wr`u*D;BUSUI
NhV%<UJn@OV@;^QI>)rqW

literal 0
HcmV?d00001

diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Package.appxmanifest b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Package.appxmanifest
index d24d72d..9878232 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Package.appxmanifest
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
-  <Identity Name="Sparkiy.Sparkiy" Publisher="CN=C921DF72-A1E0-450C-ACD3-BB0A8BDEA334" Version="1.1.0.0" />
+  <Identity Name="Sparkiy.Sparkiy" Publisher="CN=C921DF72-A1E0-450C-ACD3-BB0A8BDEA334" Version="1.1.0.2" />
   <Properties>
     <DisplayName>Sparkiy</DisplayName>
     <PublisherDisplayName>Sparkiy</PublisherDisplayName>
@@ -16,7 +16,7 @@
   <Applications>
     <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="SparkiyClient.Windows.App">
       <m2:VisualElements DisplayName="Sparkiy" Square150x150Logo="Assets\Logo.png" Square30x30Logo="Assets\SmallLogo.png" Description="SparkiyClient.Windows" ForegroundText="light" BackgroundColor="#2E9DC8" ToastCapable="false">
-        <m2:DefaultTile ShortName="Sparkit" DefaultSize="square150x150Logo">
+        <m2:DefaultTile ShortName="Sparkiy" DefaultSize="square150x150Logo" Square310x310Logo="Assets\Square310x310Logo.png" Wide310x150Logo="Assets\Wide310x150Logo.png" Square70x70Logo="Assets\Square70x70Logo.png">
         </m2:DefaultTile>
         <m2:SplashScreen Image="Assets\SplashScreen.png" BackgroundColor="#2e9dc8" />
         <m2:InitialRotationPreference>
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/SparkiyClient.Windows.csproj b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/SparkiyClient.Windows.csproj
index 9532510..ec8cff4 100644
--- a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/SparkiyClient.Windows.csproj
+++ b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/SparkiyClient.Windows.csproj
@@ -132,7 +132,10 @@
     <Content Include="Assets\Logo.scale-100.png" />
     <Content Include="Assets\SmallLogo.scale-100.png" />
     <Content Include="Assets\SplashScreen.scale-100.png" />
+    <Content Include="Assets\Square310x310Logo.scale-100.png" />
+    <Content Include="Assets\Square70x70Logo.scale-100.png" />
     <Content Include="Assets\StoreLogo.scale-100.png" />
+    <Content Include="Assets\Wide310x150Logo.scale-100.png" />
     <None Include="Package.StoreAssociation.xml" />
   </ItemGroup>
   <ItemGroup>