IsaacMorris1980 · IsaacMorris1980 · Aug 8, 2023 · Aug 8, 2023 · Aug 8, 2023
diff --git a/appLauncher.sln b/appLauncher.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 17.6.33815.320
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "appLauncher", "appLauncher\appLauncher.csproj", "{825249DF-2022-4222-96A1-69A32AA4E16C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleAnalyticsv4SDK", "..\GoogleAnalyticsv4SDKFor.Net\GoogleAnalyticsv4SDK\GoogleAnalyticsv4SDK.csproj", "{80207DE7-F5EF-4B47-9C81-E65DEA1D4832}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -51,26 +49,6 @@ Global
 		{825249DF-2022-4222-96A1-69A32AA4E16C}.Release|x86.ActiveCfg = Release|x86
 		{825249DF-2022-4222-96A1-69A32AA4E16C}.Release|x86.Build.0 = Release|x86
 		{825249DF-2022-4222-96A1-69A32AA4E16C}.Release|x86.Deploy.0 = Release|x86
-		{80207DE7-F5EF-4B47-9C81-E65DEA1D4832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{80207DE7-F5EF-4B47-9C81-E65DEA1D4832}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{80207DE7-F5EF-4B47-9C81-E65DEA1D4832}.Debug|ARM.ActiveCfg = Debug|ARM
-		{80207DE7-F5EF-4B47-9C81-E65DEA1D4832}.Debug|ARM.Build.0 = Debug|ARM
-		{80207DE7-F5EF-4B47-9C81-E65DEA1D4832}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{80207DE7-F5EF-4B47-9C81-E65DEA1D4832}.Debug|ARM64.Build.0 = Debug|ARM64
-		{80207DE7-F5EF-4B47-9C81-E65DEA1D4832}.Debug|x64.ActiveCfg = Debug|x64
-		{80207DE7-F5EF-4B47-9C81-E65DEA1D4832}.Debug|x64.Build.0 = Debug|x64
-		{80207DE7-F5EF-4B47-9C81-E65DEA1D4832}.Debug|x86.ActiveCfg = Debug|x86
-		{80207DE7-F5EF-4B47-9C81-E65DEA1D4832}.Debug|x86.Build.0 = Debug|x86
-		{80207DE7-F5EF-4B47-9C81-E65DEA1D4832}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{80207DE7-F5EF-4B47-9C81-E65DEA1D4832}.Release|Any CPU.Build.0 = Release|Any CPU
-		{80207DE7-F5EF-4B47-9C81-E65DEA1D4832}.Release|ARM.ActiveCfg = Release|ARM
-		{80207DE7-F5EF-4B47-9C81-E65DEA1D4832}.Release|ARM.Build.0 = Release|ARM
-		{80207DE7-F5EF-4B47-9C81-E65DEA1D4832}.Release|ARM64.ActiveCfg = Release|ARM64
-		{80207DE7-F5EF-4B47-9C81-E65DEA1D4832}.Release|ARM64.Build.0 = Release|ARM64
-		{80207DE7-F5EF-4B47-9C81-E65DEA1D4832}.Release|x64.ActiveCfg = Release|x64
-		{80207DE7-F5EF-4B47-9C81-E65DEA1D4832}.Release|x64.Build.0 = Release|x64
-		{80207DE7-F5EF-4B47-9C81-E65DEA1D4832}.Release|x86.ActiveCfg = Release|x86
-		{80207DE7-F5EF-4B47-9C81-E65DEA1D4832}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/appLauncher/App.xaml.cs b/appLauncher/App.xaml.cs
@@ -1,8 +1,6 @@
 using appLauncher.Core.Helpers;
 using appLauncher.Core.Pages;
 
-using GoogleAnalyticsv4SDK.Validation;
-
 using System;
 using System.Threading.Tasks;
 
@@ -28,8 +26,8 @@ namespace appLauncher
     sealed partial class App : Application
     {
         public static ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings;
-        public ExceptionEventCalls reportException;
-        public ScreenViewEventCalls reportScreenViews;
+        //public ExceptionEventCalls reportException;
+        //public ScreenViewEventCalls reportScreenViews;
 
         /// <summary>
         /// Initializes the singleton application object.  This is the first line of authored code
@@ -81,8 +79,8 @@ protected override async void OnLaunched(LaunchActivatedEventArgs e)
 
                 //Extends view into status bar/title bar, depending on the device used.
                 await SettingsHelper.LoadAppSettingsAsync();
-                reportScreenViews = new ScreenViewEventCalls(SettingsHelper.totalAppSettings.MeasurementID, SettingsHelper.totalAppSettings.APISecret, SettingsHelper.totalAppSettings.ClientID);
-                reportException = new ExceptionEventCalls(SettingsHelper.totalAppSettings.MeasurementID, SettingsHelper.totalAppSettings.APISecret, SettingsHelper.totalAppSettings.ClientID);
+                ////reportScreenViews = new ScreenViewEventCalls(SettingsHelper.totalAppSettings.MeasurementID, SettingsHelper.totalAppSettings.APISecret, SettingsHelper.totalAppSettings.ClientID);
+                ////reportException = new ExceptionEventCalls(SettingsHelper.totalAppSettings.MeasurementID, SettingsHelper.totalAppSettings.APISecret, SettingsHelper.totalAppSettings.ClientID);
                 ApplicationView appView = ApplicationView.GetForCurrentView();
                 appView.SetPreferredMinSize(new Size(360, 360));
                 appView.SetDesiredBoundsMode(ApplicationViewBoundsMode.UseCoreWindow);

diff --git a/appLauncher/Core/Helpers/imageHelper.cs b/appLauncher/Core/Helpers/imageHelper.cs
@@ -18,7 +18,6 @@
 using Windows.System.Threading;
 using Windows.UI;
 using Windows.UI.Core;
-using Windows.UI.Xaml;
 using Windows.UI.Xaml.Media;
 
 namespace appLauncher.Core.Helpers
@@ -84,7 +83,7 @@ public static async Task<List<PageBackgrounds>> LoadBackgroundImages()
                 {
                     if (SettingsHelper.totalAppSettings.Reporting)
                     {
-                        await ((App)Application.Current).reportException.CollectException(es);
+                        //           await ((App)Application.Current).reportException.CollectException(es);
                     }
                 }
 
@@ -114,7 +113,7 @@ public static async Task SaveImageOrder()
             {
                 if (SettingsHelper.totalAppSettings.Reporting)
                 {
-                    await ((App)Application.Current).reportException.CollectException(es);
+                    //       await ((App)Application.Current).reportException.CollectException(es);
                 }
             }
         }

diff --git a/appLauncher/Core/Helpers/packageHelper.cs b/appLauncher/Core/Helpers/packageHelper.cs
@@ -14,7 +14,6 @@
 using Windows.Management.Deployment;
 using Windows.Storage;
 using Windows.Storage.Streams;
-using Windows.UI.Xaml;
 
 namespace appLauncher.Core.Helpers
 {
@@ -58,7 +57,7 @@ public static async Task LoadCollectionAsync()
                 {
                     if (SettingsHelper.totalAppSettings.Reporting)
                     {
-                        await ((App)Application.Current).reportException.CollectException(es);
+                        //                 await ((App)Application.Current).reportException.CollectException(es);
                     }
                 }
             }
@@ -95,7 +94,7 @@ public static async Task LoadCollectionAsync()
                                     });
                                     if (SettingsHelper.totalAppSettings.Reporting)
                                     {
-                                        await ((App)Application.Current).reportException.CollectException(es);
+                                        //                        await ((App)Application.Current).reportException.CollectException(es);
                                     }
                                     es = null;
                                     continue;
@@ -132,7 +131,7 @@ public static async Task LoadCollectionAsync()
                                 });
                                 if (SettingsHelper.totalAppSettings.Reporting)
                                 {
-                                    await ((App)Application.Current).reportException.CollectException(es);
+                                    //                await ((App)Application.Current).reportException.CollectException(es);
                                 }
                                 es = null;
                                 continue;
@@ -143,7 +142,7 @@ public static async Task LoadCollectionAsync()
                     {
                         if (SettingsHelper.totalAppSettings.Reporting)
                         {
-                            await ((App)Application.Current).reportException.CollectException(es);
+                            //        await ((App)Application.Current).reportException.CollectException(es);
                         }
                     }
                 }
@@ -165,7 +164,7 @@ public static async Task SaveCollectionAsync()
             {
                 if (SettingsHelper.totalAppSettings.Reporting)
                 {
-                    await ((App)Application.Current).reportException.CollectException(es);
+                    //        await ((App)Application.Current).reportException.CollectException(es);
                 }
             }
         }
@@ -240,7 +239,7 @@ public static async Task RescanForNewApplications()
                             });
                             if (SettingsHelper.totalAppSettings.Reporting)
                             {
-                                await ((App)Application.Current).reportException.CollectException(es);
+                                //       await ((App)Application.Current).reportException.CollectException(es);
                             }
                             es = null;
                             continue;
@@ -251,7 +250,7 @@ public static async Task RescanForNewApplications()
                 {
                     if (SettingsHelper.totalAppSettings.Reporting)
                     {
-                        await ((App)Application.Current).reportException.CollectException(es);
+                        //          await ((App)Application.Current).reportException.CollectException(es);
                     }
 
                 }

diff --git a/appLauncher/Core/Helpers/settingsHelper.cs b/appLauncher/Core/Helpers/settingsHelper.cs
@@ -47,7 +47,7 @@ public static async Task LoadAppSettingsAsync()
                 {
                     if (SettingsHelper.totalAppSettings.Reporting)
                     {
-                        await ((App)Application.Current).reportException.CollectException(es);
+                        //await ((App)Application.Current).reportException.CollectException(es);
                     }
                 }
             }
@@ -69,7 +69,7 @@ public static async Task SaveAppSettingsAsync()
             {
                 if (SettingsHelper.totalAppSettings.Reporting)
                 {
-                    await ((App)Application.Current).reportException.CollectException(es);
+                    //    await ((App)Application.Current).reportException.CollectException(es);
                 }
             }
         }

diff --git a/appLauncher/Core/Model/GlobalAppSettings.cs b/appLauncher/Core/Model/GlobalAppSettings.cs
@@ -69,7 +69,7 @@ public GlobalAppSettings()
             Package pack = Package.Current;
             PackageVersion version = new PackageVersion();
             version = pack.Id.Version;
-            _appVersion = string.Format("{0}.{1}.{2}.{3}", version.Major, version.Minor, version.Build, version.Revision);
+            _appVersion = string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.Build);
 
         }
         public bool Search

diff --git a/appLauncher/Core/Pages/AboutPage.xaml b/appLauncher/Core/Pages/AboutPage.xaml
@@ -29,10 +29,10 @@
         </RelativePanel>
         <Grid Grid.Row="1">
             <StackPanel Orientation="Vertical" Background="Transparent" >
-                    <TextBox Background="Transparent" BorderThickness="0" Foreground="{x:Bind helper:SettingsHelper.totalAppSettings.AppForegroundColorBrush}" HorizontalAlignment="Center" IsReadOnly="True" Text="Original Maintainer:  Colin Kiama" />
-                    <TextBox Background="Transparent" Foreground="{x:Bind helper:SettingsHelper.totalAppSettings.AppForegroundColorBrush}" BorderThickness="0" HorizontalAlignment="Center" IsReadOnly="True"  Text="Current Maintainer:  Isaac Morris" />
-                    <HyperlinkButton Background="Transparent" Foreground="{x:Bind helper:SettingsHelper.totalAppSettings.AppForegroundColorBrush}" HorizontalAlignment="Center" Content="Source" NavigateUri="https://github.com/IsaacMorris1980/appLauncher" />
-                <HyperlinkButton Background="Transparent" Foreground="{x:Bind helper:SettingsHelper.totalAppSettings.AppForegroundColorBrush}" HorizontalAlignment="Center" Content="Report Issue" NavigateUri="https://github.com/IsaacMorris1980/appLauncher/issues" />
+                <HyperlinkButton Background="Transparent" BorderThickness="0" Foreground="{x:Bind helper:SettingsHelper.totalAppSettings.AppForegroundColorBrush}" HorizontalAlignment="Center" Content="Original Maintainer:  Colin Kiama" NavigateUri="https://github.com/colinkiama" />
+                <HyperlinkButton Background="Transparent" Foreground="{x:Bind helper:SettingsHelper.totalAppSettings.AppForegroundColorBrush}" BorderThickness="0" HorizontalAlignment="Center"  Content="Current Maintainer:  Isaac Morris" NavigateUri="https://github.com/IsaacMorris1980" />
+                <HyperlinkButton Background="Transparent" Foreground="{x:Bind helper:SettingsHelper.totalAppSettings.AppForegroundColorBrush}" HorizontalAlignment="Center" Content="Source" NavigateUri="https://github.com/IsaacMorris1980/appLauncher/tree/Testing" />
+                    <HyperlinkButton Background="Transparent" Foreground="{x:Bind helper:SettingsHelper.totalAppSettings.AppForegroundColorBrush}" HorizontalAlignment="Center" Content="Report Issue" NavigateUri="https://github.com/IsaacMorris1980/appLauncher/issues" />
                 <TextBox BorderThickness="0" Background="Transparent" Foreground="{x:Bind helper:SettingsHelper.totalAppSettings.AppForegroundColorBrush}" HorizontalAlignment="Center"  IsReadOnly="True" Text="{x:Bind appversion}" />
             </StackPanel>
         </Grid>

diff --git a/appLauncher/Core/Pages/AboutPage.xaml.cs b/appLauncher/Core/Pages/AboutPage.xaml.cs
@@ -1,6 +1,5 @@
 using appLauncher.Core.Helpers;
 
-using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Input;
 
@@ -24,7 +23,7 @@ private async void AboutPage_Loaded(object sender, Windows.UI.Xaml.RoutedEventAr
         {
             if (SettingsHelper.totalAppSettings.Reporting)
             {
-                await ((App)Application.Current).reportScreenViews.CollectScreenViews("About");
+                //     await ((App)Application.Current).reportScreenViews.CollectScreenViews("About");
             }
 
         }

diff --git a/appLauncher/Core/Pages/MainPage.xaml.cs b/appLauncher/Core/Pages/MainPage.xaml.cs
@@ -66,7 +66,7 @@ public MainPage()
             }
             catch (Exception es)
             {
-                ((App)Application.Current).reportException.CollectException(es).ConfigureAwait(false);
+                //       ((App)Application.Current).reportException.CollectException(es).ConfigureAwait(false);
             }
 
         }
@@ -141,7 +141,7 @@ private async void SizeChangeTimer_Tick(object sender, object e)
             {
                 if (SettingsHelper.totalAppSettings.Reporting)
                 {
-                    await ((App)Application.Current).reportException.CollectException(es);
+                    //      await ((App)Application.Current).reportException.CollectException(es);
                 }
             }
 
@@ -264,7 +264,7 @@ await Dispatcher.RunAsync(CoreDispatcherPriority.High,
                       , SettingsHelper.totalAppSettings.ImageRotationTime);
             if (SettingsHelper.totalAppSettings.Reporting)
             {
-                await ((App)Application.Current).reportScreenViews.CollectScreenViews("Main");
+                //      await ((App)Application.Current).reportScreenViews.CollectScreenViews("Main");
             }
         }
         private async void disableScrollViewer(GridView gridView)
@@ -281,7 +281,7 @@ private async void disableScrollViewer(GridView gridView)
             {
                 if (SettingsHelper.totalAppSettings.Reporting)
                 {
-                    await ((App)Application.Current).reportException.CollectException(es);
+                    //        await ((App)Application.Current).reportException.CollectException(es);
                 }
             }
         }

diff --git a/appLauncher/Core/Pages/SettingsPage.xaml.cs b/appLauncher/Core/Pages/SettingsPage.xaml.cs
@@ -198,7 +198,7 @@ private async void Page_Loaded(object sender, RoutedEventArgs e)
         {
             if (SettingsHelper.totalAppSettings.Reporting)
             {
-                await ((App)Application.Current).reportScreenViews.CollectScreenViews("Settings");
+                //         await ((App)Application.Current).reportScreenViews.CollectScreenViews("Settings");
             }
 
         }

diff --git a/appLauncher/Core/Pages/splashScreen.xaml.cs b/appLauncher/Core/Pages/splashScreen.xaml.cs
@@ -55,7 +55,7 @@ private async void SplashScreen_Loaded(object sender, RoutedEventArgs e)
         {
             if (SettingsHelper.totalAppSettings.Reporting)
             {
-                await ((App)Application.Current).reportScreenViews.CollectScreenViews("Splash Screen");
+                //     await ((App)Application.Current).reportScreenViews.CollectScreenViews("Splash Screen");
             }
         }
 

diff --git a/appLauncher/Package.appxmanifest b/appLauncher/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:iot="http://schemas.microsoft.com/appx/manifest/iot/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap mp iot rescap">
-  <Identity Name="c7a9e123-47c7-47c2-9040-99dcd4ac7351" Publisher="CN=morri" Version="2.2.1.0" />
+  <Identity Name="c7a9e123-47c7-47c2-9040-99dcd4ac7351" Publisher="CN=morri" Version="2.2.3.0" />
   <mp:PhoneIdentity PhoneProductId="c7a9e123-47c7-47c2-9040-99dcd4ac7351" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>appLauncher</DisplayName>

diff --git a/appLauncher/appLauncher.csproj b/appLauncher/appLauncher.csproj
@@ -230,10 +230,10 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\GoogleAnalyticsv4SDKFor.Net\GoogleAnalyticsv4SDK\GoogleAnalyticsv4SDK.csproj">
-      <Project>{80207de7-f5ef-4b47-9c81-e65dea1d4832}</Project>
-      <Name>GoogleAnalyticsv4SDK</Name>
-    </ProjectReference>
+    <Reference Include="GoogleAnalyticsv4SDK, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\GoogleAnalyticsv4SDKForUWP\GoogleAnalyticsv4SDK\bin\Release\GoogleAnalyticsv4SDK.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>