Added link in settings page to download latest version. next I am loo…

…king to add code to see if we have the latest version installed
NRCan · Nov 28, 2024 · 9ec0cba · 9ec0cba
1 parent c95d027
commit 9ec0cba
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 19 deletions.
diff --git a/GSCFieldApp/GSCFieldApp.csproj b/GSCFieldApp/GSCFieldApp.csproj
@@ -28,7 +28,7 @@
     <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
     <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
     <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
-    <PackageCertificateThumbprint>14CF0ECF911C8A37CF0E2EF4F8E06F25425B80C1</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>4B3837ADC7E39F5E6218C6F9261755C2F8E7F1AC</PackageCertificateThumbprint>
     <AppxPackageDir>C:\work data\datacollections\PublishedVersions\</AppxPackageDir>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppInstallerUpdateFrequency>100</AppInstallerUpdateFrequency>
@@ -150,6 +150,7 @@
     <Content Include="ModelResources\GSCFieldwork_v170.gpkg">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <None Include="GSCFieldApp_TemporaryKey.pfx" />
     <None Include="ModelResources\Readme.md" />
     <None Include="Models\Readme.md" />
     <None Include="project.json" />

diff --git a/GSCFieldApp/Package.appxmanifest b/GSCFieldApp/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:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"  xmlns:iot="http://schemas.microsoft.com/appx/manifest/iot/windows10" IgnorableNamespaces="uap mp uap3 iot">
-  <Identity Name="NaturalResourcesCanada.GeologicalSurveyCanadaField" Publisher="CN=Geological Survey of Canada, O=Natural Resources Canada, C=CA" Version="2.4.4.0" />
+  <Identity Name="NaturalResourcesCanada.GeologicalSurveyCanadaField" Publisher="CN=jjoseph" Version="2.4.4.0" />
   <mp:PhoneIdentity PhoneProductId="3ace0625-7c8e-483c-8b82-fd0128bbb63a" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>Geological Survey Canada Field Application</DisplayName>

diff --git a/GSCFieldApp/Resources/en-US/Resources.resw b/GSCFieldApp/Resources/en-US/Resources.resw
@@ -1897,7 +1897,7 @@ Shimamura, Kaz – Senior Advisor</value>
     <value>Check Update</value>
     <comment>Added By Jamel June 2024</comment>
   </data>
-  <data name="RepoLinkTextBlock.text" xml:space="preserve">
+  <data name="RepoLinkTextBlock.Text" xml:space="preserve">
     <value>Here</value>
     <comment>Added by Jamel June 2024</comment>
   </data>

diff --git a/GSCFieldApp/Views/SettingsPage.xaml b/GSCFieldApp/Views/SettingsPage.xaml
@@ -309,31 +309,44 @@
                                RelativePanel.AlignLeftWithPanel="True" TextWrapping="Wrap"
                                RelativePanel.Below="ContactTextBlock"
                                Text="" />
-                    
-                    <!--Project Info-->
+
+                    <!-- Project Info -->
                     <TextBlock x:Name="ProjectTextBlock" Margin="0,12,0,12" x:Uid="AboutProjectHeader"
-                               FontSize="22" RelativePanel.AlignLeftWithPanel="True"
-                               RelativePanel.Below="ContactInfoTextBlock"
-                               Text="" />
+                        FontSize="22" RelativePanel.AlignLeftWithPanel="True"
+                        RelativePanel.Below="ContactInfoTextBlock"
+                        Text="" />
+
                     <TextBlock x:Name="ProjectURLsTextBlock" 
-                               RelativePanel.AlignLeftWithPanel="True" 
-                               RelativePanel.Below="ProjectTextBlock" TextWrapping="Wrap">
-
-                        <Run x:Uid="AboutProjectGit"/><Hyperlink NavigateUri="https://nrcan.github.io/GSC-Field-Application/">
-                            <Run x:Uid="AboutProjectGitHyperlink"/>
+                        RelativePanel.AlignLeftWithPanel="True" 
+                        RelativePanel.Below="ProjectTextBlock" TextWrapping="Wrap">
+                        <Run x:Uid="AboutProjectGit" />
+                        <Hyperlink NavigateUri="https://nrcan.github.io/GSC-Field-Application/">
+                            <Run x:Uid="AboutProjectGitHyperlink" />
                         </Hyperlink>
-                        <Run x:Uid="AboutProjectGitHyperlinkEnd"/>
-                        <LineBreak/>
-                        <Run x:Uid="AboutProjectIssues"/><Hyperlink NavigateUri="https://github.com/NRCan/GSC-Field-Application/issues">
-                            <Run x:Uid="AboutProjectIssueHyperlink"/>
+                        <Run x:Uid="AboutProjectGitHyperlinkEnd" />
+                        <LineBreak />
+                        <Run x:Uid="AboutProjectIssues" />
+                        <Hyperlink NavigateUri="https://github.com/NRCan/GSC-Field-Application/issues">
+                            <Run x:Uid="AboutProjectIssueHyperlink" />
                         </Hyperlink>
-
+                        <Run x:Uid="AboutProjectGitHyperlinkEnd" />
                     </TextBlock>
 
+                    <TextBlock x:Name="DownloadLinkTextBlock" 
+                            RelativePanel.AlignLeftWithPanel="True" 
+                            RelativePanel.Below="ProjectURLsTextBlock" TextWrapping="Wrap">
+                        <Run x:Uid="DownloadLinkTextBlock" />
+                        <Hyperlink NavigateUri="https://github.com/NRCan/GSC-Field-Application/releases">
+                                <Run x:Uid="RepoLinkTextBlock" />
+                        </Hyperlink>
+                    </TextBlock>
+
+
+
                     <!--Team Info-->
                     <TextBlock x:Name="TeamTextBlock" Margin="0,12,0,12" x:Uid="AboutTeamHeader"
                                FontSize="22" RelativePanel.AlignLeftWithPanel="True"
-                               RelativePanel.Below="ProjectURLsTextBlock"
+                               RelativePanel.Below="DownloadLinkTextBlock"
                                Text="" />
 
                     <TextBlock x:Name="TeamInfoTextBlock" x:Uid="AboutTeamInfo"