Interim Update

prs.mobile.new/PRS.Mobile.Droid/PRS.Mobile.Droid.csproj

@@ -54,7 +54,7 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Syncfusion.Xamarin.SfPopupLayout" Version="22.1.37" />
-        <PackageReference Include="Xamarin.Android.Support.v4" Version="25.4.0.2" />
+        <PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.3" />
         <PackageReference Include="Xamarin.Essentials" Version="1.7.7" />
         <PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
         <PackageReference Include="XF.Material" Version="1.8.0" />

prs.mobile.new/PRS.Mobile.Droid/Properties/AndroidManifest.xml

@@ -31,11 +31,7 @@
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.CAMERA" />
-<<<<<<< HEAD
 	<application android:label="PRS Site">
-=======
-	<application android:label="PRS.Mobile.Droid">
->>>>>>> 3da6b40a07e76f26c8ce57e034ded0bdaed14f32
 		<provider android:name="android.support.v4.content.FileProvider" android:authorities="${applicationId}.fileprovider" android:exported="false" android:grantUriPermissions="true">
 			<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"></meta-data>
 		</provider>

prs.mobile.new/PRS.Mobile.iOS/Info.plist

@@ -36,17 +36,25 @@
 	<string>Assets.xcassets/AppIcon.appiconset</string>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>NSCameraUsageDescription</key>
-	<string>This app needs access to the camera to take photos.</string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>This app needs access to microphone for taking videos.</string>
-	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>This app needs access to the photo gallery for picking photos and videos.</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>This app needs access to photos gallery for picking photos and videos.</string>
+	<key>NSBluetoothAlwaysUsageDescription</key>
+	<string>Bluetooth access is needed to locate equipment items</string>
 	<key>NSBluetoothPeripheralUsageDescription</key>
-	<string>This app needs access to Bluetooth to keep bluetooth trackers up to date</string>
+	<string>Bluetooth access is needed to locate equipment items</string>
+	<key>NSCalendarsUsageDescription</key>
+	<string>Needed for Job Allocation Screens</string>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>Location acccess is need to correctly clock on to job sites</string>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>Location acccess is need to correctly clock on to job sites</string>
+	<key>NSLocationUsageDescription</key>
+	<string>Location acccess is need to correctly clock on to job sites</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>This app needs access to Location to validate user inputs</string>
+	<string>Location acccess is need to correctly clock on to job sites</string>
+	<key>NSCameraUsageDescription</key>
+	<string>TimeBench needs camera access to take Delivery &amp; Requisition Photos</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>TimeBench needs access to your photo library for Delivery &amp; Requisition Photos</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>Needs microphone to record videos</string>
 </dict>
 </plist>