From 503c27ae7b9724385326903b255e22a8ebb8443b Mon Sep 17 00:00:00 2001
From: Stephanie Anderl <46726333+sanderl@users.noreply.github.com>
Date: Tue, 1 Sep 2020 16:48:22 -0700
Subject: [PATCH] Update WinUI Version to 2.4 (#1354)

* Updated to WinUI2.4 and fixed NavMenu about flyout and Dark Mode EquationEditBox

* Added updated equationbox background to the focusederror state
---
 src/Calculator.sln                            |  3 ++
 src/Calculator/App.xaml                       |  2 +-
 src/Calculator/Calculator.vcxproj             |  4 +-
 src/Calculator/Calculator.vcxproj.filters     | 33 +----------------
 .../GraphingCalculator/EquationInputArea.xaml | 10 +++--
 src/Calculator/Views/MainPage.xaml            | 37 ++++++-------------
 src/Calculator/Views/MainPage.xaml.cpp        |  4 +-
 src/Calculator/packages.config                |  6 +--
 8 files changed, 31 insertions(+), 68 deletions(-)

diff --git a/src/Calculator.sln b/src/Calculator.sln
index d7b25cc..09fc81f 100644
--- a/src/Calculator.sln
+++ b/src/Calculator.sln
@@ -195,6 +195,9 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{311E866D-8B93-4609-A691-265941FEE101} = {3A5DF651-B8A1-45CA-9135-964A6FC7F5D1}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0EA53F83-5FA6-46A1-A290-A3C6962D2CAC}
 	EndGlobalSection
diff --git a/src/Calculator/App.xaml b/src/Calculator/App.xaml
index b737ea2..4a0cca5 100644
--- a/src/Calculator/App.xaml
+++ b/src/Calculator/App.xaml
@@ -1691,7 +1691,7 @@
                                         <VisualState x:Name="Focused">
                                             <Storyboard>
                                                 <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlPlaceholderForegroundFocused}"/>
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlPlaceholderForeground}"/>
                                                 </ObjectAnimationUsingKeyFrames>
                                                 <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement" Storyboard.TargetProperty="Background">
                                                     <DiscreteObjectKeyFrame KeyTime="0" Value="Transparent"/>
diff --git a/src/Calculator/Calculator.vcxproj b/src/Calculator/Calculator.vcxproj
index de554cd..7a00ddc 100644
--- a/src/Calculator/Calculator.vcxproj
+++ b/src/Calculator/Calculator.vcxproj
@@ -955,7 +955,7 @@
   </Target>
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.targets" Condition="Exists('..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.targets')" />
-    <Import Project="..\..\packages\Microsoft.UI.Xaml.2.3.200213001\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\packages\Microsoft.UI.Xaml.2.3.200213001\build\native\Microsoft.UI.Xaml.targets')" />
+    <Import Project="..\..\packages\Microsoft.UI.Xaml.2.4.3\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\packages\Microsoft.UI.Xaml.2.4.3\build\native\Microsoft.UI.Xaml.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -963,6 +963,6 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.props'))" />
     <Error Condition="!Exists('..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsCalculator.PGO.1.0.2\build\native\Microsoft.WindowsCalculator.PGO.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.UI.Xaml.2.3.200213001\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.UI.Xaml.2.3.200213001\build\native\Microsoft.UI.Xaml.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.UI.Xaml.2.4.3\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.UI.Xaml.2.4.3\build\native\Microsoft.UI.Xaml.targets'))" />
   </Target>
 </Project>
diff --git a/src/Calculator/Calculator.vcxproj.filters b/src/Calculator/Calculator.vcxproj.filters
index 40a9a5c..4eb652f 100644
--- a/src/Calculator/Calculator.vcxproj.filters
+++ b/src/Calculator/Calculator.vcxproj.filters
@@ -519,7 +519,6 @@
     <Page Include="Views\GraphingCalculator\GraphingNumPad.xaml">
       <Filter>Views\GraphingCalculator</Filter>
     </Page>
-    <Page Include="Controls\PreviewTagControl.xaml" />
     <Page Include="EquationStylePanelControl.xaml" />
     <Page Include="Views\CalculatorProgrammerDisplayPanel.xaml">
       <Filter>Views\StateTriggers</Filter>
@@ -535,9 +534,6 @@
     <PRIResource Include="Resources\az-Latn-AZ\CEngineStrings.resw">
       <Filter>Resources\az-Latn-az</Filter>
     </PRIResource>
-    <PRIResource Include="Resources\uz-Latn-UZ\CEngineStrings.resw">
-      <Filter>Resources\uz-latn-uz</Filter>
-    </PRIResource>
     <PRIResource Include="Resources\af-ZA\CEngineStrings.resw">
       <Filter>Resources\af-za</Filter>
     </PRIResource>
@@ -550,9 +546,6 @@
     <PRIResource Include="Resources\vi-vn\CEngineStrings.resw">
       <Filter>Resources\vi-vn</Filter>
     </PRIResource>
-    <PRIResource Include="Resources\be-BY\CEngineStrings.resw">
-      <Filter>Resources\be-by</Filter>
-    </PRIResource>
     <PRIResource Include="Resources\am-et\CEngineStrings.resw">
       <Filter>Resources\am-et</Filter>
     </PRIResource>
@@ -577,12 +570,6 @@
     <PRIResource Include="Resources\zh-cn\CEngineStrings.resw">
       <Filter>Resources\zh-cn</Filter>
     </PRIResource>
-    <PRIResource Include="Resources\sw-KE\CEngineStrings.resw">
-      <Filter>Resources\sw-ke</Filter>
-    </PRIResource>
-    <PRIResource Include="Resources\bn-BD\CEngineStrings.resw">
-      <Filter>Resources\bn-bd</Filter>
-    </PRIResource>
     <PRIResource Include="Resources\ta-IN\CEngineStrings.resw">
       <Filter>Resources\ta-in</Filter>
     </PRIResource>
@@ -673,9 +660,6 @@
     <PRIResource Include="Resources\pt-br\CEngineStrings.resw">
       <Filter>Resources\pt-br</Filter>
     </PRIResource>
-    <PRIResource Include="Resources\ha-Latn-NG\CEngineStrings.resw">
-      <Filter>Resources\ha-latn-ng</Filter>
-    </PRIResource>
     <PRIResource Include="Resources\lt-LT\CEngineStrings.resw">
       <Filter>Resources\lt-lt</Filter>
     </PRIResource>
@@ -808,9 +792,6 @@
     <PRIResource Include="Resources\ru-ru\Resources.resw">
       <Filter>Resources\ru-ru</Filter>
     </PRIResource>
-    <PRIResource Include="Resources\ha-Latn-NG\Resources.resw">
-      <Filter>Resources\ha-latn-ng</Filter>
-    </PRIResource>
     <PRIResource Include="Resources\lo-LA\Resources.resw">
       <Filter>Resources\lo-la</Filter>
     </PRIResource>
@@ -853,9 +834,6 @@
     <PRIResource Include="Resources\el-GR\Resources.resw">
       <Filter>Resources\el-gr</Filter>
     </PRIResource>
-    <PRIResource Include="Resources\sw-KE\Resources.resw">
-      <Filter>Resources\sw-ke</Filter>
-    </PRIResource>
     <PRIResource Include="Resources\uk-UA\Resources.resw">
       <Filter>Resources\uk-ua</Filter>
     </PRIResource>
@@ -865,9 +843,6 @@
     <PRIResource Include="Resources\vi-vn\Resources.resw">
       <Filter>Resources\vi-vn</Filter>
     </PRIResource>
-    <PRIResource Include="Resources\uz-Latn-UZ\Resources.resw">
-      <Filter>Resources\uz-latn-uz</Filter>
-    </PRIResource>
     <PRIResource Include="Resources\tr-tr\Resources.resw">
       <Filter>Resources\tr-tr</Filter>
     </PRIResource>
@@ -877,9 +852,6 @@
     <PRIResource Include="Resources\zh-tw\Resources.resw">
       <Filter>Resources\zh-tw</Filter>
     </PRIResource>
-    <PRIResource Include="Resources\bn-BD\Resources.resw">
-      <Filter>Resources\bn-bd</Filter>
-    </PRIResource>
     <PRIResource Include="Resources\cs-cz\Resources.resw">
       <Filter>Resources\cs-cz</Filter>
     </PRIResource>
@@ -901,9 +873,6 @@
     <PRIResource Include="Resources\ar-sa\Resources.resw">
       <Filter>Resources\ar-sa</Filter>
     </PRIResource>
-    <PRIResource Include="Resources\be-BY\Resources.resw">
-      <Filter>Resources\be-by</Filter>
-    </PRIResource>
     <PRIResource Include="Resources\kk-KZ\Resources.resw">
       <Filter>Resources\kk-kz</Filter>
     </PRIResource>
@@ -1583,5 +1552,7 @@
     <CopyFileToFolders Include="$(GraphingEngineDll)" />
     <CopyFileToFolders Include="$(GraphingImplDll)" />
     <CopyFileToFolders Include="$(GraphingEngineDll)" />
+    <CopyFileToFolders Include="$(GraphingImplDll)" />
+    <CopyFileToFolders Include="$(GraphingEngineDll)" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml
index cc68792..5a45514 100644
--- a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml
+++ b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml
@@ -266,6 +266,7 @@
 
             <Style x:Key="EquationTextBoxStyle" TargetType="controls:EquationTextBox">
                 <Setter Property="Background" Value="Transparent"/>
+                <Setter Property="BorderBrush" Value="{ThemeResource TextControlBorderBrush}"/>
                 <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}"/>
                 <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}"/>
                 <Setter Property="FontWeight" Value="Normal"/>
@@ -360,7 +361,8 @@
                                                 <Setter Target="EquationButton.BorderBrush" Value="{ThemeResource EquationButtonHideLineBackgroundBrush}"/>
                                                 <Setter Target="EquationButton.Foreground" Value="{ThemeResource EquationButtonHideLineForegroundBrush}"/>
                                                 <Setter Target="EquationButton.IsEnabled" Value="false"/>
-                                                <Setter Target="EquationBoxBorder.Background" Value="{ThemeResource TextBoxBackgroundThemeBrush}"/>
+                                                <Setter Target="EquationBoxBorder.Background" Value="{ThemeResource TextControlBackgroundFocused}"/>
+                                                <Setter Target="EquationBoxBorder.BorderBrush" Value="{ThemeResource EquationButtonHideLineBackgroundBrush}"/>
                                             </VisualState.Setters>
                                         </VisualState>
                                         <VisualState x:Name="Error">
@@ -403,7 +405,7 @@
                                         <VisualState x:Name="Focused">
                                             <VisualState.Setters>
                                                 <Setter Target="EquationBoxBorder.BorderBrush" Value="{ThemeResource EquationTextBoxBorderBrushFocused}"/>
-                                                <Setter Target="EquationBoxBorder.Background" Value="{ThemeResource TextBoxBackgroundThemeBrush}"/>
+                                                <Setter Target="EquationBoxBorder.Background" Value="{ThemeResource TextControlBackgroundFocused}"/>
                                                 <Setter Target="MathRichEditBox.Foreground" Value="{ThemeResource TextControlForegroundFocused}"/>
                                             </VisualState.Setters>
                                         </VisualState>
@@ -411,7 +413,7 @@
                                             <VisualState.Setters>
                                                 <Setter Target="EquationBoxBorder.BorderBrush" Value="{ThemeResource EquationBoxErrorBorderBrush}"/>
                                                 <Setter Target="EquationBoxBorder.BorderThickness" Value="1"/>
-                                                <Setter Target="EquationBoxBorder.Background" Value="{ThemeResource TextBoxBackgroundThemeBrush}"/>
+                                                <Setter Target="EquationBoxBorder.Background" Value="{ThemeResource TextControlBackgroundFocused}"/>
                                                 <Setter Target="ErrorIcon.Visibility" Value="Collapsed"/>
                                             </VisualState.Setters>
                                         </VisualState>
@@ -816,7 +818,7 @@
                                                             <SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=EquationColor.Color}"/>
                                                             <SolidColorBrush x:Key="ButtonRevealBackgroundPointerOver" Color="Transparent"/>
                                                             <SolidColorBrush x:Key="ButtonRevealBackgroundPressed" Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=EquationColor.Color}"/>
-                                                            <SolidColorBrush x:Key="ButtonRevealBackground" Color="Transparent"/>
+                                                            <SolidColorBrush x:Key="ButtonRevealBackground" Color="{ThemeResource TextControlBackgroundFocused}"/>
                                                             <RevealBorderBrush x:Key="ButtonRevealBorderBrush"
                                                                                Opacity="0.33"
                                                                                FallbackColor="Transparent"
diff --git a/src/Calculator/Views/MainPage.xaml b/src/Calculator/Views/MainPage.xaml
index a2bad01..dae7b25 100644
--- a/src/Calculator/Views/MainPage.xaml
+++ b/src/Calculator/Views/MainPage.xaml
@@ -173,36 +173,23 @@
                              x:Load="False">
 
             <muxc:NavigationView.PaneFooter>
-                <StackPanel HorizontalAlignment="Stretch" Orientation="Vertical">
-                    <muxc:NavigationViewList x:Name="NavFooter"
-                                             Width="{StaticResource SplitViewOpenPaneLength}"
-                                             IsItemClickEnabled="True"
-                                             ItemClick="OnAboutButtonClick"
-                                             x:Load="False">
-                        <muxc:NavigationViewList.ItemContainerTransitions>
-                            <!-- Remove EntranceThemeTransition which is a default transition for NavigationViewList -->
-                            <TransitionCollection/>
-                        </muxc:NavigationViewList.ItemContainerTransitions>
-                        <muxc:NavigationViewList.Items>
-                            <muxc:NavigationViewItem x:Name="AboutButton"
+                <muxc:NavigationViewItem x:Name="AboutButton"
                                                      x:Uid="AboutButton"
-                                                     Style="{StaticResource NavViewItemStyle}">
-                                <muxc:NavigationViewItem.Icon>
-                                    <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xe946;"/>
-                                </muxc:NavigationViewItem.Icon>
-                                <FlyoutBase.AttachedFlyout>
-                                    <Flyout x:Name="AboutPageFlyout"
+                                                     Style="{StaticResource NavViewItemStyle}"
+                                             Tapped="OnAboutButtonClick">
+                    <muxc:NavigationViewItem.Icon>
+                        <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xe946;"/>
+                    </muxc:NavigationViewItem.Icon>
+                    <FlyoutBase.AttachedFlyout>
+                        <Flyout x:Name="AboutPageFlyout"
                                             x:Uid="AboutPageFlyout"
                                             Closed="OnAboutFlyoutClosed"
                                             FlyoutPresenterStyle="{StaticResource AboutFlyoutPresenterStyle}"
                                             Opened="OnAboutFlyoutOpened">
-                                        <local:AboutFlyout x:Name="AboutPage" x:Load="False"/>
-                                    </Flyout>
-                                </FlyoutBase.AttachedFlyout>
-                            </muxc:NavigationViewItem>
-                        </muxc:NavigationViewList.Items>
-                    </muxc:NavigationViewList>
-                </StackPanel>
+                            <local:AboutFlyout x:Name="AboutPage" x:Load="False"/>
+                        </Flyout>
+                    </FlyoutBase.AttachedFlyout>
+                </muxc:NavigationViewItem>
             </muxc:NavigationView.PaneFooter>
         </muxc:NavigationView>
     </Grid>
diff --git a/src/Calculator/Views/MainPage.xaml.cpp b/src/Calculator/Views/MainPage.xaml.cpp
index 53c1499..5af8f4d 100644
--- a/src/Calculator/Views/MainPage.xaml.cpp
+++ b/src/Calculator/Views/MainPage.xaml.cpp
@@ -405,9 +405,9 @@ void MainPage::OnNavLoaded(_In_ Object ^ sender, _In_ RoutedEventArgs ^ e)
 
 void MainPage::OnNavPaneOpening(_In_ MUXC::NavigationView ^ sender, _In_ Object ^ args)
 {
-    if (!NavFooter)
+    if (!AboutButton)
     {
-        this->FindName(L"NavFooter");
+        this->FindName(L"AboutButton");
     }
 }
 
diff --git a/src/Calculator/packages.config b/src/Calculator/packages.config
index ef1db86..2bbd27c 100644
--- a/src/Calculator/packages.config
+++ b/src/Calculator/packages.config
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.UI.Xaml" version="2.3.200213001" targetFramework="native" />
+  <package id="Microsoft.UI.Xaml" version="2.4.3" targetFramework="native" />
   <package id="Microsoft.WindowsCalculator.PGO" version="1.0.2" targetFramework="native" />
-</packages>
\ No newline at end of file
+</packages>