progress toward purchase products

App.xaml.cpp

@@ -55,17 +55,17 @@ void App::CheckProductLicense()
 	IsPremium = false;
 
 
-	if (CurrentApp::LicenseInformation->ProductLicenses->Lookup("noads_premium")->IsActive)
+	if (CurrentAppSimulator::LicenseInformation->ProductLicenses->Lookup("noads_premium")->IsActive)
 	{
 		HasAds = false;
 		IsPremium = true;
 		return; //no need to check for other 2 licenses
 	}
 
-	if (CurrentApp::LicenseInformation->ProductLicenses->Lookup("removeads")->IsActive)
+	if (CurrentAppSimulator::LicenseInformation->ProductLicenses->Lookup("removeads")->IsActive)
 		HasAds = false;
 
-	if (CurrentApp::LicenseInformation->ProductLicenses->Lookup("premiumfeatures")->IsActive)
+	if (CurrentAppSimulator::LicenseInformation->ProductLicenses->Lookup("premiumfeatures")->IsActive)
 		IsPremium = true;
 
 

App.xaml.h

@@ -28,13 +28,13 @@ namespace VBA10
 		static Platform::String^ ExportFolderID;
 		static bool HasAds;
 		static bool IsPremium;
-
+		static void CheckProductLicense();
 
 
 	private:
 		void OnSuspending(Platform::Object^ sender, Windows::ApplicationModel::SuspendingEventArgs^ e);
 		void OnResuming(Platform::Object ^sender, Platform::Object ^args);
-		void CheckProductLicense();
+
 		DirectXPage^ m_directXPage;
 
 

CheatPane.xaml

@@ -11,7 +11,7 @@
     d:DesignWidth="600">
 
 
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"    >
+    <Grid x:Name="LayoutRoot" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"    >
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
@@ -209,7 +209,6 @@
             </RelativePanel>
         </ScrollViewer>
 
-        <local:AdControl Grid.Row="2">
-        </local:AdControl>
+
     </Grid>
 </Page>

CheatPane.xaml.cpp

@@ -10,6 +10,8 @@
 #include "stringhelper.h"
 #include <string>
 #include <sstream>
+#include "AdControl.xaml.h"
+#include "App.xaml.h"
 
 using namespace std;
 
@@ -35,7 +37,14 @@ using namespace Windows::UI::Popups;
 CheatPane::CheatPane()
 {
 	InitializeComponent();
-
+
+	//create ad control
+	if (App::HasAds)
+	{
+		AdControl^ adControl = ref new AdControl();
+		LayoutRoot->Children->Append(adControl);
+		adControl->SetValue(Grid::RowProperty, 2);
+	}
 
 	if (IsROMLoaded())
 	{

Emulator.cpp

@@ -6,6 +6,7 @@
 #include <GBA.h>
 #include <Util.h>
 #include <SoundDriver.h>
+#include "App.xaml.h"
 
 
 using namespace Platform;
@@ -328,7 +329,7 @@ namespace VBA10
 		this->xboxElapsed += timeDelta;
 
 #ifndef NO_XBOX
-		if (xboxElapsed < 3600.0f)
+		if (xboxElapsed < 3600.0f || App::IsPremium)
 		{
 			this->p1Controller->Update();
 			this->HidInput->Update(true);

ExportPage.xaml

@@ -9,7 +9,7 @@
     mc:Ignorable="d"
     Loaded="Page_Loaded">
 
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    <Grid x:Name="LayoutRoot"  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
@@ -70,7 +70,6 @@
             </StackPanel>
         </ScrollViewer>
 
-        <local:AdControl Grid.Row="2">
-        </local:AdControl>
+
     </Grid>
 </Page>

ExportPage.xaml.cpp

@@ -9,6 +9,7 @@
 #include "SelectFilesPane.xaml.h"
 #include "Definitions.h"
 #include "ppltasks_extra.h"
+#include "AdControl.xaml.h"
 
 
 using namespace VBA10;
@@ -31,6 +32,14 @@ using namespace Windows::UI::Popups;
 ExportPage::ExportPage()
 {
 	InitializeComponent();
+
+	//create ad control
+	if (App::HasAds)
+	{
+		AdControl^ adControl = ref new AdControl();
+		LayoutRoot->Children->Append(adControl);
+		adControl->SetValue(Grid::RowProperty, 2);
+	}
 }
 
 

FileBrowserPane.xaml.cpp

@@ -7,6 +7,7 @@
 #include "FileBrowserPane.xaml.h"
 #include "App.xaml.h"
 #include "stringhelper.h"
+#include <algorithm>
 
 using namespace VBA10;
 
@@ -111,7 +112,7 @@ void FileBrowserPane::client_GetCompleted(web::json::value v)
 			//get extension
 			int index = name.find_last_of('.');
 			wstring ext = name.substr(index + 1);
-
+			transform(ext.begin(), ext.end(), ext.begin(), ::tolower);
 			a->Type = GetOneDriveItemType(ext);  //default, will change below
 		}
 
@@ -372,6 +373,7 @@ void FileBrowserPane::OnNavigatingFrom(Windows::UI::Xaml::Navigation::Navigating
 
 OneDriveItemType FileBrowserPane::GetOneDriveItemType(wstring ext)
 {
+
 	if (ext == L"zip" || ext == L"zib")
 	{
 		return OneDriveItemType::Zip;

HelpPage.xaml

@@ -8,7 +8,8 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+          x:Name="LayoutRoot">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
@@ -107,8 +108,7 @@
             </PivotItem>
         </Pivot>
 
-        <local:AdControl Grid.Row="2">
-        </local:AdControl>
+
 
     </Grid>
 </Page>

HelpPage.xaml.cpp

@@ -3,9 +3,11 @@
 // Implementation of the HelpPage class
 //
 
-
+#include "pch.h"
+#include "App.xaml.h"
 #include "HelpPage.xaml.h"
 #include <ppltasks.h>
+#include "AdControl.xaml.h"
 
 using namespace VBA10;
 
@@ -26,6 +28,14 @@ HelpPage::HelpPage()
 {
 	InitializeComponent();
 
+	//create ad control
+	if (App::HasAds)
+	{
+		AdControl^ adControl = ref new AdControl();
+		LayoutRoot->Children->Append(adControl);
+		adControl->SetValue(Grid::RowProperty, 2);
+	}
+
 	//get version
 	auto myPackage = Windows::ApplicationModel::Package::Current;
 	auto version = myPackage->Id->Version;

ImportPage.xaml

@@ -10,7 +10,8 @@
     Loaded="Page_Loaded"
     d:DesignWidth="320">
 
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+          x:Name="LayoutRoot">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
@@ -100,7 +101,6 @@
             </StackPanel>
         </ScrollViewer>
 
-        <local:AdControl Grid.Row="2">
-        </local:AdControl>
+
     </Grid>
 </Page>

ImportPage.xaml.cpp

@@ -10,6 +10,7 @@
 #include "SelectFilesPane.xaml.h"
 #include "App.xaml.h"
 #include "FileBrowserPane.xaml.h"
+#include "AdControl.xaml.h"
 
 #include "stringhelper.h"
 
@@ -40,6 +41,14 @@ using namespace Concurrency;
 ImportPage::ImportPage()
 {
 	InitializeComponent();
+
+	//create ad control
+	if (App::HasAds)
+	{
+		AdControl^ adControl = ref new AdControl();
+		LayoutRoot->Children->Append(adControl);
+		adControl->SetValue(Grid::RowProperty, 2);
+	}
 }
 
 

Package.appxmanifest

@@ -28,11 +28,6 @@
   </Applications>
   <Capabilities>
     <Capability Name="internetClient" />
-    <DeviceCapability Name="humaninterfacedevice">
-        <Device Id="any">
-          <Function Type="usage:0001 0004" /> <!--joy stick-->
-          <Function Type="usage:0001 0005" /> <!--gamepad-->
-        </Device>
-      </DeviceCapability>
+    <DeviceCapability Name="humaninterfacedevice" />
   </Capabilities>
 </Package>

PurchasePage.xaml

@@ -8,7 +8,8 @@
     mc:Ignorable="d"
     d:DesignWidth="280">
 
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+          x:Name="LayoutRoot">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
@@ -35,9 +36,25 @@
                            Margin="0,8,0,0"
                                   />-->
                 <TextBlock TextWrapping="Wrap"
-                           Text="The ability to purchase products will come in a future release. NOTE: there will be a way for paid users and users with unlock codes of VBA8, VBA8+ and VGBC8 to unlock VBA10 features without paying again. Stay tune!"                                
+                           Text="To VBA8, VBA8+ and VGBC8 users: if you have paid or have received unlocked codes for one of these apps, please go to the Purchase page of the respective app and follow instruction to get VBA10 unlock codes."                                
                                  Margin=" 0, 4, 0, 4" />
 
+                <TextBlock Text="Loading production list. Please wait..." 
+                       TextWrapping="Wrap"
+                       Margin="0,48,0,12"
+                           Visibility="Visible"
+                           x:Name="txtLoading"
+
+                       />
+
+                <TextBlock Text="Error! No Internet connection or Microsoft server error. Please try again later." 
+                       TextWrapping="Wrap"
+                       Margin="0,0,0,12"
+                           Foreground="Red"
+                           Visibility="Collapsed"
+                           x:Name="txtError"
+                       />
+
                 <!--<Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto"/>
@@ -103,7 +120,6 @@
             </StackPanel>
         </ScrollViewer>
 
-        <local:AdControl Grid.Row="2">
-        </local:AdControl>
+
     </Grid>
 </Page>