Parcourir la source

PRS MOBILE - version 4.40.4

Nick-PRSDigital@bitbucket.org il y a 2 ans
Parent
commit
cfc83c110e

+ 1 - 1
prs.mobile/comal.timesheets.Android/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="440300" android:versionName="4.40.3" package="au.com.frogsoftware.timesheets.comal_timesheets" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="440400" android:versionName="4.40.4" package="au.com.frogsoftware.timesheets.comal_timesheets" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

+ 2 - 1
prs.mobile/comal.timesheets.Android/Resources/Resource.designer.cs

@@ -2,6 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -14,7 +15,7 @@ namespace comal.timesheets.Droid
 {
 	
 	
-	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.0.0.73")]
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.93")]
 	public partial class Resource
 	{
 		

+ 2 - 2
prs.mobile/comal.timesheets.iOS/Info.plist

@@ -9,9 +9,9 @@
 	<key>CFBundleName</key>
 	<string>TimeBench</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.40.3</string>
+	<string>4.40.4</string>
 	<key>CFBundleVersion</key>
-	<string>4.40.3</string>
+	<string>4.40.4</string>
 	<key>NSBluetoothAlwaysUsageDescription</key>
 	<string>Bluetooth access is needed to locate equipment items</string>
 	<key>NSBluetoothPeripheralUsageDescription</key>

+ 0 - 1
prs.mobile/comal.timesheets/Assignments/DataModels/AssignmentListDataModel.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using Comal.Classes;
 using InABox.Core;
 using Xamarin.Forms;
-using static Android.InputMethodServices.Keyboard;
 
 namespace comal.timesheets
 {

+ 2 - 2
prs.mobile/comal.timesheets/CustomControls/Pages/PDFList.xaml.cs

@@ -12,7 +12,7 @@ using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 using XF.Material.Forms.UI.Dialogs;
 using Document = InABox.Core.Document;
-
+using PRSSecurity = InABox.Core.Security;
 
 namespace comal.timesheets
 {
@@ -225,7 +225,7 @@ namespace comal.timesheets
             shell.FileName = shell.FileName.ToLower();
             if (shell.FileName.EndsWith("pdf"))
             {
-                if (Device.RuntimePlatform.Equals(Device.Android) && Security.IsAllowed<CanOpenMobileNativePDFViewer>())
+                if (Device.RuntimePlatform.Equals(Device.Android) && PRSSecurity.IsAllowed<CanOpenMobileNativePDFViewer>())
                     OpenNativeViewer(shell);
                 else
                 {

+ 2 - 1
prs.mobile/comal.timesheets/CustomControls/Pages/PDFViewer.xaml.cs

@@ -11,6 +11,7 @@ using Xamarin.Essentials;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 using XF.Material.Forms.UI.Dialogs;
+using PRSSecurity = InABox.Core.Security;
 
 namespace comal.timesheets
 {
@@ -80,7 +81,7 @@ namespace comal.timesheets
                         if (doc.FileName.EndsWith("pdf") || doc.FileName.EndsWith("pdf") || doc.FileName.EndsWith("pdf"))
                         {
                             byte[] data = table2.Rows.First().Get<Document, byte[]>(x => x.Data);
-                            if (Device.RuntimePlatform.Equals(Device.Android) && Security.IsAllowed<CanOpenMobileNativePDFViewer>())
+                            if (Device.RuntimePlatform.Equals(Device.Android) && PRSSecurity.IsAllowed<CanOpenMobileNativePDFViewer>())
                                 OpenNativeViewer(doc.FileName, data);
                             else
                                 ShowPDF(data);

+ 3 - 3
prs.mobile/comal.timesheets/Data Classes/NotifyChanges.cs

@@ -17,9 +17,9 @@ namespace comal.timesheets
             string latestChanges = "";
             List<string> changes = new List<string>
                 {
-                "- Bug fixes to Stock Control functions",
-                "- Bug fix open digital form from Task not working",
-                "- View delivery from Notifications"
+                "- Update to assignments (use actual/booked)",
+                "- Improve digital form viewing from tasks",
+                "- Improve PDF viewer for Androids"
                 };
             foreach (string s in changes)
             {

+ 2 - 1
prs.mobile/comal.timesheets/Site/JobDocViewer.xaml.cs

@@ -18,6 +18,7 @@ using Xamarin.Essentials;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 using XF.Material.Forms.UI.Dialogs;
+using PRSSecurity = InABox.Core.Security;
 
 namespace comal.timesheets
 {
@@ -397,7 +398,7 @@ namespace comal.timesheets
         void List_Tapped(object sender, EventArgs e)
         {
             var shell = listView.SelectedItem as JobDocSetFileShell;
-            if (Device.RuntimePlatform.Equals(Device.Android) && Security.IsAllowed<CanOpenMobileNativePDFViewer>())
+            if (Device.RuntimePlatform.Equals(Device.Android) && PRSSecurity.IsAllowed<CanOpenMobileNativePDFViewer>())
                 OpenNativeViewer(shell.DocLinkID);
             else
             {