-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #78 from Sparkiy/development
v1.5.0
- Loading branch information
Showing
75 changed files
with
2,971 additions
and
427 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| { | ||
| version: "1.3.0", | ||
| releaseDate: "2015.01.19" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule SharpDX.Toolkit.Game.Direct2D
updated
from 0f96ef to d26495
Large diffs are not rendered by default.
Oops, something went wrong.
19 changes: 19 additions & 0 deletions
19
SparkiyClient/SparkiyClient.Common/Extensions/ApplicationExtensions.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| using System; | ||
| using Windows.ApplicationModel; | ||
| using Windows.UI.Xaml; | ||
|
|
||
| namespace SparkiyClient.Common.Extensions | ||
| { | ||
| public static class ApplicationExtensions | ||
| { | ||
| public static string GetVersion(this Application @this, bool includeRevision = false) | ||
| { | ||
| var version = Package.Current.Id.Version; | ||
| return String.Format("{0}.{1}.{2}{3}", | ||
| version.Major, | ||
| version.Minor, | ||
| version.Build, | ||
| includeRevision ? "." + version.Revision : String.Empty); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,30 @@ | ||
| using System; | ||
| using System.Threading.Tasks; | ||
| using Windows.Storage; | ||
| using Windows.UI.Xaml.Media.Imaging; | ||
| using MetroLog; | ||
|
|
||
| namespace SparkiyClient.UILogic.Models | ||
| { | ||
| public class ImageAsset : AssetWithData<BitmapImage> | ||
| public class ImageAsset : AssetWithData<WriteableBitmap> | ||
| { | ||
| private static readonly ILogger Log = LogManagerFactory.DefaultLogManager.GetLogger<ImageAsset>(); | ||
|
|
||
| /// <summary> | ||
| /// Gets the data asynchronously from given path. | ||
| /// </summary> | ||
| /// <returns></returns> | ||
| #pragma warning disable 1998 | ||
| public override async Task GetDataAsync() | ||
| { | ||
| this.Data = new BitmapImage(new Uri(this.Path, UriKind.Absolute)); | ||
| Log.Debug("Loaded ImageAsset \"{0}\"", this.Name); | ||
| if (this.Data != null) return; | ||
|
|
||
| var imageFile = await StorageFile.GetFileFromPathAsync(this.Path); | ||
| var imageStream = await imageFile.OpenReadAsync(); | ||
|
|
||
| this.Data = new WriteableBitmap(1, 1); | ||
| await this.Data.SetSourceAsync(imageStream); | ||
|
|
||
| Log.Debug("Loaded ImageAsset \"{0}\"", this.Name); | ||
| } | ||
| #pragma warning restore 1998 | ||
| } | ||
| } |
36 changes: 36 additions & 0 deletions
36
SparkiyClient/SparkiyClient.UILogic/Models/News/Article.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
| using SparkiyClient.Common; | ||
|
|
||
| namespace SparkiyClient.UILogic.Models.News | ||
| { | ||
| public class Article : ExtendedObservableObject | ||
| { | ||
| public object Summary | ||
| { | ||
| get { return this.GetProperty<object>(); } | ||
| set { this.SetProperty(value); } | ||
| } | ||
|
|
||
| public Action Action | ||
| { | ||
| get { return this.GetProperty<Action>(); } | ||
| set { this.SetProperty(value); } | ||
| } | ||
|
|
||
| public bool IsDismissed | ||
| { | ||
| get { return this.GetProperty<bool>(); } | ||
| set { this.SetProperty(value); } | ||
| } | ||
|
|
||
| public bool CanDismiss | ||
| { | ||
| get { return this.GetProperty<bool>(); } | ||
| set { this.SetProperty(value); } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
159 changes: 0 additions & 159 deletions
159
SparkiyClient/SparkiyClient.UILogic/ViewModels/PlaygroundPageViewModel.cs
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.