Merge pull request #26 from Sergio0694/dev

First Redstone3 update
Sergio0694 · Oct 15, 2017 · 22cc9ba · 22cc9ba
2 parents b4c52e8 + 8b8f99e
commit 22cc9ba
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 8 deletions.
diff --git a/Brainf_ck-sharp.UWP/Brainf_ck-sharp.UWP.csproj b/Brainf_ck-sharp.UWP/Brainf_ck-sharp.UWP.csproj
@@ -11,8 +11,8 @@
     <AssemblyName>Brainf_ck-sharp.UWP</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.15063.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.16299.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -34,6 +34,7 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -871,7 +872,7 @@
       <Version>1.1.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>5.4.0</Version>
+      <Version>6.0.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp">
       <Version>2.0.0</Version>
@@ -901,7 +902,7 @@
       <Version>1.0.0.6</Version>
     </PackageReference>
     <PackageReference Include="UICompositionAnimations">
-      <Version>2.11.1</Version>
+      <Version>2.12.2</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
@@ -923,7 +924,7 @@
     <SDKReference Include="SQLite.UWP.2015, Version=3.20.1">
       <Name>SQLite for Universal Windows Platform</Name>
     </SDKReference>
-    <SDKReference Include="WindowsMobile, Version=10.0.15063.0">
+    <SDKReference Include="WindowsMobile, Version=10.0.16299.0">
       <Name>Windows Mobile Extensions for the UWP</Name>
     </SDKReference>
   </ItemGroup>

diff --git 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:

diff --git 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
         /// </summary>
         [NotNull]
-        public static IReadOnlyList<InstalledFont> Fonts => _Fonts ?? (_Fonts = GetFonts());
+        public static IReadOnlyList<InstalledFont> 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) };
+                }
+            }
+        }
 
         /// <summary>
         /// Tries to retrieve an <see cref="InstalledFont"/> with the given name
@@ -82,6 +99,9 @@ private static IReadOnlyList<InstalledFont> GetFonts()
             return fontList.OrderBy(font => font.Name).ToArray();
         }
 
+        // Gets the default Segoe font name
+        private const String DefaultSegoeFont = "Segoe UI";
+
         /// <summary>
         /// Gets the list of allowed font families
         /// </summary>
@@ -91,7 +111,7 @@ private static IReadOnlyList<InstalledFont> 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
@@ -250,6 +250,13 @@
         <Setter Property="Foreground" Value="{ThemeResource TextControlForeground}" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="SelectionHighlightColor" Value="{ThemeResource TextControlSelectionHighlightColor}" />
+        <Setter Property="SelectionHighlightColorWhenNotFocused">
+            <Setter.Value>
+                <SolidColorBrush 
+                    Color="{ThemeResource SystemAccentColor}"
+                    Opacity="0.8"/>
+            </Setter.Value>
+        </Setter>
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />

diff --git 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<JumpListGroup<ChangelogReleaseInfo, IReadOnlyList<String>>>
             // Create the output collection
             return new List<JumpListGroup<ChangelogReleaseInfo, IReadOnlyList<String>>>
             {
+                CreateChangelogEntry("2.0.0.0", 2017, 10, 20, new List<String>
+                {
+                    "App rebuilt for Windows 10 Fall Creators Update",
+                    "Minor UI adjustments and bug fixes"
+                }),
                 CreateChangelogEntry("1.4.1.0", 2017, 10, 4, new List<String>
                 {
                     "Minor improvements and UI tweaks"

diff --git a/Brainf_ck-sharp/Brainf_ck-sharp.csproj b/Brainf_ck-sharp/Brainf_ck-sharp.csproj
@@ -11,6 +11,7 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>