Merge pull request #59 from Sparkiy/edge

Release 1.2.0
Sparkiy · Jan 12, 2015 · e56ce83 · e56ce83
2 parents 479c525 + 6b21a27
commit e56ce83
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 35 deletions.
diff --git a/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/CreateProjectPageViewModel.cs b/SparkiyClient/SparkiyClient.UILogic.Windows/ViewModels/CreateProjectPageViewModel.cs
@@ -1,5 +1,6 @@
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
+using Windows.System.UserProfile;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
@@ -36,6 +37,8 @@ public CreateProjectPageViewModel(IProjectService projectService, INavigationSer
 
 			this.Project = new Project()
 			{
+				Description = "Amazing new project. Touch Play button and try it out yourself. It's great!",
+				Author = "Unknown",
 				Files = new ObservableCollection<CodeFile>()
 				{
 					new Script()

diff --git a/SparkiyClient/SparkiyClient.UILogic/ViewModels/MainPageViewModel.cs b/SparkiyClient/SparkiyClient.UILogic/ViewModels/MainPageViewModel.cs
@@ -60,7 +60,7 @@ public MainPageViewModel(INavigationService navigationService, IAlertMessageServ
 			this.ProjectSelectedCommand = new RelayCommand<Project>(this.ProjectSelectedCommandExecute);
 			this.NewProjectCommand = new RelayCommand(this.NewProjectCommandExecute);
 
-			this.NextReleaseCountdown = (new DateTime(2015, 1, 12, 0, 0, 0)) - DateTime.Now;
+			this.NextReleaseCountdown = (new DateTime(2015, 1, 26, 0, 0, 0)) - DateTime.Now;
 			this.nextReleaseCountdownTimer = new DispatcherTimer();
 		    this.nextReleaseCountdownTimer.Interval = TimeSpan.FromSeconds(1);
 			this.nextReleaseCountdownTimer.Tick += NextReleaseCountdownTimerOnTick;

diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Themes/ColorsDictionary.xaml b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Themes/ColorsDictionary.xaml
@@ -8,11 +8,14 @@
 	<Color x:Key="AccentColorGreen">#92CA45</Color>
 	<Color x:Key="AccentColorDark">#2F4750</Color>
 	<Color x:Key="AccentColorLight">#FFFFFF</Color>
+	<Color x:Key="AccentColorDarkLighter3">#F8F9F9</Color>
 	<SolidColorBrush x:Key="AccentBrushBlue" Color="{StaticResource AccentColorBlue}" />
 	<SolidColorBrush x:Key="AccentBrushRed" Color="{StaticResource AccentColorRed}" />
 	<SolidColorBrush x:Key="AccentBrushGreen" Color="{StaticResource AccentColorGreen}" />
 	<SolidColorBrush x:Key="AccentBrushDark" Color="{StaticResource AccentColorDark}" />
 	<SolidColorBrush x:Key="AccentBrushLight" Color="{StaticResource AccentColorLight}" />
+	<SolidColorBrush x:Key="AccentBrushDarkLighter3" Color="{StaticResource AccentColorDarkLighter3}" />
+
 
 
 </ResourceDictionary>
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/MainPage.xaml b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/MainPage.xaml
@@ -65,7 +65,7 @@
 			</SemanticZoom.ZoomedOutView>
 
 			<SemanticZoom.ZoomedInView>
-				<Hub>
+				<Hub Background="{StaticResource AccentBrushDarkLighter3}" >
 					<Hub.Header>
 						<StackPanel Orientation="Horizontal">
 							<Grid Margin="5 0 20 0">
@@ -80,7 +80,7 @@
 					</Hub.Header>
 
 					<!-- Content -->
-					<HubSection Width="780" VerticalContentAlignment="Stretch">
+					<HubSection Background="{StaticResource AccentBrushLight}" Width="780" VerticalContentAlignment="Stretch">
 						<DataTemplate>
 							<Grid>
 								<Grid.RowDefinitions>
@@ -145,7 +145,7 @@
 											   Visibility="{Binding IsNextReleaseReady, Converter={StaticResource BooleanToVisibilityConverter}}" />
 								</Grid>
 
-								<TextBlock Text="v1.1.1" FontSize="16" FontWeight="ExtraLight" Margin="0 4" Grid.Row="3" />
+								<TextBlock Text="v1.3.0" FontSize="16" FontWeight="ExtraLight" Margin="0 4" Grid.Row="3" />
 							</Grid>
 						</DataTemplate>
 					</HubSection>

diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/ProjectPage.xaml b/SparkiyClient/SparkiyClient/SparkiyClient.Shared/Views/ProjectPage.xaml
@@ -67,8 +67,9 @@
 								<Grid>
 									<TextBlock Text="{Binding Project.Description}" 
                                                Foreground="#333333" 
-                                               Style="{StaticResource BodyTextBlockStyle}"
-											   VerticalAlignment="Center"
+											   FontSize="15"
+											   TextWrapping="Wrap"
+											   Padding="0 10 0 0"
 											   Visibility="{Binding IsEditMode, Converter={StaticResource NegatedBooleanToVisibilityConverter}}" />
 									<TextBox Text="{Binding Project.Description, Mode=TwoWay}" 
 											 Visibility="{Binding IsEditMode, Converter={StaticResource BooleanToVisibilityConverter}}" 
@@ -89,7 +90,10 @@
 									   Margin="0,8,8,8" 
 									   VerticalAlignment="Center" />
 							<TextBlock Text="{Binding Project.Author}" 
-									   Style="{StaticResource SubtitleTextBlockStyle}"
+									   FontSize="15"
+									   TextWrapping="NoWrap"
+									   TextTrimming="CharacterEllipsis"
+									   Padding="0 10 0 0"
 									   Margin="8" Foreground="#666666" Grid.Column="1"
 									   Visibility="{Binding IsEditMode, Converter={StaticResource NegatedBooleanToVisibilityConverter}}"/>
 							<TextBox Text="{Binding Project.Author, Mode=TwoWay}" Margin="8" Grid.Column="1"

diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/arm.txt b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/arm.txt
@@ -1,4 +1,4 @@
-MainPackage=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\ARM\Release\SparkiyClient.Windows_1.1.1.1_ARM.appx
-SymbolPackage=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\AppPackages\SparkiyClient.Windows_1.1.1.1_Test\SparkiyClient.Windows_1.1.1.1_ARM.appxsym
-ResourcePack=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\ARM\Release\SparkiyClient.Windows_1.1.1.1_scale-140.appx
-ResourcePack=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\ARM\Release\SparkiyClient.Windows_1.1.1.1_scale-180.appx
+MainPackage=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\ARM\Release\SparkiyClient.Windows_1.2.0.2_ARM.appx
+SymbolPackage=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\AppPackages\SparkiyClient.Windows_1.2.0.2_Test\SparkiyClient.Windows_1.2.0.2_ARM.appxsym
+ResourcePack=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\ARM\Release\SparkiyClient.Windows_1.2.0.2_scale-140.appx
+ResourcePack=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\ARM\Release\SparkiyClient.Windows_1.2.0.2_scale-180.appx
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/x64.txt b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/x64.txt
@@ -1,2 +1,2 @@
-MainPackage=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\x64\Release\SparkiyClient.Windows_1.1.1.1_x64.appx
-SymbolPackage=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\AppPackages\SparkiyClient.Windows_1.1.1.1_Test\SparkiyClient.Windows_1.1.1.1_x64.appxsym
+MainPackage=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\x64\Release\SparkiyClient.Windows_1.2.0.2_x64.appx
+SymbolPackage=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\AppPackages\SparkiyClient.Windows_1.2.0.2_Test\SparkiyClient.Windows_1.2.0.2_x64.appxsym
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/x86.txt b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/BundleArtifacts/x86.txt
@@ -1,2 +1,2 @@
-MainPackage=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\x86\Release\SparkiyClient.Windows_1.1.1.1_x86.appx
-SymbolPackage=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\AppPackages\SparkiyClient.Windows_1.1.1.1_Test\SparkiyClient.Windows_1.1.1.1_x86.appxsym
+MainPackage=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\bin\x86\Release\SparkiyClient.Windows_1.2.0.2_x86.appx
+SymbolPackage=C:\Users\Aleksandar\Documents\GitHub\sparkiy-client\SparkiyClient\SparkiyClient\SparkiyClient.Windows\AppPackages\SparkiyClient.Windows_1.2.0.2_Test\SparkiyClient.Windows_1.2.0.2_x86.appxsym
diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Package.StoreAssociation.xml b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/Package.StoreAssociation.xml
@@ -358,20 +358,32 @@
     <MainPackageIdentityName>53858AleksandarToplek.Quantastic</MainPackageIdentityName>
   </AccountPackageIdentityNames>
   <PackageInfoList LandingUrl="https://appdev.microsoft.com:443/StorePortals/Developer/Catalog/ReleaseAnchor/b06800e1-6a95-4d7b-9feb-32a371613afd">
-    <PackageInfo>
-      <OsMinVersion>6.3.0.0</OsMinVersion>
-      <PackageArchitecture>x86</PackageArchitecture>
-      <PackageMaxArchitectureVersion>1.1.0.3</PackageMaxArchitectureVersion>
-    </PackageInfo>
-    <PackageInfo>
-      <OsMinVersion>6.3.0.0</OsMinVersion>
-      <PackageArchitecture>arm</PackageArchitecture>
-      <PackageMaxArchitectureVersion>1.1.0.3</PackageMaxArchitectureVersion>
-    </PackageInfo>
-    <PackageInfo>
-      <OsMinVersion>6.3.0.0</OsMinVersion>
-      <PackageArchitecture>x64</PackageArchitecture>
-      <PackageMaxArchitectureVersion>1.1.0.3</PackageMaxArchitectureVersion>
-    </PackageInfo>
+    <BundleInfo>
+      <PackageInfo>
+        <OsMinVersion>6.3.0.0</OsMinVersion>
+        <PackageArchitecture>X86</PackageArchitecture>
+        <PackageMaxArchitectureVersion>1.1.1.1</PackageMaxArchitectureVersion>
+      </PackageInfo>
+      <PackageInfo>
+        <OsMinVersion>6.3.0.0</OsMinVersion>
+        <PackageArchitecture>X64</PackageArchitecture>
+        <PackageMaxArchitectureVersion>1.1.1.1</PackageMaxArchitectureVersion>
+      </PackageInfo>
+      <PackageInfo>
+        <OsMinVersion>6.3.0.0</OsMinVersion>
+        <PackageArchitecture>Neutral</PackageArchitecture>
+        <PackageMaxArchitectureVersion>1.1.1.1</PackageMaxArchitectureVersion>
+      </PackageInfo>
+      <PackageInfo>
+        <OsMinVersion>6.3.0.0</OsMinVersion>
+        <PackageArchitecture>Neutral</PackageArchitecture>
+        <PackageMaxArchitectureVersion>1.1.1.1</PackageMaxArchitectureVersion>
+      </PackageInfo>
+      <PackageInfo>
+        <OsMinVersion>6.3.0.0</OsMinVersion>
+        <PackageArchitecture>ARM</PackageArchitecture>
+        <PackageMaxArchitectureVersion>1.1.1.1</PackageMaxArchitectureVersion>
+      </PackageInfo>
+    </BundleInfo>
   </PackageInfoList>
 </StoreAssociation>
diff --git 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="53858AleksandarToplek.Sparkiy" Publisher="CN=E746B84B-09A1-43E8-B524-41758B02DFE1" Version="1.2.0.0" />
+  <Identity Name="53858AleksandarToplek.Sparkiy" Publisher="CN=E746B84B-09A1-43E8-B524-41758B02DFE1" Version="1.3.0.0" />
   <Properties>
     <DisplayName>Sparkiy</DisplayName>
     <PublisherDisplayName>Aleksandar Toplek</PublisherDisplayName>

diff --git a/SparkiyClient/SparkiyClient/SparkiyClient.Windows/SparkiyClient.Windows.csproj b/SparkiyClient/SparkiyClient/SparkiyClient.Windows/SparkiyClient.Windows.csproj
@@ -22,6 +22,7 @@
     <NuGetPackageImportStamp>60303db4</NuGetPackageImportStamp>
     <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
     <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
+    <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>x86</PlatformTarget>

diff --git a/SparkiyClient/SparkiyEngine.Graphics.DirectX/SparkiyGame.cs b/SparkiyClient/SparkiyEngine.Graphics.DirectX/SparkiyGame.cs
@@ -277,15 +277,16 @@ protected override void Draw(GameTime gameTime)
 			// Clears the screen with the Color.CornflowerBlue
 			this.GraphicsDevice.Clear(this.BackgroundColor);
 
-			// Draw 2D
-			this.Reset();
-
 			if (this.isPlaying)
 			{
+				// Draw 2D
+				this.Reset();
+
 				// Execute users draw loop
 				this.engine.CallDrawFunction();
-				this.Canvas.Render();
 			}
+
+			this.Canvas.Render();
 		}
 
 		public void Reset()