Merge commit 'b8b1bace580e053f678b4c63bb339a708741999b' into frank

# Conflicts:
#	prs.mobile.new/PRS.Mobile.Droid/PRS.Mobile.Droid.csproj
#	prs.mobile.new/PRS.Mobile.Droid/Properties/AndroidManifest.xml
#	prs.mobile.new/PRS.Mobile.iOS/Info.plist

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

@@ -23,7 +23,7 @@
         <DebugType>portable</DebugType>
         <Optimize>false</Optimize>
         <OutputPath>bin\Debug</OutputPath>
-        <DefineConstants>DEBUG</DefineConstants>
+        <DefineConstants>DEBUG;</DefineConstants>
         <ErrorReport>prompt</ErrorReport>
         <WarningLevel>4</WarningLevel>
         <AndroidLinkMode>None</AndroidLinkMode>
@@ -38,10 +38,8 @@
         <WarningLevel>4</WarningLevel>
         <AndroidManagedSymbols>true</AndroidManagedSymbols>
         <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
-        <AndroidSigningKeyStore>/Users/nicholastan/Downloads/development-2.cer</AndroidSigningKeyStore>
-        <AndroidSigningStorePass>Fr0g50ftw4r3</AndroidSigningStorePass>
         <AndroidPackageFormat>aab</AndroidPackageFormat>
-        <DefineConstants></DefineConstants>
+        <AndroidLinkMode>None</AndroidLinkMode>
     </PropertyGroup>
     <ItemGroup>
         <Reference Include="Mono.Android" />
@@ -101,29 +99,7 @@
         </ProjectReference>
     </ItemGroup>
     <ItemGroup>
-      <Content Include="drawable\mipmap-anydpi-v26\icon.xml" />
-      <AndroidResource Include="drawable\mipmap-hdpi\ic_launcher.png" />
-      <AndroidResource Include="drawable\mipmap-hdpi\ic_launcher_background.png" />
-      <AndroidResource Include="drawable\mipmap-hdpi\ic_launcher_foreground.png" />
-      <AndroidResource Include="drawable\mipmap-hdpi\ic_launcher_monochrome.png" />
-      <AndroidResource Include="drawable\mipmap-mdpi\ic_launcher.png" />
-      <AndroidResource Include="drawable\mipmap-mdpi\ic_launcher_background.png" />
-      <AndroidResource Include="drawable\mipmap-mdpi\ic_launcher_foreground.png" />
-      <AndroidResource Include="drawable\mipmap-mdpi\ic_launcher_monochrome.png" />
-      <AndroidResource Include="drawable\mipmap-xhdpi\ic_launcher.png" />
-      <AndroidResource Include="drawable\mipmap-xhdpi\ic_launcher_background.png" />
-      <AndroidResource Include="drawable\mipmap-xhdpi\ic_launcher_foreground.png" />
-      <AndroidResource Include="drawable\mipmap-xhdpi\ic_launcher_monochrome.png" />
-      <AndroidResource Include="drawable\mipmap-xxhdpi\ic_launcher.png" />
-      <AndroidResource Include="drawable\mipmap-xxhdpi\ic_launcher_background.png" />
-      <AndroidResource Include="drawable\mipmap-xxhdpi\ic_launcher_foreground.png" />
-      <AndroidResource Include="drawable\mipmap-xxhdpi\ic_launcher_monochrome.png" />
-      <AndroidResource Include="drawable\mipmap-xxxhdpi\ic_launcher.png" />
-      <AndroidResource Include="drawable\mipmap-xxxhdpi\ic_launcher_background.png" />
-      <AndroidResource Include="drawable\mipmap-xxxhdpi\ic_launcher_foreground.png" />
-      <AndroidResource Include="drawable\mipmap-xxxhdpi\ic_launcher_monochrome.png" />
-      <AndroidResource Include="drawable\logo.png" />
-      <AndroidResource Include="drawable\splash.png" />
+      <AndroidResource Include="drawable\puzzle.png" />
     </ItemGroup>
     <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
     <Import Project="..\..\..\inabox\InABox.Mobile\InABox.Mobile.Android\InABox.Mobile.Android.projitems" Label="Shared" />

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

@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="103100" android:versionName="1.03.1" package="comal.timesheets.Android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="102120" android:versionName="1.02.12" package="comal.timesheets.Android">
 	<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="33" />
 	<queries>
 		<intent>
 			<action android:name="android.media.action.IMAGE_CAPTURE" />
 		</intent>
-		<intent>
-			<action android:name="android.intent.action.SENDTO" />
-			<data android:scheme="mailto" />
-		</intent>
 	</queries>
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -35,12 +31,8 @@
 	<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" />
-	<application android:label="PRS Site App">
-		<provider 
-				android:name="android.support.v4.content.FileProvider" 
-				android:authorities="${applicationId}.fileprovider" 
-				android:exported="false" 
-				android:grantUriPermissions="true">
+	<application android:label="PRS Site App" android:icon="@drawable/puzzle">
+		<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>
 	</application>

prs.mobile.new/PRS.Mobile.Droid/Resources/Resource.designer.cs

@@ -44513,100 +44513,103 @@ namespace PRS.Mobile.Droid
 			public const int SignaturePadTopCorner = 2131165482;
 			
 			// aapt resource value: 0x7F07012B
-			public const int stock = 2131165483;
+			public const int splash = 2131165483;
 			
 			// aapt resource value: 0x7F07012C
-			public const int stock_issue = 2131165484;
+			public const int stock = 2131165484;
 			
 			// aapt resource value: 0x7F07012D
-			public const int stock_receive = 2131165485;
+			public const int stock_issue = 2131165485;
 			
 			// aapt resource value: 0x7F07012E
-			public const int stock_relocate = 2131165486;
+			public const int stock_receive = 2131165486;
 			
 			// aapt resource value: 0x7F07012F
-			public const int stock_search = 2131165487;
+			public const int stock_relocate = 2131165487;
 			
 			// aapt resource value: 0x7F070130
-			public const int stock_stocktake = 2131165488;
+			public const int stock_search = 2131165488;
 			
 			// aapt resource value: 0x7F070131
-			public const int stock_transfer = 2131165489;
+			public const int stock_stocktake = 2131165489;
 			
 			// aapt resource value: 0x7F070132
-			public const int task = 2131165490;
+			public const int stock_transfer = 2131165490;
 			
 			// aapt resource value: 0x7F070133
-			public const int test_custom_background = 2131165491;
+			public const int task = 2131165491;
 			
 			// aapt resource value: 0x7F070134
-			public const int text_color_button = 2131165492;
+			public const int test_custom_background = 2131165492;
 			
 			// aapt resource value: 0x7F070135
-			public const int tick = 2131165493;
+			public const int text_color_button = 2131165493;
 			
 			// aapt resource value: 0x7F070136
-			public const int toolbaritem_background = 2131165494;
+			public const int tick = 2131165494;
 			
 			// aapt resource value: 0x7F070137
-			public const int toolbaritem_pressed = 2131165495;
+			public const int toolbaritem_background = 2131165495;
 			
 			// aapt resource value: 0x7F070138
-			public const int tooltip_frame_dark = 2131165496;
+			public const int toolbaritem_pressed = 2131165496;
 			
 			// aapt resource value: 0x7F070139
-			public const int tooltip_frame_light = 2131165497;
+			public const int tooltip_frame_dark = 2131165497;
 			
 			// aapt resource value: 0x7F07013A
-			public const int trolley = 2131165498;
+			public const int tooltip_frame_light = 2131165498;
 			
 			// aapt resource value: 0x7F07013B
-			public const int @unchecked = 2131165499;
-			
-			// aapt resource value: 0x7F07013D
-			public const int undoButton = 2131165501;
+			public const int trolley = 2131165499;
 			
 			// aapt resource value: 0x7F07013C
-			public const int undo_redo_background = 2131165500;
+			public const int @unchecked = 2131165500;
 			
 			// aapt resource value: 0x7F07013E
-			public const int version = 2131165502;
+			public const int undoButton = 2131165502;
+			
+			// aapt resource value: 0x7F07013D
+			public const int undo_redo_background = 2131165501;
 			
 			// aapt resource value: 0x7F07013F
-			public const int Viewmode = 2131165503;
+			public const int version = 2131165503;
 			
 			// aapt resource value: 0x7F070140
-			public const int warehouse = 2131165504;
+			public const int Viewmode = 2131165504;
 			
 			// aapt resource value: 0x7F070141
-			public const int warning = 2131165505;
+			public const int warehouse = 2131165505;
 			
 			// aapt resource value: 0x7F070142
-			public const int xf_arrow_dropdown = 2131165506;
+			public const int warning = 2131165506;
 			
 			// aapt resource value: 0x7F070143
-			public const int xf_arrow_right = 2131165507;
+			public const int xf_arrow_dropdown = 2131165507;
 			
 			// aapt resource value: 0x7F070144
-			public const int xf_check = 2131165508;
+			public const int xf_arrow_right = 2131165508;
 			
 			// aapt resource value: 0x7F070145
-			public const int xf_checkbox_selected = 2131165509;
+			public const int xf_check = 2131165509;
 			
 			// aapt resource value: 0x7F070146
-			public const int xf_checkbox_unselected = 2131165510;
+			public const int xf_checkbox_selected = 2131165510;
 			
 			// aapt resource value: 0x7F070147
-			public const int xf_clear = 2131165511;
+			public const int xf_checkbox_unselected = 2131165511;
 			
 			// aapt resource value: 0x7F070148
-			public const int xf_error = 2131165512;
+			public const int xf_clear = 2131165512;
 			
 			// aapt resource value: 0x7F070149
-			public const int xf_radio_button_selected = 2131165513;
+			public const int xf_error = 2131165513;
 			
 			// aapt resource value: 0x7F07014A
-			public const int xf_radio_button_unselected = 2131165514;
+			public const int xf_radio_button_selected = 2131165514;
+			
+			// aapt resource value: 0x7F07014B
+			public const int xf_radio_button_unselected = 2131165515;
 			
 			static Drawable()
 			{

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

@@ -27,7 +27,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.prsdigital.prssiteapp</string>
 	<key>CFBundleVersion</key>
-	<string>1.03.1</string>
+	<string>1.02.13</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>CFBundleName</key>
@@ -42,6 +42,12 @@
 	<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>Location acccess is need to correctly clock on to job sites</string>
 	<key>NSCameraUsageDescription</key>
@@ -61,13 +67,5 @@
 			</array>
 		</dict>
 	</array>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>bluetooth-central</string>
-	</array>
-	<key>LSApplicationQueriesSchemes</key>
-	<array>
-		<string>mailto</string>
-	</array>
 </dict>
 </plist>