From 695b82d2f1b905c3643d7f8de3146220d9725afa Mon Sep 17 00:00:00 2001
From: Matt Cooley <matt@mattcooley.net>
Date: Fri, 1 Feb 2019 13:36:57 -0800
Subject: [PATCH] Delete LayoutAwarePage

---
 src/Calculator/Calculator.vcxproj         |  2 -
 src/Calculator/Calculator.vcxproj.filters |  6 --
 src/Calculator/Common/LayoutAwarePage.cpp | 82 -----------------------
 src/Calculator/Common/LayoutAwarePage.h   | 29 --------
 src/Calculator/Views/MainPage.xaml        | 36 +++++-----
 src/Calculator/Views/MainPage.xaml.h      |  1 -
 6 files changed, 18 insertions(+), 138 deletions(-)
 delete mode 100644 src/Calculator/Common/LayoutAwarePage.cpp
 delete mode 100644 src/Calculator/Common/LayoutAwarePage.h

diff --git a/src/Calculator/Calculator.vcxproj b/src/Calculator/Calculator.vcxproj
index 59cb8e67..cfa37198 100644
--- a/src/Calculator/Calculator.vcxproj
+++ b/src/Calculator/Calculator.vcxproj
@@ -219,7 +219,6 @@
     <ClInclude Include="Controls\OverflowTextBlockAutomationPeer.h" />
     <ClInclude Include="Common\AlwaysSelectedCollectionView.h" />
     <ClInclude Include="Common\BindableBase.h" />
-    <ClInclude Include="Common\LayoutAwarePage.h" />
     <ClInclude Include="Controls\AppBar.h" />
     <ClInclude Include="Controls\CalculationResult.h" />
     <ClInclude Include="Controls\CalculatorButton.h" />
@@ -354,7 +353,6 @@
     <ClCompile Include="Controls\CalculationResultAutomationPeer.cpp" />
     <ClCompile Include="Controls\OverflowTextBlockAutomationPeer.cpp" />
     <ClCompile Include="Common\BindableBase.cpp" />
-    <ClCompile Include="Common\LayoutAwarePage.cpp" />
     <ClCompile Include="Controls\CalculationResult.cpp" />
     <ClCompile Include="Controls\CalculatorButton.cpp" />
     <ClCompile Include="Controls\FlipButtons.cpp" />
diff --git a/src/Calculator/Calculator.vcxproj.filters b/src/Calculator/Calculator.vcxproj.filters
index 87bc5ea9..c702af96 100644
--- a/src/Calculator/Calculator.vcxproj.filters
+++ b/src/Calculator/Calculator.vcxproj.filters
@@ -231,9 +231,6 @@
     <ClCompile Include="Common\BindableBase.cpp">
       <Filter>Common</Filter>
     </ClCompile>
-    <ClCompile Include="Common\LayoutAwarePage.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
     <ClCompile Include="Controls\CalculationResult.cpp">
       <Filter>Controls</Filter>
     </ClCompile>
@@ -324,9 +321,6 @@
     <ClInclude Include="Common\BindableBase.h">
       <Filter>Common</Filter>
     </ClInclude>
-    <ClInclude Include="Common\LayoutAwarePage.h">
-      <Filter>Common</Filter>
-    </ClInclude>
     <ClInclude Include="Controls\AppBar.h">
       <Filter>Controls</Filter>
     </ClInclude>
diff --git a/src/Calculator/Common/LayoutAwarePage.cpp b/src/Calculator/Common/LayoutAwarePage.cpp
deleted file mode 100644
index d4b904e3..00000000
--- a/src/Calculator/Common/LayoutAwarePage.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-#include "pch.h"
-#include "LayoutAwarePage.h"
-#include "CalcViewModel\Common\LocalizationService.h"
-#include "App.xaml.h"
-
-using namespace CalculatorApp::Common;
-
-using namespace Platform;
-using namespace Platform::Collections;
-using namespace Windows::Foundation;
-using namespace Windows::Foundation::Collections;
-using namespace Windows::System;
-using namespace Windows::UI::Core;
-using namespace Windows::UI::ViewManagement;
-using namespace Windows::UI::Xaml;
-using namespace Windows::UI::Xaml::Controls;
-using namespace Windows::UI::Xaml::Interop;
-using namespace Windows::UI::Xaml::Navigation;
-
-/// <summary>
-/// Initializes a new instance of the <see cref="LayoutAwarePage"/> class.
-/// </summary>
-LayoutAwarePage::LayoutAwarePage()
-{
-    if (Windows::ApplicationModel::DesignMode::DesignModeEnabled)
-    {
-        return;
-    }
-
-    Language = LocalizationService::GetInstance()->GetLanguage();
-}
-
-#pragma region Process lifetime management
-
-/// <summary>
-/// Invoked when this page is about to be displayed in a Frame.
-/// </summary>
-/// <param name="e">Event data that describes how this page was reached.  The Parameter
-/// property provides the group to be displayed.</param>
-void LayoutAwarePage::OnNavigatedTo(NavigationEventArgs^ e)
-{
-    LoadState(e->Parameter, nullptr);
-}
-
-/// <summary>
-/// Invoked when this page will no longer be displayed in a Frame.
-/// </summary>
-/// <param name="e">Event data that describes how this page was reached.  The Parameter
-/// property provides the group to be displayed.</param>
-void LayoutAwarePage::OnNavigatedFrom(NavigationEventArgs^ e)
-{
-    auto pageState = ref new Map<String^, Object^>();
-    SaveState(pageState);
-}
-
-/// <summary>
-/// Populates the page with content passed during navigation.  Any saved state is also
-/// provided when recreating a page from a prior session.
-/// </summary>
-/// <param name="navigationParameter">The parameter value passed to
-/// <see cref="Frame.Navigate(Type, Object)"/> when this page was initially requested.
-/// </param>
-/// <param name="pageState">A map of state preserved by this page during an earlier
-/// session.  This will be null the first time a page is visited.</param>
-void LayoutAwarePage::LoadState(Object^ navigationParameter, IMap<String^, Object^>^ pageState)
-{
-}
-
-/// <summary>
-/// Preserves state associated with this page in case the application is suspended or the
-/// page is discarded from the navigation cache.  Values must conform to the serialization
-/// requirements of <see cref="SuspensionManager.SessionState"/>.
-/// </summary>
-/// <param name="pageState">An empty map to be populated with serializable state.</param>
-void LayoutAwarePage::SaveState(IMap<String^, Object^>^ pageState)
-{
-}
-
-#pragma endregion
diff --git a/src/Calculator/Common/LayoutAwarePage.h b/src/Calculator/Common/LayoutAwarePage.h
deleted file mode 100644
index c62559aa..00000000
--- a/src/Calculator/Common/LayoutAwarePage.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-#pragma once
-
-#include <collection.h>
-
-namespace CalculatorApp
-{
-    namespace Common
-    {
-        [Windows::Foundation::Metadata::WebHostHidden]
-        public ref class LayoutAwarePage : Windows::UI::Xaml::Controls::Page
-        {
-        internal:
-            LayoutAwarePage();
-
-        protected:
-            virtual void OnNavigatedTo(Windows::UI::Xaml::Navigation::NavigationEventArgs^ e) override;
-            virtual void OnNavigatedFrom(Windows::UI::Xaml::Navigation::NavigationEventArgs^ e) override;
-            virtual void LoadState(Platform::Object^ navigationParameter,
-                Windows::Foundation::Collections::IMap<Platform::String^, Platform::Object^>^ pageState);
-            virtual void SaveState(Windows::Foundation::Collections::IMap<Platform::String^, Platform::Object^>^ pageState);
-
-        private:
-            Platform::String^ _pageKey;
-        };
-    }
-}
diff --git a/src/Calculator/Views/MainPage.xaml b/src/Calculator/Views/MainPage.xaml
index e8a1d831..6136f42f 100644
--- a/src/Calculator/Views/MainPage.xaml
+++ b/src/Calculator/Views/MainPage.xaml
@@ -1,20 +1,20 @@
-<common:LayoutAwarePage x:Class="CalculatorApp.MainPage"
-                        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                        xmlns:automation="using:CalculatorApp.Common.Automation"
-                        xmlns:common="using:CalculatorApp.Common"
-                        xmlns:controls="using:CalculatorApp.Controls"
-                        xmlns:converters="using:CalculatorApp.Converters"
-                        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                        xmlns:local="using:CalculatorApp"
-                        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                        xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-                        xmlns:vm="using:CalculatorApp.ViewModel"
-                        x:Name="pageRoot"
-                        Background="{ThemeResource AppChromeAcrylicHostBackdropMediumLowBrush}"
-                        Loaded="OnPageLoaded"
-                        Unloaded="OnPageUnLoaded"
-                        mc:Ignorable="d">
+<Page x:Class="CalculatorApp.MainPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:automation="using:CalculatorApp.Common.Automation"
+      xmlns:common="using:CalculatorApp.Common"
+      xmlns:controls="using:CalculatorApp.Controls"
+      xmlns:converters="using:CalculatorApp.Converters"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:local="using:CalculatorApp"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+      xmlns:vm="using:CalculatorApp.ViewModel"
+      x:Name="pageRoot"
+      Background="{ThemeResource AppChromeAcrylicHostBackdropMediumLowBrush}"
+      Loaded="OnPageLoaded"
+      Unloaded="OnPageUnLoaded"
+      mc:Ignorable="d">
 
     <Page.Resources>
         <automation:NarratorNotifier x:Name="NarratorNotifier"/>
@@ -160,4 +160,4 @@
             </Grid>
         </muxc:NavigationView>
     </Grid>
-</common:LayoutAwarePage>
+</Page>
diff --git a/src/Calculator/Views/MainPage.xaml.h b/src/Calculator/Views/MainPage.xaml.h
index 82453dae..d0218878 100644
--- a/src/Calculator/Views/MainPage.xaml.h
+++ b/src/Calculator/Views/MainPage.xaml.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include "Common\LayoutAwarePage.h" // Required by generated header
 #include "Views\Calculator.xaml.h"
 #include "Views\MainPage.g.h"
 #include "Views\DateCalculator.xaml.h"