From cd8fd84c71081340a584c6b37366c74e6166c407 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Wed, 11 Oct 2017 12:32:28 +0200 Subject: [PATCH 1/3] Upgraded to build 16299, minor fixes --- .../Brainf_ck-sharp.UWP.csproj | 9 +++---- .../Helpers/CodeFormatting/InstalledFont.cs | 24 +++++++++++++++++-- Brainf_ck-sharp.UWP/Styles/TextStyles.xaml | 7 ++++++ .../ChangelogViewFlyoutViewModel.cs | 5 ++++ Brainf_ck-sharp/Brainf_ck-sharp.csproj | 1 + 5 files changed, 40 insertions(+), 6 deletions(-) diff --git a/Brainf_ck-sharp.UWP/Brainf_ck-sharp.UWP.csproj b/Brainf_ck-sharp.UWP/Brainf_ck-sharp.UWP.csproj index ff0b5e22..0546b28e 100644 --- a/Brainf_ck-sharp.UWP/Brainf_ck-sharp.UWP.csproj +++ b/Brainf_ck-sharp.UWP/Brainf_ck-sharp.UWP.csproj @@ -11,8 +11,8 @@ Brainf_ck-sharp.UWP en-US UAP - 10.0.15063.0 - 10.0.15063.0 + 10.0.16299.0 + 10.0.16299.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -34,6 +34,7 @@ false prompt true + latest bin\x86\Release\ @@ -871,7 +872,7 @@ 1.1.1 - 5.4.0 + 6.0.1 2.0.0 @@ -923,7 +924,7 @@ SQLite for Universal Windows Platform - + Windows Mobile Extensions for the UWP diff --git a/Brainf_ck-sharp.UWP/Helpers/CodeFormatting/InstalledFont.cs b/Brainf_ck-sharp.UWP/Helpers/CodeFormatting/InstalledFont.cs index 447697c4..9e3588d8 100644 --- a/Brainf_ck-sharp.UWP/Helpers/CodeFormatting/InstalledFont.cs +++ b/Brainf_ck-sharp.UWP/Helpers/CodeFormatting/InstalledFont.cs @@ -3,6 +3,7 @@ using System.Globalization; using System.Linq; using JetBrains.Annotations; +using SharpDX; using SharpDX.DirectWrite; namespace Brainf_ck_sharp_UWP.Helpers.CodeFormatting @@ -31,7 +32,23 @@ public class InstalledFont /// Gets the list of available fonts on the current device /// [NotNull] - public static IReadOnlyList Fonts => _Fonts ?? (_Fonts = GetFonts()); + public static IReadOnlyList Fonts + { + get + { + // Return the current fonts list or try to generate one + if (_Fonts != null) return _Fonts; + try + { + return _Fonts = GetFonts(); + } + catch (SharpDXException) + { + // Internal library exception, return the default font for now + return new[] { new InstalledFont(DefaultSegoeFont) }; + } + } + } /// /// Tries to retrieve an with the given name @@ -82,6 +99,9 @@ private static IReadOnlyList GetFonts() return fontList.OrderBy(font => font.Name).ToArray(); } + // Gets the default Segoe font name + private const String DefaultSegoeFont = "Segoe UI"; + /// /// Gets the list of allowed font families /// @@ -91,7 +111,7 @@ private static IReadOnlyList GetFonts() "Calibri", "Cambria", "Consolas", - "Segoe UI" + DefaultSegoeFont }; } } diff --git a/Brainf_ck-sharp.UWP/Styles/TextStyles.xaml b/Brainf_ck-sharp.UWP/Styles/TextStyles.xaml index 766ca2fc..806b89cc 100644 --- a/Brainf_ck-sharp.UWP/Styles/TextStyles.xaml +++ b/Brainf_ck-sharp.UWP/Styles/TextStyles.xaml @@ -250,6 +250,13 @@ + + + + + diff --git a/Brainf_ck-sharp.UWP/ViewModels/FlyoutsViewModels/ChangelogViewFlyoutViewModel.cs b/Brainf_ck-sharp.UWP/ViewModels/FlyoutsViewModels/ChangelogViewFlyoutViewModel.cs index b9a35d60..b9b4bc78 100644 --- a/Brainf_ck-sharp.UWP/ViewModels/FlyoutsViewModels/ChangelogViewFlyoutViewModel.cs +++ b/Brainf_ck-sharp.UWP/ViewModels/FlyoutsViewModels/ChangelogViewFlyoutViewModel.cs @@ -30,6 +30,11 @@ private static IList>> // Create the output collection return new List>> { + CreateChangelogEntry("2.0.0.0", 2017, 10, 20, new List + { + "App rebuilt for Windows 10 Fall Creators Update", + "Minor UI adjustments and bug fixes" + }), CreateChangelogEntry("1.4.1.0", 2017, 10, 4, new List { "Minor improvements and UI tweaks" diff --git a/Brainf_ck-sharp/Brainf_ck-sharp.csproj b/Brainf_ck-sharp/Brainf_ck-sharp.csproj index 9f90bc75..8a1492d7 100644 --- a/Brainf_ck-sharp/Brainf_ck-sharp.csproj +++ b/Brainf_ck-sharp/Brainf_ck-sharp.csproj @@ -11,6 +11,7 @@ True + latest From 73899f114995f36d70887ca4ccdb7c71313597cc Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Fri, 13 Oct 2017 20:33:58 +0200 Subject: [PATCH 2/3] UICompositionAnimations library updated --- Brainf_ck-sharp.UWP/Brainf_ck-sharp.UWP.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Brainf_ck-sharp.UWP/Brainf_ck-sharp.UWP.csproj b/Brainf_ck-sharp.UWP/Brainf_ck-sharp.UWP.csproj index 0546b28e..fa05abab 100644 --- a/Brainf_ck-sharp.UWP/Brainf_ck-sharp.UWP.csproj +++ b/Brainf_ck-sharp.UWP/Brainf_ck-sharp.UWP.csproj @@ -902,7 +902,7 @@ 1.0.0.6 - 2.11.1 + 2.12.0 From 8b8f99e8736af6c60c141386d97ccb972b13f50e Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Sun, 15 Oct 2017 12:02:10 +0200 Subject: [PATCH 3/3] UI adjustments in the settings JumpList --- Brainf_ck-sharp.UWP/Brainf_ck-sharp.UWP.csproj | 2 +- .../DataModels/Settings/CategorizedSettingsViewModel.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Brainf_ck-sharp.UWP/Brainf_ck-sharp.UWP.csproj b/Brainf_ck-sharp.UWP/Brainf_ck-sharp.UWP.csproj index fa05abab..e4768cbc 100644 --- a/Brainf_ck-sharp.UWP/Brainf_ck-sharp.UWP.csproj +++ b/Brainf_ck-sharp.UWP/Brainf_ck-sharp.UWP.csproj @@ -902,7 +902,7 @@ 1.0.0.6 - 2.12.0 + 2.12.2 diff --git a/Brainf_ck-sharp.UWP/DataModels/Settings/CategorizedSettingsViewModel.cs b/Brainf_ck-sharp.UWP/DataModels/Settings/CategorizedSettingsViewModel.cs index cfcbde82..ee347030 100644 --- a/Brainf_ck-sharp.UWP/DataModels/Settings/CategorizedSettingsViewModel.cs +++ b/Brainf_ck-sharp.UWP/DataModels/Settings/CategorizedSettingsViewModel.cs @@ -47,7 +47,7 @@ public String SectionDescription ? $"7 {LocalizationManager.GetResource("LowercaseAvailableSettings")}" : $"6 {LocalizationManager.GetResource("LowercaseAvailableSettings")}, {LocalizationManager.GetResource("ThemesPackLocked")}"; case SettingsSectionType.UI: - return $"1 {LocalizationManager.GetResource("LowercaseSingleAvailableSettings")}"; + return $"2 {LocalizationManager.GetResource("LowercaseAvailableSettings")}"; case SettingsSectionType.Interpreter: return $"1 {LocalizationManager.GetResource("LowercaseSingleAvailableSettings")}"; default: