clean up code: move App.xaml.h out of pch.h

App.xaml.cpp

@@ -4,8 +4,10 @@
 //
 
 #include "pch.h"
+#include "App.xaml.h"
 #include "DirectXPage.xaml.h"
 #include "EmulatorSettings.h"
+#include "live_connect.h"
 
 using namespace VBA10;
 
@@ -26,7 +28,7 @@ using namespace Windows::UI::Xaml::Navigation;
 using namespace Windows::UI::ViewManagement;
 
 ROMDatabase^ VBA10::App::ROMDB = nullptr;
-
+//web::live::live_client* LiveClient = nullptr;
 
 /// <summary>
 /// Initializes the singleton application object.  This is the first line of authored code
@@ -40,6 +42,7 @@ App::App()
 	Resuming += ref new EventHandler<Object^>(this, &App::OnResuming);
 
 	ROMDB = ref new ROMDatabase();
+	//LiveClient = new web::live::live_client();
 }
 
 /// <summary>

App.xaml.h

@@ -9,6 +9,7 @@
 #include "DirectXPage.xaml.h"
 #include "Database\ROMDatabase.h"
 #include "EmulatorSettings.h"
+#include "live_connect.h"
 
 namespace VBA10
 {
@@ -23,6 +24,9 @@ namespace VBA10
 
 	internal:
 		static ROMDatabase^ ROMDB;
+		static live::live_client* LiveClient;
+
+
 
 
 	private:
@@ -31,5 +35,6 @@ namespace VBA10
 		DirectXPage^ m_directXPage;
 
 
+
 	};
 }

CheatPane.xaml.h

@@ -8,6 +8,8 @@
 #include "CheatPane.g.h"
 #include "CheatData.h"
 
+using namespace Platform::Collections;
+
 namespace VBA10
 {
 	[Windows::Foundation::Metadata::WebHostHidden]

Common/DeviceResources.cpp

@@ -2,6 +2,8 @@
 #include "DeviceResources.h"
 #include "DirectXHelper.h"
 #include <windows.ui.xaml.media.dxinterop.h>
+#include <algorithm>
+
 
 using namespace D2D1;
 using namespace DirectX;
@@ -220,8 +222,8 @@ void DX::DeviceResources::CreateWindowSizeDependentResources()
 	m_outputSize.Height = m_logicalSize.Height * m_compositionScaleY;
 
 	// Prevent zero size DirectX content from being created.
-	m_outputSize.Width = max(m_outputSize.Width, 1);
-	m_outputSize.Height = max(m_outputSize.Height, 1);
+	m_outputSize.Width = std::max(m_outputSize.Width, 1.0f);
+	m_outputSize.Height = std::max(m_outputSize.Height, 1.0f);
 
 	// The width and height of the swap chain must be based on the window's
 	// natively-oriented width and height. If the window is not in the native

Converter.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "pch.h"
+
 #include <ppltasks.h>
 
 //IMPORTANT NOTE: need to include this header file in both the .h and .cpp of an xaml page

Definitions.h

@@ -1,3 +1,63 @@
 #pragma once
 
 #define DEFAULT_SNAPSHOT  L"Assets/no_snapshot.png"
+
+using namespace Windows::Storage;
+
+namespace VBA10
+{
+	public delegate void ROMSelectedDelegate(StorageFile ^file, StorageFolder ^folder);
+
+	[Windows::UI::Xaml::Data::BindableAttribute]
+	public ref class StorageFolderModel sealed
+	{
+	private:
+	public:
+		property StorageFolder ^Folder;
+
+		property Platform::String ^Name
+		{
+			Platform::String ^get()
+			{
+				return this->Folder->DisplayName;
+			}
+		}
+
+		property Platform::String ^Path
+		{
+			Platform::String ^get()
+			{
+				return this->Folder->Path;
+			}
+		}
+
+		StorageFolderModel(StorageFolder ^folder);
+	};
+
+	[Windows::UI::Xaml::Data::BindableAttribute]
+	public ref class StorageFileModel sealed
+	{
+	private:
+	public:
+		property StorageFile ^File;
+		property StorageFolder ^Folder;
+
+		property Platform::String ^Name
+		{
+			Platform::String ^get()
+			{
+				return this->File->Name;
+			}
+		}
+
+		property Platform::String ^Path
+		{
+			Platform::String ^get()
+			{
+				return this->Folder->Path;
+			}
+		}
+
+		StorageFileModel(StorageFile ^file, StorageFolder ^folder);
+	};
+}

DirectXPage.xaml.cpp

@@ -12,7 +12,7 @@
 #include "Database\ROMDatabase.h"
 #include "Definitions.h"
 #include "stringhelper.h"
-
+#include "App.xaml.h"
 
 #include "NavMenuItem.h"
 #include "NavMenuListView.h"

EmulatorSettings.h

@@ -119,6 +119,19 @@ namespace VBA10
 			}
 		}
 
+		//keep track of whether the user successfully signed in before or not (so that we tried to silently resign in)
+		property bool SignedIn
+		{
+			bool get()
+			{
+				return GetValueOrDefault<bool>(SignedInKey, SignedInDefault);
+			}
+			void set(bool value)
+			{
+				AddOrUpdateValue(SignedInKey, value);
+			}
+		}
+
 
 
 #pragma region Button positions
@@ -556,6 +569,7 @@ namespace VBA10
 		Platform::String^ TurboFrameSkipKey = "TurboFrameSkipKey";
 		Platform::String^ EnableTurboKey = "EnableTurboKey";
 		Platform::String^ FullScreenKey = "FullScreenKey";
+		Platform::String^ SignedInKey = "SignedInKey";  
 
 #pragma region button positions
 		Platform::String^ PadLeftPKey = "PadLeftPKey";
@@ -605,6 +619,7 @@ namespace VBA10
 		const int TurboFrameSkipDefault = 2;
 		const bool EnableTurboDefault = false;
 		const bool FullScreenDefault = false;
+		const bool SignedInDefault = false;
 
 
 #pragma region button positions (in cm based on 6x10cm phone)

ImportPage.xaml

@@ -6,7 +6,8 @@
     xmlns:ctl="using:VBA10.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
+    mc:Ignorable="d"
+    Loaded="Page_Loaded">
 
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <Grid.RowDefinitions>
@@ -66,10 +67,15 @@
                 <TextBlock TextWrapping="Wrap"
                            Text="Use this option to import rom through OneDrive. The rom will be copied to the app's private storage."                                
                                  Margin=" 0, 4, 0, 4" />
+
+                <Button x:Name="SignInbtn" Content="Sign in" 
+                            Click="chooseFolderbtn_Click"
+                            Width="248"
+                            Margin =" 0, 4, 0, 4"/>
 
-                <TextBlock TextWrapping="Wrap"
+                <!--<TextBlock TextWrapping="Wrap"
                            Text="This function will be added in a future release. In the mean time, please store roms on your phone's SD Card or documents folder and use the Local Storage option."                                
-                                 Margin=" 0, 4, 0, 4" />
+                                 Margin=" 0, 4, 0, 4" />-->
 
             </StackPanel>
         </ScrollViewer>

ImportPage.xaml.cpp

@@ -8,10 +8,12 @@
 #include "Database\ROMDBEntry.h"
 #include "Database\ROMDatabase.h"
 #include "SelectFilePane.xaml.h"
+#include "App.xaml.h"
 
 #include "stringhelper.h"
 
 
+
 using namespace VBA10;
 
 using namespace Platform;
@@ -252,3 +254,24 @@ void ImportPage::importSavbtn_Click(Platform::Object^ sender, Windows::UI::Xaml:
 
 	});
 }
+
+
+void ImportPage::Page_Loaded(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
+{
+	//try re-sign in silently because access token expires every 1 hour
+	if (!EmulatorSettings::Current->SignedIn)
+	{
+		live::live_client* LiveClient = new live::live_client();
+		LiveClient->login(L"wl.skydrive_update wl.signin")
+			.then([this](bool isLoggedIn)
+		{
+			if (!isLoggedIn)
+			{
+				throw std::exception();
+			}
+			// Request the "me" object from OneDrive
+			// and pass the return value to the next continuation
+			//return model->LiveClient.get(L"me");
+		});
+	}
+}

ImportPage.xaml.h

@@ -26,5 +26,6 @@ namespace VBA10
 		StorageFolder^ tmpfolder;
 		Platform::String^ tmptoken;
 		void importSavbtn_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
+		void Page_Loaded(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
 	};
 }

SelectFilePane.xaml.h

@@ -9,6 +9,7 @@
 
 using namespace Windows::Foundation::Collections;
 using namespace Platform::Collections;
+using namespace Windows::Storage;
 
 namespace VBA10
 {

SelectROMPane.xaml.cpp

@@ -4,14 +4,17 @@
 //
 
 #include "pch.h"
+
 #include "SelectROMPane.xaml.h"
-#include <Windows.h>
+
 #include "DirectXPage.xaml.h";
 #include "EmulatorSettings.h";
 #include "EmulatorFileHandler.h"
 #include "SelectStatePane.xaml.h"
 #include "Database\ROMDBEntry.h"
 #include "Converter.h"
+#include "App.xaml.h"
+
 
 
 using namespace VBA10;

SelectROMPane.xaml.h

@@ -7,63 +7,11 @@
 
 #include "SelectROMPane.g.h"
 #include "Converter.h"
+#include "Definitions.h"
+#include "Database\ROMDBEntry.h"
 
 namespace VBA10
 {
-	public delegate void ROMSelectedDelegate(StorageFile ^file, StorageFolder ^folder);
-
-	[Windows::UI::Xaml::Data::BindableAttribute]
-	public ref class StorageFolderModel sealed
-	{
-	private:
-	public:
-		property StorageFolder ^Folder;
-
-		property Platform::String ^Name
-		{
-			Platform::String ^get()
-			{
-				return this->Folder->DisplayName;
-			}
-		}
-
-		property Platform::String ^Path
-		{
-			Platform::String ^get()
-			{
-				return this->Folder->Path;
-			}
-		}
-
-		StorageFolderModel(StorageFolder ^folder);
-	};
-
-	[Windows::UI::Xaml::Data::BindableAttribute]
-	public ref class StorageFileModel sealed
-	{
-	private:
-	public:
-		property StorageFile ^File;
-		property StorageFolder ^Folder;
-
-		property Platform::String ^Name
-		{
-			Platform::String ^get()
-			{
-				return this->File->Name;
-			}
-		}
-
-		property Platform::String ^Path
-		{
-			Platform::String ^get()
-			{
-				return this->Folder->Path;
-			}
-		}
-
-		StorageFileModel(StorageFile ^file, StorageFolder ^folder);
-	};
 
 	[Windows::Foundation::Metadata::WebHostHidden]
 	public ref class SelectROMPane sealed
@@ -104,4 +52,7 @@ namespace VBA10
 		void ShowContextMenu(ROMDBEntry^ entry, Windows::Foundation::Rect rect);
 		void maximizebtn_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
 	};
+
+
+
 }