Merge remote-tracking branch 'origin/dev-app'

NRCan · Jun 7, 2023 · f8f7b5b · f8f7b5b
2 parents 3c73068 + 74a039f
commit f8f7b5b
Show file tree

Hide file tree

Showing 17 changed files with 74 additions and 82 deletions.
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" IgnorableNamespaces="uap mp">
-  <Identity Name="NaturalResourcesCanada.GeologicalSurveyCanadaField" Publisher="CN=Geological Survey of Canada, O=Natural Resources Canada, C=CA" Version="2.3.13.0" />
+  <Identity Name="NaturalResourcesCanada.GeologicalSurveyCanadaField" Publisher="CN=Geological Survey of Canada, O=Natural Resources Canada, C=CA" Version="2.3.14.0" />
   <mp:PhoneIdentity PhoneProductId="06e90cbe-1a34-4205-8fe6-3ce0ad4467db" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>Geological Survey Canada Field Application</DisplayName>

diff --git a/GSCFieldApp/Styles/Custom.xaml b/GSCFieldApp/Styles/Custom.xaml
@@ -2019,7 +2019,6 @@
                 <Setter Property="IsRightTapEnabled" Value="False" />
                 <Setter Property="IsHoldingEnabled" Value="False" />
                 <Setter Property="IsDoubleTapEnabled" Value="False" />
-
             </Style>
 
 

diff --git a/GSCFieldApp/Views/DocumentDialog.xaml b/GSCFieldApp/Views/DocumentDialog.xaml
@@ -40,15 +40,15 @@
         <RelativePanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
 
-            <Controls:PageHeader x:Name="pageHeader" x:Uid="DocumentDialogHeader" Text ="" BackButtonVisibility="Collapsed" CommandBarOverflowPresenterStyle="{StaticResource CommandBarOverflowPresenterStyleDocumentPage}"
+            <Controls:PageHeader x:Name="pageHeader" x:Uid="DocumentDialogHeader" Text ="" BackButtonVisibility="Collapsed" 
+                                 CommandBarOverflowPresenterStyle="{StaticResource CommandBarOverflowPresenterStyleDocumentPage}"
                             RelativePanel.AlignLeftWithPanel="True" Background="{ThemeResource FieldPhotoColorBrush}"
-                            RelativePanel.AlignRightWithPanel="True"
-                            EllipsisVisibility="Collapsed" IsOpen="True" IsSticky="True" Height="40" DefaultLabelPosition="Right" >
+                            RelativePanel.AlignRightWithPanel="True" EllipsisVisibility="Visible" IsOpen="False" DefaultLabelPosition="Right">
                 <Controls:PageHeader.PrimaryCommands>
-                    <AppBarButton x:Name="documentPhotoButton" Icon="Camera" Label="Camera" Foreground="White" Width="100" Height="57" IsCompact ="True" Tapped="documentPhotoButton_Tapped" x:Uid="DocumentDialogSnapshot"/>
+                    <AppBarButton x:Name="documentPhotoButton" Icon="Camera" Label="Camera" Foreground="White" Tapped="documentPhotoButton_Tapped" x:Uid="DocumentDialogSnapshot"/>
                     <AppBarSeparator Foreground="White"/>
-                    <AppBarButton x:Name="documentBackButton" Icon="Clear" x:Uid="GenericCloseLabel" Label ="Close" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="documentBackButton_Tapped" />
-                    <AppBarButton x:Name="documentSaveButton" Icon="Save"  x:Uid="GenericSaveLabel" Label ="Save" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="documentSaveButton_Tapped" />
+                    <AppBarButton x:Name="documentBackButton" Icon="Clear" x:Uid="GenericCloseLabel" Label ="Close" Foreground="White" Tapped="documentBackButton_Tapped" />
+                    <AppBarButton x:Name="documentSaveButton" Icon="Save"  x:Uid="GenericSaveLabel" Label ="Save" Foreground="White" Tapped="documentSaveButton_Tapped" />
 
                 </Controls:PageHeader.PrimaryCommands>
                 <!--<Controls:PageHeader.SecondaryCommands/>-->

diff --git a/GSCFieldApp/Views/EarthmatDialog.xaml b/GSCFieldApp/Views/EarthmatDialog.xaml
@@ -44,10 +44,10 @@
                             RelativePanel.AlignLeftWithPanel="True" Background="{ThemeResource FieldEarthMatColorBrush}"
                             RelativePanel.AlignRightWithPanel="True"
                             RelativePanel.AlignTopWithPanel="True"  
-                            EllipsisVisibility="Collapsed" IsOpen="True" IsSticky="True" Height="40" DefaultLabelPosition="Right" >
+                            EllipsisVisibility="Visible" IsOpen="False" DefaultLabelPosition="Right" >
                 <Controls:PageHeader.PrimaryCommands>
-                    <AppBarButton x:Name="earthmatBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="earthmatBackButton_Tapped" />
-                    <AppBarButton x:Name="earthmatSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="earthmatSaveButton_Tapped" />
+                    <AppBarButton x:Name="earthmatBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White"  Tapped="earthmatBackButton_Tapped" />
+                    <AppBarButton x:Name="earthmatSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Tapped="earthmatSaveButton_Tapped" />
                 </Controls:PageHeader.PrimaryCommands>
                 <Controls:PageHeader.SecondaryCommands/>
             </Controls:PageHeader>

diff --git a/GSCFieldApp/Views/EnvironmentDialog.xaml b/GSCFieldApp/Views/EnvironmentDialog.xaml
@@ -34,10 +34,10 @@
                             RelativePanel.AlignLeftWithPanel="True" Background="{ThemeResource FieldEnvironmentColorBrush}"
                             RelativePanel.AlignRightWithPanel="True"
                             RelativePanel.AlignTopWithPanel="True"  
-                            EllipsisVisibility="Collapsed" IsOpen="True" IsSticky="True" Height="40" DefaultLabelPosition="Right">
+                            EllipsisVisibility="Visible" IsOpen="False" DefaultLabelPosition="Right">
                 <Controls:PageHeader.PrimaryCommands>
-                    <AppBarButton x:Name="envBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Height="57" IsCompact ="True" Foreground="White" Tapped="envBackButton_Tapped" Width="Auto"/>
-                    <AppBarButton x:Name="envSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Height="57" IsCompact ="True" Foreground="White" Tapped="envSaveButton_Tapped" Width="Auto"/>
+                    <AppBarButton x:Name="envBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Tapped="envBackButton_Tapped"/>
+                    <AppBarButton x:Name="envSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Tapped="envSaveButton_Tapped"/>
                 </Controls:PageHeader.PrimaryCommands>
 
             </Controls:PageHeader>

diff --git a/GSCFieldApp/Views/FieldBookDialog.xaml b/GSCFieldApp/Views/FieldBookDialog.xaml
@@ -17,11 +17,11 @@
                             RelativePanel.AlignLeftWithPanel="True" 
                             RelativePanel.AlignRightWithPanel="True"
                             RelativePanel.AlignTopWithPanel="True"  
-                            EllipsisVisibility="Collapsed" IsOpen="True" IsSticky="True" Height="40" DefaultLabelPosition="Right" >
+                            EllipsisVisibility="Visible" IsOpen="False" DefaultLabelPosition="Right">
 
                 <Controls:PageHeader.PrimaryCommands>
-                    <AppBarButton x:Name="userInfoCancelButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Width="Auto" Height="57" IsCompact ="True" Foreground="White" Tapped="userInfoCancelButton_TappedAsync" />
-                    <AppBarButton x:Name="userInfoSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Width="Auto" Height="57" IsCompact ="True" Foreground="White" Tapped="saveUserInfo_TappedAsync" />
+                    <AppBarButton x:Name="userInfoCancelButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Tapped="userInfoCancelButton_TappedAsync" />
+                    <AppBarButton x:Name="userInfoSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Tapped="saveUserInfo_TappedAsync" />
                 </Controls:PageHeader.PrimaryCommands>
 
             </Controls:PageHeader>

diff --git a/GSCFieldApp/Views/FieldBooksPage.xaml b/GSCFieldApp/Views/FieldBooksPage.xaml
@@ -108,35 +108,29 @@
 
         <!--  header  -->
         <controls:PageHeader x:Name="projectPageHeader" Content="" x:Uid="ProjectsPageHeader"
-                             Frame="{x:Bind Frame}"
-                             RelativePanel.AlignLeftWithPanel="True" EllipsisVisibility="Collapsed"
-                             RelativePanel.AlignRightWithPanel="True"
-                             RelativePanel.AlignTopWithPanel="True" IsOpen="True" IsSticky="True" Height="40" DefaultLabelPosition="Right">
+                             Frame="{x:Bind Frame}" EllipsisVisibility="Visible" 
+                             RelativePanel.AlignLeftWithPanel="True"
+                             RelativePanel.AlignRightWithPanel="True" BackButtonVisibility="Collapsed"
+                             RelativePanel.AlignTopWithPanel="True" IsOpen="False" DefaultLabelPosition="Bottom" IsSticky="True">
 
             <controls:PageHeader.PrimaryCommands>
-                <AppBarButton x:Name="projectAddButton" Icon="Add" Label="Add" Width="100" Height="56" IsCompact ="False" VerticalAlignment="Bottom" Foreground="White" Tapped="{x:Bind ViewModel.projectAddButton_Tapped}" x:Uid="ProjectAddButtonLabel"/>
-                <AppBarButton x:Name="projectOpenButton" Icon="Accept" Label="Accept" Width="100" Height="56" IsCompact ="True" VerticalAlignment="Bottom" Foreground="White" Tapped="{x:Bind ViewModel.projectOpenButton_Tapped}" x:Uid="ProjectOpenButtonLabel" IsEnabled="{x:Bind ViewModel.NoFieldBookWatermark, Mode=TwoWay, Converter={StaticResource ReverseBoolConverter}}"/>
-                <AppBarButton x:Name="projectEditButton" Icon="Edit" Label="Edit" Width="100" Height="56" IsCompact ="True" VerticalAlignment="Bottom" Foreground="White" Tapped="{x:Bind ViewModel.ProjectEditButton_Tapped}" x:Uid="ProjectEditButtonLabel" IsEnabled="{x:Bind ViewModel.NoFieldBookWatermark, Mode=TwoWay, Converter={StaticResource ReverseBoolConverter}}"/>
-                <AppBarButton x:Name="projectDeleteButton" Icon="Delete" Label="Delete" Width="100" Height="56" IsCompact ="True" VerticalAlignment="Bottom" Foreground="White" Tapped="{x:Bind ViewModel.ProjectDeleteButton_TappedAsync}" x:Uid="ProjectDeleteButtonLabel" IsEnabled="{x:Bind ViewModel.NoFieldBookWatermark, Mode=TwoWay, Converter={StaticResource ReverseBoolConverter}}"/>
+                <AppBarButton x:Name="projectAddButton"  Icon="Add" Label="Add" Foreground="White" Tapped="{x:Bind ViewModel.projectAddButton_Tapped}" x:Uid="ProjectAddButtonLabel"/>
+                <AppBarButton x:Name="projectOpenButton"  Icon="Accept" Label="Accept" Foreground="White" Tapped="{x:Bind ViewModel.projectOpenButton_Tapped}" x:Uid="ProjectOpenButtonLabel" IsEnabled="{x:Bind ViewModel.NoFieldBookWatermark, Mode=TwoWay, Converter={StaticResource ReverseBoolConverter}}"/>
+                <AppBarButton x:Name="projectEditButton"  Icon="Edit" Label="Edit" Foreground="White" Tapped="{x:Bind ViewModel.ProjectEditButton_Tapped}" x:Uid="ProjectEditButtonLabel" IsEnabled="{x:Bind ViewModel.NoFieldBookWatermark, Mode=TwoWay, Converter={StaticResource ReverseBoolConverter}}"/>
+                <AppBarButton x:Name="projectDeleteButton" Icon="Delete" Label="Delete" Foreground="White" Tapped="{x:Bind ViewModel.ProjectDeleteButton_TappedAsync}" x:Uid="ProjectDeleteButtonLabel" IsEnabled="{x:Bind ViewModel.NoFieldBookWatermark, Mode=TwoWay, Converter={StaticResource ReverseBoolConverter}}"/>
 
             </controls:PageHeader.PrimaryCommands>
-            <!--  comment out, will move from secondary to primary  
-            <controls:PageHeader.SecondaryCommands>
-                <AppBarButton x:Name="projectFullBackupButton" x:Uid="ProjectFullBackupButtonLabel" FontSize="14" ToolTipService.ToolTip="" Foreground="Black" Label="Full Backup" HorizontalContentAlignment="Right" Tapped="{x:Bind ViewModel.ProjectBackup_Tapped}" IsEnabled="{x:Bind ViewModel.NoFieldBookWatermark, Mode=TwoWay, Converter={StaticResource ReverseBoolConverter}}"/>
-                <AppBarButton x:Name="projectRestoreButton" x:Uid="ProjectRestoreButtonLabel"  FontSize="14" ToolTipService.ToolTip="" Foreground="Black" Label="Restore" HorizontalContentAlignment="Right" Tapped="{x:Bind ViewModel.ProjectRestore_Tapped}"/>
-                <AppBarButton x:Name="projectUpgradeButton" x:Uid="ProjectUpgradeButtonLabel"  FontSize="14" ToolTipService.ToolTip="" Foreground="Black" Label="Upgrade" HorizontalContentAlignment="Right" Tapped="{x:Bind ViewModel.ProjectUpgrade_Tapped}"/>
-            </controls:PageHeader.SecondaryCommands>
-            -->
+
         </controls:PageHeader>
 
-        <controls:PageHeader x:Name="pageFooter" RelativePanel.AlignLeftWithPanel="True" DefaultLabelPosition="Right"
-                             RelativePanel.AlignRightWithPanel="True" RelativePanel.AlignBottomWithPanel="True" EllipsisVisibility="Collapsed" IsSticky="False" Height="40">
+        <controls:PageHeader x:Name="pageFooter" RelativePanel.AlignLeftWithPanel="True" IsOpen="False" DefaultLabelPosition="Bottom"
+                             RelativePanel.AlignRightWithPanel="True" RelativePanel.AlignBottomWithPanel="True" EllipsisVisibility="Visible" IsSticky="True" >
 
             <controls:PageHeader.PrimaryCommands>
 
-                <AppBarButton x:Name="projectFullBackupButton" Icon="Download" MinWidth="160" Width="Auto" Height="60" IsCompact ="True" VerticalAlignment="Top" x:Uid="ProjectFullBackupButtonLabel" FontSize="14" ToolTipService.ToolTip="" Foreground="White" Label="Complete Backup" HorizontalContentAlignment="Right" Tapped="{x:Bind ViewModel.ProjectBackup_Tapped}" IsEnabled="{x:Bind ViewModel.NoFieldBookWatermark, Mode=TwoWay, Converter={StaticResource ReverseBoolConverter}}"/>
-                <AppBarButton x:Name="projectRestoreButton" Icon="Upload" MinWidth="100" Width="Auto" Height="60" IsCompact ="True" VerticalAlignment="Top" x:Uid="ProjectRestoreButtonLabel"  FontSize="14" ToolTipService.ToolTip="" Foreground="White" Label="Restore" HorizontalContentAlignment="Right" Tapped="{x:Bind ViewModel.ProjectRestore_Tapped}"/>
-                <AppBarButton x:Name="projectUpgradeButton" Icon="Refresh" MinWidth="100" Width="Auto" Height="60" IsCompact ="True" VerticalAlignment="Top" x:Uid="ProjectUpgradeButtonLabel"  FontSize="14" ToolTipService.ToolTip="" Foreground="White" Label="Upgrade" HorizontalContentAlignment="Right" Tapped="{x:Bind ViewModel.ProjectUpgrade_Tapped}"/>
+                <AppBarButton x:Name="projectFullBackupButton" Icon="Download" x:Uid="ProjectFullBackupButtonLabel"  ToolTipService.ToolTip="" Foreground="White" Label="Complete Backup" HorizontalContentAlignment="Right" Tapped="{x:Bind ViewModel.ProjectBackup_Tapped}" IsEnabled="{x:Bind ViewModel.NoFieldBookWatermark, Mode=TwoWay, Converter={StaticResource ReverseBoolConverter}}"/>
+                <AppBarButton x:Name="projectRestoreButton" Icon="Upload" x:Uid="ProjectRestoreButtonLabel"   ToolTipService.ToolTip="" Foreground="White" Label="Restore" HorizontalContentAlignment="Right" Tapped="{x:Bind ViewModel.ProjectRestore_Tapped}"/>
+                <AppBarButton x:Name="projectUpgradeButton" Icon="Refresh"  x:Uid="ProjectUpgradeButtonLabel"  ToolTipService.ToolTip="" Foreground="White" Label="Upgrade" HorizontalContentAlignment="Right" Tapped="{x:Bind ViewModel.ProjectUpgrade_Tapped}"/>
             </controls:PageHeader.PrimaryCommands>
 
 
@@ -147,7 +141,7 @@
 
         <!--  content  -->
         <GridView 
-            RelativePanel.Below="projectPageHeader"     
+            RelativePanel.Below="projectPageHeader"     RelativePanel.Above="pageFooter"
             RelativePanel.AlignLeftWithPanel="True"
             RelativePanel.AlignRightWithPanel="True" Margin="15" x:Name="ProjectList" Style="{StaticResource ReportPageGridView}"
                     IsSwipeEnabled="False" AllowDrop="False" ItemContainerStyle="{StaticResource ReportPageGridViewBookItems}"

diff --git a/GSCFieldApp/Views/FossilDialog.xaml b/GSCFieldApp/Views/FossilDialog.xaml
@@ -13,11 +13,11 @@
                             RelativePanel.AlignLeftWithPanel="True" 
                             RelativePanel.AlignRightWithPanel="True"
                             RelativePanel.AlignTopWithPanel="True"  
-                            EllipsisVisibility="Collapsed" IsOpen="True" IsSticky="True" Height="40" DefaultLabelPosition="Right"
+                            EllipsisVisibility="Visible" IsOpen="False" DefaultLabelPosition="Right"
                             Background="{ThemeResource FieldFossilColorBrush}">
                 <Controls:PageHeader.PrimaryCommands>
-                    <AppBarButton x:Name="fossilBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="fossilBackButton_Tapped" />
-                    <AppBarButton x:Name="fossilSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="fossilSaveButton_Tapped" />
+                    <AppBarButton x:Name="fossilBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Tapped="fossilBackButton_Tapped" />
+                    <AppBarButton x:Name="fossilSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Tapped="fossilSaveButton_Tapped" />
                 </Controls:PageHeader.PrimaryCommands>
                 <Controls:PageHeader.SecondaryCommands/>
             </Controls:PageHeader>

diff --git a/GSCFieldApp/Views/LocationDialog.xaml b/GSCFieldApp/Views/LocationDialog.xaml
@@ -22,10 +22,10 @@
                             RelativePanel.AlignLeftWithPanel="True" Background="{ThemeResource FieldObsColorBrush}"
                             RelativePanel.AlignRightWithPanel="True"
                             RelativePanel.AlignTopWithPanel="True"  
-                            EllipsisVisibility="Collapsed" IsOpen="True" IsSticky="True" Height="40" DefaultLabelPosition="Right" >
+                            EllipsisVisibility="Visible" IsOpen="False" DefaultLabelPosition="Right">
                 <Controls:PageHeader.PrimaryCommands>
-                    <AppBarButton x:Name="LocationBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="LocationBackButton_Tapped" />
-                    <AppBarButton x:Name="LocationSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Width="Auto" Height="57" IsCompact ="True" Tapped="LocationSaveButton_Tapped"  />
+                    <AppBarButton x:Name="LocationBackButton" x:Uid="GenericCloseLabel" Label="Close" Icon="Clear" Foreground="White" Tapped="LocationBackButton_Tapped" />
+                    <AppBarButton x:Name="LocationSaveButton" x:Uid="GenericSaveLabel" Label="Save" Icon="Save" Foreground="White" Tapped="LocationSaveButton_Tapped"  />
                 </Controls:PageHeader.PrimaryCommands>
                 <Controls:PageHeader.SecondaryCommands/>
             </Controls:PageHeader>