Browse Source

Merge commit '188e64ec455e673b9e73fd9fcd02b895e8ce2e52' into Rpc

# 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/comal.timesheets.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
Frank van den Bos 2 years ago
parent
commit
e3ce813e1b

+ 13 - 3
prs.mobile.new/PRS.Mobile.Droid/PRS.Mobile.Droid.csproj

@@ -25,9 +25,15 @@
         <DefineConstants>DEBUG;</DefineConstants>
         <ErrorReport>prompt</ErrorReport>
         <WarningLevel>4</WarningLevel>
+        <AndroidSupportedAbis>armeabi-v7a;arm64-v8a;x86_64</AndroidSupportedAbis>
+        <AndroidPackageFormat>apk</AndroidPackageFormat>
+        <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
         <AndroidLinkMode>None</AndroidLinkMode>
+<<<<<<< HEAD
+=======
         <AndroidSupportedAbis>armeabi-v7a;arm64-v8a</AndroidSupportedAbis>
         <AndroidUseAapt2>true</AndroidUseAapt2>
+>>>>>>> 3da6b40a07e76f26c8ce57e034ded0bdaed14f32
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
         <DebugSymbols>true</DebugSymbols>
@@ -54,7 +60,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" />
@@ -83,14 +89,18 @@
           <Name>InABox.Core</Name>
         </ProjectReference>
         <ProjectReference Include="..\..\..\inabox\InABox.Mobile\InABox.Mobile.Shared\InABox.Mobile.Shared.csproj">
-          <Project>{d7d34a5b-4aef-4aca-9867-9803556f0b07}</Project>
+          <Project>{C4F5BF06-CAB8-47CF-8B0A-FF3406081781}</Project>
           <Name>InABox.Mobile.Shared</Name>
         </ProjectReference>
         <ProjectReference Include="..\PRS.Mobile\PRS.Mobile.csproj">
             <Project>{2E807D8C-659F-464D-89FE-3889019BE8EA}</Project>
             <Name>PRS.Mobile</Name>
         </ProjectReference>
+        <ProjectReference Include="..\..\..\3rdpartylibs\pdfium-android\PdfiumAndroid\PdfiumAndroid\PdfiumAndroid.csproj">
+          <Project>{63845795-416F-4848-9DC1-63E992803D29}</Project>
+          <Name>PdfiumAndroid</Name>
+        </ProjectReference>
     </ItemGroup>
+    <Import Project="..\..\..\inabox\InABox.Mobile\InABox.Mobile.Android\InABox.Mobile.Android.projitems" Label="Shared" Condition="Exists('..\..\..\inabox\InABox.Mobile\InABox.Mobile.Android\InABox.Mobile.Android.projitems')" />
     <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-    <Import Project="..\..\..\inabox\InABox.Mobile\InABox.Mobile.Android\InABox.Mobile.Android.projitems" Label="Shared" />
 </Project>

+ 9 - 0
prs.mobile.new/PRS.Mobile.Droid/Properties/AndroidManifest.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="101300" android:versionName="1.01.3" package="comal.timesheets.android">
+	<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="30" />
+=======
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.PRS.Mobile">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
+>>>>>>> 3da6b40a07e76f26c8ce57e034ded0bdaed14f32
 	<queries>
 		<intent>
 			<action android:name="android.media.action.IMAGE_CAPTURE" />
@@ -31,7 +36,11 @@
 	<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>

+ 193 - 244
prs.mobile.new/PRS.Mobile.Droid/Resources/Resource.designer.cs

@@ -43883,607 +43883,556 @@ namespace PRS.Mobile.Droid
 			public const int arrow_up = 2131165272;
 			
 			// aapt resource value: 0x7F070059
-			public const int arrow_white_down = 2131165273;
+			public const int Avatar1 = 2131165273;
 			
 			// aapt resource value: 0x7F07005A
-			public const int arrow_white_left = 2131165274;
+			public const int Avatar10 = 2131165274;
 			
 			// aapt resource value: 0x7F07005B
-			public const int arrow_white_right = 2131165275;
+			public const int Avatar11 = 2131165275;
 			
 			// aapt resource value: 0x7F07005C
-			public const int arrow_white_up = 2131165276;
+			public const int Avatar12 = 2131165276;
 			
 			// aapt resource value: 0x7F07005D
-			public const int Avatar1 = 2131165277;
+			public const int Avatar13 = 2131165277;
 			
 			// aapt resource value: 0x7F07005E
-			public const int Avatar10 = 2131165278;
+			public const int Avatar14 = 2131165278;
 			
 			// aapt resource value: 0x7F07005F
-			public const int Avatar11 = 2131165279;
+			public const int Avatar15 = 2131165279;
 			
 			// aapt resource value: 0x7F070060
-			public const int Avatar12 = 2131165280;
+			public const int Avatar16 = 2131165280;
 			
 			// aapt resource value: 0x7F070061
-			public const int Avatar13 = 2131165281;
+			public const int Avatar17 = 2131165281;
 			
 			// aapt resource value: 0x7F070062
-			public const int Avatar14 = 2131165282;
+			public const int Avatar18 = 2131165282;
 			
 			// aapt resource value: 0x7F070063
-			public const int Avatar15 = 2131165283;
+			public const int Avatar19 = 2131165283;
 			
 			// aapt resource value: 0x7F070064
-			public const int Avatar16 = 2131165284;
+			public const int Avatar2 = 2131165284;
 			
 			// aapt resource value: 0x7F070065
-			public const int Avatar17 = 2131165285;
+			public const int Avatar20 = 2131165285;
 			
 			// aapt resource value: 0x7F070066
-			public const int Avatar18 = 2131165286;
+			public const int Avatar21 = 2131165286;
 			
 			// aapt resource value: 0x7F070067
-			public const int Avatar19 = 2131165287;
+			public const int Avatar22 = 2131165287;
 			
 			// aapt resource value: 0x7F070068
-			public const int Avatar2 = 2131165288;
+			public const int Avatar23 = 2131165288;
 			
 			// aapt resource value: 0x7F070069
-			public const int Avatar20 = 2131165289;
+			public const int Avatar24 = 2131165289;
 			
 			// aapt resource value: 0x7F07006A
-			public const int Avatar21 = 2131165290;
+			public const int Avatar25 = 2131165290;
 			
 			// aapt resource value: 0x7F07006B
-			public const int Avatar22 = 2131165291;
+			public const int Avatar26 = 2131165291;
 			
 			// aapt resource value: 0x7F07006C
-			public const int Avatar23 = 2131165292;
+			public const int Avatar27 = 2131165292;
 			
 			// aapt resource value: 0x7F07006D
-			public const int Avatar24 = 2131165293;
+			public const int Avatar28 = 2131165293;
 			
 			// aapt resource value: 0x7F07006E
-			public const int Avatar25 = 2131165294;
+			public const int Avatar29 = 2131165294;
 			
 			// aapt resource value: 0x7F07006F
-			public const int Avatar26 = 2131165295;
+			public const int Avatar3 = 2131165295;
 			
 			// aapt resource value: 0x7F070070
-			public const int Avatar27 = 2131165296;
+			public const int Avatar30 = 2131165296;
 			
 			// aapt resource value: 0x7F070071
-			public const int Avatar28 = 2131165297;
+			public const int Avatar4 = 2131165297;
 			
 			// aapt resource value: 0x7F070072
-			public const int Avatar29 = 2131165298;
+			public const int Avatar5 = 2131165298;
 			
 			// aapt resource value: 0x7F070073
-			public const int Avatar3 = 2131165299;
+			public const int Avatar6 = 2131165299;
 			
 			// aapt resource value: 0x7F070074
-			public const int Avatar30 = 2131165300;
+			public const int Avatar7 = 2131165300;
 			
 			// aapt resource value: 0x7F070075
-			public const int Avatar4 = 2131165301;
+			public const int Avatar8 = 2131165301;
 			
 			// aapt resource value: 0x7F070076
-			public const int Avatar5 = 2131165302;
+			public const int Avatar9 = 2131165302;
 			
 			// aapt resource value: 0x7F070077
-			public const int Avatar6 = 2131165303;
+			public const int avd_hide_password = 2131165303;
 			
 			// aapt resource value: 0x7F070078
-			public const int Avatar7 = 2131165304;
+			public const int avd_show_password = 2131165304;
 			
 			// aapt resource value: 0x7F070079
-			public const int Avatar8 = 2131165305;
+			public const int Bookmark = 2131165305;
 			
 			// aapt resource value: 0x7F07007A
-			public const int Avatar9 = 2131165306;
+			public const int border_layout = 2131165306;
 			
 			// aapt resource value: 0x7F07007B
-			public const int avd_hide_password = 2131165307;
+			public const int btn_checkbox_checked_mtrl = 2131165307;
 			
 			// aapt resource value: 0x7F07007C
-			public const int avd_show_password = 2131165308;
+			public const int btn_checkbox_checked_to_unchecked_mtrl_animation = 2131165308;
 			
 			// aapt resource value: 0x7F07007D
-			public const int badge = 2131165309;
+			public const int btn_checkbox_unchecked_mtrl = 2131165309;
 			
 			// aapt resource value: 0x7F07007E
-			public const int Bookmark = 2131165310;
+			public const int btn_checkbox_unchecked_to_checked_mtrl_animation = 2131165310;
 			
 			// aapt resource value: 0x7F07007F
-			public const int books = 2131165311;
+			public const int btn_radio_off_mtrl = 2131165311;
 			
 			// aapt resource value: 0x7F070080
-			public const int border_layout = 2131165312;
+			public const int btn_radio_off_to_on_mtrl_animation = 2131165312;
 			
 			// aapt resource value: 0x7F070081
-			public const int btn_checkbox_checked_mtrl = 2131165313;
+			public const int btn_radio_on_mtrl = 2131165313;
 			
 			// aapt resource value: 0x7F070082
-			public const int btn_checkbox_checked_to_unchecked_mtrl_animation = 2131165314;
+			public const int btn_radio_on_to_off_mtrl_animation = 2131165314;
 			
 			// aapt resource value: 0x7F070083
-			public const int btn_checkbox_unchecked_mtrl = 2131165315;
+			public const int CheckableMaterialColor = 2131165315;
 			
 			// aapt resource value: 0x7F070084
-			public const int btn_checkbox_unchecked_to_checked_mtrl_animation = 2131165316;
+			public const int clear_button_icon = 2131165316;
 			
 			// aapt resource value: 0x7F070085
-			public const int btn_radio_off_mtrl = 2131165317;
+			public const int common_full_open_on_phone = 2131165317;
 			
 			// aapt resource value: 0x7F070086
-			public const int btn_radio_off_to_on_mtrl_animation = 2131165318;
+			public const int common_google_signin_btn_icon_dark = 2131165318;
 			
 			// aapt resource value: 0x7F070087
-			public const int btn_radio_on_mtrl = 2131165319;
+			public const int common_google_signin_btn_icon_dark_focused = 2131165319;
 			
 			// aapt resource value: 0x7F070088
-			public const int btn_radio_on_to_off_mtrl_animation = 2131165320;
+			public const int common_google_signin_btn_icon_dark_normal = 2131165320;
 			
 			// aapt resource value: 0x7F070089
-			public const int CheckableMaterialColor = 2131165321;
+			public const int common_google_signin_btn_icon_dark_normal_background = 2131165321;
 			
 			// aapt resource value: 0x7F07008A
-			public const int clear_button_icon = 2131165322;
+			public const int common_google_signin_btn_icon_disabled = 2131165322;
 			
 			// aapt resource value: 0x7F07008B
-			public const int common_full_open_on_phone = 2131165323;
+			public const int common_google_signin_btn_icon_light = 2131165323;
 			
 			// aapt resource value: 0x7F07008C
-			public const int common_google_signin_btn_icon_dark = 2131165324;
+			public const int common_google_signin_btn_icon_light_focused = 2131165324;
 			
 			// aapt resource value: 0x7F07008D
-			public const int common_google_signin_btn_icon_dark_focused = 2131165325;
+			public const int common_google_signin_btn_icon_light_normal = 2131165325;
 			
 			// aapt resource value: 0x7F07008E
-			public const int common_google_signin_btn_icon_dark_normal = 2131165326;
+			public const int common_google_signin_btn_icon_light_normal_background = 2131165326;
 			
 			// aapt resource value: 0x7F07008F
-			public const int common_google_signin_btn_icon_dark_normal_background = 2131165327;
+			public const int common_google_signin_btn_text_dark = 2131165327;
 			
 			// aapt resource value: 0x7F070090
-			public const int common_google_signin_btn_icon_disabled = 2131165328;
+			public const int common_google_signin_btn_text_dark_focused = 2131165328;
 			
 			// aapt resource value: 0x7F070091
-			public const int common_google_signin_btn_icon_light = 2131165329;
+			public const int common_google_signin_btn_text_dark_normal = 2131165329;
 			
 			// aapt resource value: 0x7F070092
-			public const int common_google_signin_btn_icon_light_focused = 2131165330;
+			public const int common_google_signin_btn_text_dark_normal_background = 2131165330;
 			
 			// aapt resource value: 0x7F070093
-			public const int common_google_signin_btn_icon_light_normal = 2131165331;
+			public const int common_google_signin_btn_text_disabled = 2131165331;
 			
 			// aapt resource value: 0x7F070094
-			public const int common_google_signin_btn_icon_light_normal_background = 2131165332;
+			public const int common_google_signin_btn_text_light = 2131165332;
 			
 			// aapt resource value: 0x7F070095
-			public const int common_google_signin_btn_text_dark = 2131165333;
+			public const int common_google_signin_btn_text_light_focused = 2131165333;
 			
 			// aapt resource value: 0x7F070096
-			public const int common_google_signin_btn_text_dark_focused = 2131165334;
+			public const int common_google_signin_btn_text_light_normal = 2131165334;
 			
 			// aapt resource value: 0x7F070097
-			public const int common_google_signin_btn_text_dark_normal = 2131165335;
+			public const int common_google_signin_btn_text_light_normal_background = 2131165335;
 			
 			// aapt resource value: 0x7F070098
-			public const int common_google_signin_btn_text_dark_normal_background = 2131165336;
+			public const int custom_thumb = 2131165336;
 			
 			// aapt resource value: 0x7F070099
-			public const int common_google_signin_btn_text_disabled = 2131165337;
+			public const int dashed_border = 2131165337;
 			
 			// aapt resource value: 0x7F07009A
-			public const int common_google_signin_btn_text_light = 2131165338;
+			public const int design_fab_background = 2131165338;
 			
 			// aapt resource value: 0x7F07009B
-			public const int common_google_signin_btn_text_light_focused = 2131165339;
+			public const int design_ic_visibility = 2131165339;
 			
 			// aapt resource value: 0x7F07009C
-			public const int common_google_signin_btn_text_light_normal = 2131165340;
+			public const int design_ic_visibility_off = 2131165340;
 			
 			// aapt resource value: 0x7F07009D
-			public const int common_google_signin_btn_text_light_normal_background = 2131165341;
+			public const int design_password_eye = 2131165341;
 			
 			// aapt resource value: 0x7F07009E
-			public const int cross = 2131165342;
+			public const int design_snackbar_background = 2131165342;
 			
 			// aapt resource value: 0x7F07009F
-			public const int custom_thumb = 2131165343;
+			public const int drawable_ripple = 2131165343;
 			
 			// aapt resource value: 0x7F0700A0
-			public const int dashed_border = 2131165344;
+			public const int drawable_ripple_image = 2131165344;
 			
 			// aapt resource value: 0x7F0700A1
-			public const int design_fab_background = 2131165345;
+			public const int drawable_ripple_outlined = 2131165345;
 			
 			// aapt resource value: 0x7F0700A2
-			public const int design_ic_visibility = 2131165346;
+			public const int drawable_ripple_outlined_with_icon = 2131165346;
 			
 			// aapt resource value: 0x7F0700A3
-			public const int design_ic_visibility_off = 2131165347;
+			public const int drawable_ripple_text = 2131165347;
 			
 			// aapt resource value: 0x7F0700A4
-			public const int design_password_eye = 2131165348;
+			public const int drawable_ripple_with_icon = 2131165348;
 			
 			// aapt resource value: 0x7F0700A5
-			public const int design_snackbar_background = 2131165349;
+			public const int drawable_selector = 2131165349;
 			
 			// aapt resource value: 0x7F0700A6
-			public const int disconnected = 2131165350;
+			public const int drawable_shape = 2131165350;
 			
 			// aapt resource value: 0x7F0700A7
-			public const int drawable_ripple = 2131165351;
+			public const int drawable_shape_text = 2131165351;
 			
 			// aapt resource value: 0x7F0700A8
-			public const int drawable_ripple_image = 2131165352;
+			public const int drawable_shape_with_icon = 2131165352;
 			
 			// aapt resource value: 0x7F0700A9
-			public const int drawable_ripple_outlined = 2131165353;
+			public const int dropdownbuttonimage = 2131165353;
 			
 			// aapt resource value: 0x7F0700AA
-			public const int drawable_ripple_outlined_with_icon = 2131165354;
+			public const int editTextBackground = 2131165354;
 			
 			// aapt resource value: 0x7F0700AB
-			public const int drawable_ripple_text = 2131165355;
+			public const int editTextPageCount = 2131165355;
 			
 			// aapt resource value: 0x7F0700AC
-			public const int drawable_ripple_with_icon = 2131165356;
+			public const int FormFieldCheckbox = 2131165356;
 			
 			// aapt resource value: 0x7F0700AD
-			public const int drawable_selector = 2131165357;
+			public const int FormFieldCheckbox_Checked = 2131165357;
 			
 			// aapt resource value: 0x7F0700AE
-			public const int drawable_shape = 2131165358;
+			public const int FormFieldCheckbox_UnChecked = 2131165358;
 			
 			// aapt resource value: 0x7F0700AF
-			public const int drawable_shape_text = 2131165359;
+			public const int formfieldradiobuttonstyle = 2131165359;
 			
 			// aapt resource value: 0x7F0700B0
-			public const int drawable_shape_with_icon = 2131165360;
+			public const int formfieldtextboxcursorcolor = 2131165360;
 			
 			// aapt resource value: 0x7F0700B1
-			public const int drawing = 2131165361;
+			public const int googleg_disabled_color_18 = 2131165361;
 			
 			// aapt resource value: 0x7F0700B2
-			public const int dropdownbuttonimage = 2131165362;
+			public const int googleg_standard_color_18 = 2131165362;
+			
+			// aapt resource value: 0x7F0700BA
+			public const int Icon = 2131165370;
 			
 			// aapt resource value: 0x7F0700B3
-			public const int editTextBackground = 2131165363;
+			public const int ic_arrow_down_24dp = 2131165363;
 			
 			// aapt resource value: 0x7F0700B4
-			public const int editTextPageCount = 2131165364;
+			public const int ic_clock_black_24dp = 2131165364;
 			
 			// aapt resource value: 0x7F0700B5
-			public const int factory = 2131165365;
+			public const int ic_keyboard_black_24dp = 2131165365;
 			
 			// aapt resource value: 0x7F0700B6
-			public const int flowchart = 2131165366;
+			public const int ic_mtrl_checked_circle = 2131165366;
 			
 			// aapt resource value: 0x7F0700B7
-			public const int FormFieldCheckbox = 2131165367;
+			public const int ic_mtrl_chip_checked_black = 2131165367;
 			
 			// aapt resource value: 0x7F0700B8
-			public const int FormFieldCheckbox_Checked = 2131165368;
+			public const int ic_mtrl_chip_checked_circle = 2131165368;
 			
 			// aapt resource value: 0x7F0700B9
-			public const int FormFieldCheckbox_UnChecked = 2131165369;
-			
-			// aapt resource value: 0x7F0700BA
-			public const int formfieldradiobuttonstyle = 2131165370;
-			
-			// aapt resource value: 0x7F0700BB
-			public const int formfieldtextboxcursorcolor = 2131165371;
+			public const int ic_mtrl_chip_close_circle = 2131165369;
 			
 			// aapt resource value: 0x7F0700BC
-			public const int googleg_disabled_color_18 = 2131165372;
+			public const int inputlayout_togglecollapseicon = 2131165372;
 			
 			// aapt resource value: 0x7F0700BD
-			public const int googleg_standard_color_18 = 2131165373;
+			public const int inputlayout_togglevisibleicon = 2131165373;
 			
-			// aapt resource value: 0x7F0700C5
-			public const int Icon = 2131165381;
+			// aapt resource value: 0x7F0700BB
+			public const int input_layout_drop_down_icon = 2131165371;
 			
 			// aapt resource value: 0x7F0700BE
-			public const int ic_arrow_down_24dp = 2131165374;
+			public const int layoutBorder = 2131165374;
 			
 			// aapt resource value: 0x7F0700BF
-			public const int ic_clock_black_24dp = 2131165375;
+			public const int material_cursor_drawable = 2131165375;
 			
 			// aapt resource value: 0x7F0700C0
-			public const int ic_keyboard_black_24dp = 2131165376;
+			public const int material_ic_calendar_black_24dp = 2131165376;
 			
 			// aapt resource value: 0x7F0700C1
-			public const int ic_mtrl_checked_circle = 2131165377;
+			public const int material_ic_clear_black_24dp = 2131165377;
 			
 			// aapt resource value: 0x7F0700C2
-			public const int ic_mtrl_chip_checked_black = 2131165378;
+			public const int material_ic_edit_black_24dp = 2131165378;
 			
 			// aapt resource value: 0x7F0700C3
-			public const int ic_mtrl_chip_checked_circle = 2131165379;
+			public const int material_ic_keyboard_arrow_left_black_24dp = 2131165379;
 			
 			// aapt resource value: 0x7F0700C4
-			public const int ic_mtrl_chip_close_circle = 2131165380;
+			public const int material_ic_keyboard_arrow_next_black_24dp = 2131165380;
+			
+			// aapt resource value: 0x7F0700C5
+			public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165381;
+			
+			// aapt resource value: 0x7F0700C6
+			public const int material_ic_keyboard_arrow_right_black_24dp = 2131165382;
 			
 			// aapt resource value: 0x7F0700C7
-			public const int inputlayout_togglecollapseicon = 2131165383;
+			public const int material_ic_menu_arrow_down_black_24dp = 2131165383;
 			
 			// aapt resource value: 0x7F0700C8
-			public const int inputlayout_togglevisibleicon = 2131165384;
-			
-			// aapt resource value: 0x7F0700C6
-			public const int input_layout_drop_down_icon = 2131165382;
+			public const int material_ic_menu_arrow_up_black_24dp = 2131165384;
 			
 			// aapt resource value: 0x7F0700C9
-			public const int layoutBorder = 2131165385;
+			public const int More = 2131165385;
 			
 			// aapt resource value: 0x7F0700CA
-			public const int material_cursor_drawable = 2131165386;
+			public const int mtrl_dialog_background = 2131165386;
 			
 			// aapt resource value: 0x7F0700CB
-			public const int material_ic_calendar_black_24dp = 2131165387;
+			public const int mtrl_dropdown_arrow = 2131165387;
 			
 			// aapt resource value: 0x7F0700CC
-			public const int material_ic_clear_black_24dp = 2131165388;
+			public const int mtrl_ic_arrow_drop_down = 2131165388;
 			
 			// aapt resource value: 0x7F0700CD
-			public const int material_ic_edit_black_24dp = 2131165389;
+			public const int mtrl_ic_arrow_drop_up = 2131165389;
 			
 			// aapt resource value: 0x7F0700CE
-			public const int material_ic_keyboard_arrow_left_black_24dp = 2131165390;
+			public const int mtrl_ic_cancel = 2131165390;
 			
 			// aapt resource value: 0x7F0700CF
-			public const int material_ic_keyboard_arrow_next_black_24dp = 2131165391;
+			public const int mtrl_ic_error = 2131165391;
 			
 			// aapt resource value: 0x7F0700D0
-			public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165392;
+			public const int mtrl_navigation_bar_item_background = 2131165392;
 			
 			// aapt resource value: 0x7F0700D1
-			public const int material_ic_keyboard_arrow_right_black_24dp = 2131165393;
+			public const int mtrl_popupmenu_background = 2131165393;
 			
 			// aapt resource value: 0x7F0700D2
-			public const int material_ic_menu_arrow_down_black_24dp = 2131165394;
+			public const int mtrl_popupmenu_background_dark = 2131165394;
 			
 			// aapt resource value: 0x7F0700D3
-			public const int material_ic_menu_arrow_up_black_24dp = 2131165395;
+			public const int mtrl_tabs_default_indicator = 2131165395;
 			
 			// aapt resource value: 0x7F0700D4
-			public const int menu = 2131165396;
+			public const int navigation_empty_icon = 2131165396;
 			
 			// aapt resource value: 0x7F0700D5
-			public const int minus = 2131165397;
+			public const int NodeCollapse = 2131165397;
 			
 			// aapt resource value: 0x7F0700D6
-			public const int More = 2131165398;
+			public const int NodeExpand = 2131165398;
 			
 			// aapt resource value: 0x7F0700D7
-			public const int mtrl_dialog_background = 2131165399;
+			public const int notification_action_background = 2131165399;
 			
 			// aapt resource value: 0x7F0700D8
-			public const int mtrl_dropdown_arrow = 2131165400;
+			public const int notification_bg = 2131165400;
 			
 			// aapt resource value: 0x7F0700D9
-			public const int mtrl_ic_arrow_drop_down = 2131165401;
+			public const int notification_bg_low = 2131165401;
 			
 			// aapt resource value: 0x7F0700DA
-			public const int mtrl_ic_arrow_drop_up = 2131165402;
+			public const int notification_bg_low_normal = 2131165402;
 			
 			// aapt resource value: 0x7F0700DB
-			public const int mtrl_ic_cancel = 2131165403;
+			public const int notification_bg_low_pressed = 2131165403;
 			
 			// aapt resource value: 0x7F0700DC
-			public const int mtrl_ic_error = 2131165404;
+			public const int notification_bg_normal = 2131165404;
 			
 			// aapt resource value: 0x7F0700DD
-			public const int mtrl_navigation_bar_item_background = 2131165405;
+			public const int notification_bg_normal_pressed = 2131165405;
 			
 			// aapt resource value: 0x7F0700DE
-			public const int mtrl_popupmenu_background = 2131165406;
+			public const int notification_icon_background = 2131165406;
 			
 			// aapt resource value: 0x7F0700DF
-			public const int mtrl_popupmenu_background_dark = 2131165407;
+			public const int notification_template_icon_bg = 2131165407;
 			
 			// aapt resource value: 0x7F0700E0
-			public const int mtrl_tabs_default_indicator = 2131165408;
+			public const int notification_template_icon_low_bg = 2131165408;
 			
 			// aapt resource value: 0x7F0700E1
-			public const int navigation_empty_icon = 2131165409;
+			public const int notification_tile_bg = 2131165409;
 			
 			// aapt resource value: 0x7F0700E2
-			public const int NodeCollapse = 2131165410;
+			public const int notify_panel_notification_icon_bg = 2131165410;
 			
 			// aapt resource value: 0x7F0700E3
-			public const int NodeExpand = 2131165411;
+			public const int PasswordAlertDialogBottomLine = 2131165411;
 			
 			// aapt resource value: 0x7F0700E4
-			public const int notification_action_background = 2131165412;
+			public const int PasswordAlertDialogCursorStyle = 2131165412;
 			
 			// aapt resource value: 0x7F0700E5
-			public const int notification_bg = 2131165413;
+			public const int popup_forms_android_close_icon = 2131165413;
 			
 			// aapt resource value: 0x7F0700E6
-			public const int notification_bg_low = 2131165414;
+			public const int popup_forms_android_shadow = 2131165414;
 			
 			// aapt resource value: 0x7F0700E7
-			public const int notification_bg_low_normal = 2131165415;
+			public const int popup_forms_dark_theme_close_icon = 2131165415;
 			
 			// aapt resource value: 0x7F0700E8
-			public const int notification_bg_low_pressed = 2131165416;
+			public const int popup_forms_light_theme_close_icon = 2131165416;
 			
 			// aapt resource value: 0x7F0700E9
-			public const int notification_bg_normal = 2131165417;
+			public const int preference_list_divider_material = 2131165417;
 			
 			// aapt resource value: 0x7F0700EA
-			public const int notification_bg_normal_pressed = 2131165418;
+			public const int Recurrence = 2131165418;
 			
 			// aapt resource value: 0x7F0700EB
-			public const int notification_icon_background = 2131165419;
+			public const int roundCornerButton = 2131165419;
 			
 			// aapt resource value: 0x7F0700EC
-			public const int notification_template_icon_bg = 2131165420;
+			public const int savebutton = 2131165420;
 			
 			// aapt resource value: 0x7F0700ED
-			public const int notification_template_icon_low_bg = 2131165421;
+			public const int Search = 2131165421;
 			
 			// aapt resource value: 0x7F0700EE
-			public const int notification_tile_bg = 2131165422;
+			public const int Separator = 2131165422;
 			
 			// aapt resource value: 0x7F0700EF
-			public const int notify_panel_notification_icon_bg = 2131165423;
+			public const int sfcheckbox_animation = 2131165423;
 			
 			// aapt resource value: 0x7F0700F0
-			public const int PasswordAlertDialogBottomLine = 2131165424;
+			public const int sfcheckbox_checked = 2131165424;
 			
 			// aapt resource value: 0x7F0700F1
-			public const int PasswordAlertDialogCursorStyle = 2131165425;
+			public const int sfcheckbox_checked_indeterminate = 2131165425;
 			
 			// aapt resource value: 0x7F0700F2
-			public const int plus = 2131165426;
+			public const int sfcheckbox_checked_unchecked = 2131165426;
 			
 			// aapt resource value: 0x7F0700F3
-			public const int popup_forms_android_close_icon = 2131165427;
+			public const int sfcheckbox_indeterminate = 2131165427;
 			
 			// aapt resource value: 0x7F0700F4
-			public const int popup_forms_android_shadow = 2131165428;
+			public const int sfcheckbox_indeterminate_checked = 2131165428;
 			
 			// aapt resource value: 0x7F0700F5
-			public const int popup_forms_dark_theme_close_icon = 2131165429;
+			public const int sfcheckbox_indeterminate_unchecked = 2131165429;
 			
 			// aapt resource value: 0x7F0700F6
-			public const int popup_forms_light_theme_close_icon = 2131165430;
+			public const int sfcheckbox_unchecked = 2131165430;
 			
 			// aapt resource value: 0x7F0700F7
-			public const int preference_list_divider_material = 2131165431;
+			public const int sfcheckbox_unchecked_checked = 2131165431;
 			
 			// aapt resource value: 0x7F0700F8
-			public const int Recurrence = 2131165432;
+			public const int sfcheckbox_unchecked_indeterminate = 2131165432;
 			
 			// aapt resource value: 0x7F0700F9
-			public const int roundCornerButton = 2131165433;
+			public const int sfprogressbar_determinate_linear = 2131165433;
 			
 			// aapt resource value: 0x7F0700FA
-			public const int save = 2131165434;
+			public const int sfprogressbar_indeterminate_circular = 2131165434;
 			
 			// aapt resource value: 0x7F0700FB
-			public const int savebutton = 2131165435;
+			public const int sfprogressbar_indeterminate_linear = 2131165435;
 			
 			// aapt resource value: 0x7F0700FC
-			public const int Search = 2131165436;
+			public const int SignaturePadBottomCorner = 2131165436;
 			
 			// aapt resource value: 0x7F0700FD
-			public const int Separator = 2131165437;
+			public const int SignaturepadRoundedCorners = 2131165437;
 			
 			// aapt resource value: 0x7F0700FE
-			public const int sfcheckbox_animation = 2131165438;
+			public const int SignaturePadTopCorner = 2131165438;
 			
 			// aapt resource value: 0x7F0700FF
-			public const int sfcheckbox_checked = 2131165439;
+			public const int test_custom_background = 2131165439;
 			
 			// aapt resource value: 0x7F070100
-			public const int sfcheckbox_checked_indeterminate = 2131165440;
+			public const int text_color_button = 2131165440;
 			
 			// aapt resource value: 0x7F070101
-			public const int sfcheckbox_checked_unchecked = 2131165441;
+			public const int toolbaritem_background = 2131165441;
 			
 			// aapt resource value: 0x7F070102
-			public const int sfcheckbox_indeterminate = 2131165442;
+			public const int toolbaritem_pressed = 2131165442;
 			
 			// aapt resource value: 0x7F070103
-			public const int sfcheckbox_indeterminate_checked = 2131165443;
+			public const int tooltip_frame_dark = 2131165443;
 			
 			// aapt resource value: 0x7F070104
-			public const int sfcheckbox_indeterminate_unchecked = 2131165444;
-			
-			// aapt resource value: 0x7F070105
-			public const int sfcheckbox_unchecked = 2131165445;
+			public const int tooltip_frame_light = 2131165444;
 			
 			// aapt resource value: 0x7F070106
-			public const int sfcheckbox_unchecked_checked = 2131165446;
+			public const int undoButton = 2131165446;
+			
+			// aapt resource value: 0x7F070105
+			public const int undo_redo_background = 2131165445;
 			
 			// aapt resource value: 0x7F070107
-			public const int sfcheckbox_unchecked_indeterminate = 2131165447;
+			public const int Viewmode = 2131165447;
 			
 			// aapt resource value: 0x7F070108
-			public const int sfprogressbar_determinate_linear = 2131165448;
+			public const int xf_arrow_dropdown = 2131165448;
 			
 			// aapt resource value: 0x7F070109
-			public const int sfprogressbar_indeterminate_circular = 2131165449;
+			public const int xf_arrow_right = 2131165449;
 			
 			// aapt resource value: 0x7F07010A
-			public const int sfprogressbar_indeterminate_linear = 2131165450;
+			public const int xf_check = 2131165450;
 			
 			// aapt resource value: 0x7F07010B
-			public const int SignaturePadBottomCorner = 2131165451;
+			public const int xf_checkbox_selected = 2131165451;
 			
 			// aapt resource value: 0x7F07010C
-			public const int SignaturepadRoundedCorners = 2131165452;
+			public const int xf_checkbox_unselected = 2131165452;
 			
 			// aapt resource value: 0x7F07010D
-			public const int SignaturePadTopCorner = 2131165453;
+			public const int xf_clear = 2131165453;
 			
 			// aapt resource value: 0x7F07010E
-			public const int task = 2131165454;
+			public const int xf_error = 2131165454;
 			
 			// aapt resource value: 0x7F07010F
-			public const int test_custom_background = 2131165455;
+			public const int xf_radio_button_selected = 2131165455;
 			
 			// aapt resource value: 0x7F070110
-			public const int text_color_button = 2131165456;
-			
-			// aapt resource value: 0x7F070111
-			public const int tick = 2131165457;
-			
-			// aapt resource value: 0x7F070112
-			public const int toolbaritem_background = 2131165458;
-			
-			// aapt resource value: 0x7F070113
-			public const int toolbaritem_pressed = 2131165459;
-			
-			// aapt resource value: 0x7F070114
-			public const int tooltip_frame_dark = 2131165460;
-			
-			// aapt resource value: 0x7F070115
-			public const int tooltip_frame_light = 2131165461;
-			
-			// aapt resource value: 0x7F070117
-			public const int undoButton = 2131165463;
-			
-			// aapt resource value: 0x7F070116
-			public const int undo_redo_background = 2131165462;
-			
-			// aapt resource value: 0x7F070118
-			public const int Viewmode = 2131165464;
-			
-			// aapt resource value: 0x7F070119
-			public const int xf_arrow_dropdown = 2131165465;
-			
-			// aapt resource value: 0x7F07011A
-			public const int xf_arrow_right = 2131165466;
-			
-			// aapt resource value: 0x7F07011B
-			public const int xf_check = 2131165467;
-			
-			// aapt resource value: 0x7F07011C
-			public const int xf_checkbox_selected = 2131165468;
-			
-			// aapt resource value: 0x7F07011D
-			public const int xf_checkbox_unselected = 2131165469;
-			
-			// aapt resource value: 0x7F07011E
-			public const int xf_clear = 2131165470;
-			
-			// aapt resource value: 0x7F07011F
-			public const int xf_error = 2131165471;
-			
-			// aapt resource value: 0x7F070120
-			public const int xf_radio_button_selected = 2131165472;
-			
-			// aapt resource value: 0x7F070121
-			public const int xf_radio_button_unselected = 2131165473;
+			public const int xf_radio_button_unselected = 2131165456;
 			
 			static Drawable()
 			{

+ 4 - 3
prs.mobile.new/PRS.Mobile.iOS/AppDelegate.cs

@@ -41,10 +41,12 @@ namespace PRS.Mobile.iOS
             
             // https://github.com/Redth/ZXing.Net.Mobile/tree/master
             ZXing.Net.Mobile.Forms.iOS.Platform.Init();
-            
+
             // https://learn.microsoft.com/en-au/xamarin/essentials/get-started?tabs=windows%2Cios
             //Xamarin.Essentials.Platform.Init( () => provide your own сurrent UIViewController provider);
-            
+
+            MobileLogging.Log("Start of AppDelegate");
+
             Syncfusion.XForms.iOS.PopupLayout.SfPopupLayoutRenderer.Init();
             Syncfusion.SfPdfViewer.XForms.iOS.SfPdfDocumentViewRenderer.Init();
             Syncfusion.SfRangeSlider.XForms.iOS.SfRangeSliderRenderer.Init();
@@ -104,7 +106,6 @@ namespace PRS.Mobile.iOS
                 }
             }
 
-            
             LoadApplication(new App());
 
             return base.FinishedLaunching(app, options);

+ 210 - 77
prs.mobile.new/PRS.Mobile.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,116 +1,249 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "40.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "20x20"
+      "filename": "40.png",
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "20x20"
     },
     {
-      "filename" : "60.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "20x20"
+      "filename": "60.png",
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "20x20"
     },
     {
-      "filename" : "58.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "29x29"
+      "filename": "58.png",
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "29x29"
     },
     {
-      "filename" : "87.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "29x29"
+      "filename": "87.png",
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "29x29"
     },
     {
-      "filename" : "80.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "40x40"
+      "filename": "80.png",
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "40x40"
     },
     {
-      "filename" : "120.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "40x40"
+      "filename": "120.png",
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "40x40"
     },
     {
-      "filename" : "120 1.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "60x60"
+      "filename": "120 1.png",
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "60x60"
     },
     {
-      "filename" : "180.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "60x60"
+      "filename": "180.png",
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "60x60"
     },
     {
-      "filename" : "20.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "20x20"
+      "filename": "20.png",
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "20x20"
     },
     {
-      "filename" : "40 1.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "20x20"
+      "filename": "40 1.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "20x20"
     },
     {
-      "filename" : "29.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "29x29"
+      "filename": "29.png",
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "29x29"
     },
     {
-      "filename" : "58 1.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "29x29"
+      "filename": "58 1.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "29x29"
     },
     {
-      "filename" : "40 2.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "40x40"
+      "filename": "40 2.png",
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "40x40"
     },
     {
-      "filename" : "80 1.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "40x40"
+      "filename": "80 1.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "40x40"
     },
     {
-      "filename" : "76.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "76x76"
+      "filename": "76.png",
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "76x76"
     },
     {
-      "filename" : "152.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "76x76"
+      "filename": "152.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "76x76"
     },
     {
-      "filename" : "167.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "83.5x83.5"
+      "filename": "167.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "83.5x83.5"
     },
     {
-      "filename" : "1024.png",
-      "idiom" : "ios-marketing",
-      "scale" : "1x",
-      "size" : "1024x1024"
+      "filename": "1024.png",
+      "idiom": "ios-marketing",
+      "scale": "1x",
+      "size": "1024x1024"
+    },
+    {
+      "idiom": "car",
+      "scale": "2x",
+      "size": "60x60"
+    },
+    {
+      "idiom": "car",
+      "scale": "3x",
+      "size": "60x60"
+    },
+    {
+      "idiom": "watch",
+      "role": "notificationCenter",
+      "scale": "2x",
+      "size": "24x24",
+      "subtype": "38mm"
+    },
+    {
+      "idiom": "watch",
+      "role": "notificationCenter",
+      "scale": "2x",
+      "size": "27.5x27.5",
+      "subtype": "42mm"
+    },
+    {
+      "idiom": "watch",
+      "role": "companionSettings",
+      "scale": "2x",
+      "size": "29x29"
+    },
+    {
+      "idiom": "watch",
+      "role": "companionSettings",
+      "scale": "3x",
+      "size": "29x29"
+    },
+    {
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "40x40",
+      "subtype": "38mm"
+    },
+    {
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "44x44",
+      "subtype": "40mm"
+    },
+    {
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "50x50",
+      "subtype": "44mm"
+    },
+    {
+      "idiom": "watch",
+      "role": "quickLook",
+      "scale": "2x",
+      "size": "86x86",
+      "subtype": "38mm"
+    },
+    {
+      "idiom": "watch",
+      "role": "quickLook",
+      "scale": "2x",
+      "size": "98x98",
+      "subtype": "42mm"
+    },
+    {
+      "idiom": "watch",
+      "role": "quickLook",
+      "scale": "2x",
+      "size": "108x108",
+      "subtype": "44mm"
+    },
+    {
+      "idiom": "watch-marketing",
+      "scale": "1x",
+      "size": "1024x1024"
+    },
+    {
+      "idiom": "mac",
+      "scale": "1x",
+      "size": "16x16"
+    },
+    {
+      "idiom": "mac",
+      "scale": "2x",
+      "size": "16x16"
+    },
+    {
+      "idiom": "mac",
+      "scale": "1x",
+      "size": "32x32"
+    },
+    {
+      "idiom": "mac",
+      "scale": "2x",
+      "size": "32x32"
+    },
+    {
+      "idiom": "mac",
+      "scale": "1x",
+      "size": "128x128"
+    },
+    {
+      "idiom": "mac",
+      "scale": "2x",
+      "size": "128x128"
+    },
+    {
+      "idiom": "mac",
+      "scale": "1x",
+      "size": "256x256"
+    },
+    {
+      "idiom": "mac",
+      "scale": "2x",
+      "size": "256x256"
+    },
+    {
+      "idiom": "mac",
+      "scale": "1x",
+      "size": "512x512"
+    },
+    {
+      "idiom": "mac",
+      "scale": "2x",
+      "size": "512x512"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
-}
+}

+ 6 - 0
prs.mobile.new/PRS.Mobile.iOS/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
prs.mobile.new/PRS.Mobile.iOS/Assets.xcassets/logo.imageset/1024.png


+ 21 - 0
prs.mobile.new/PRS.Mobile.iOS/Assets.xcassets/logo.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "1024.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 46 - 42
prs.mobile.new/PRS.Mobile.iOS/Info.plist

@@ -2,47 +2,51 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>UIDeviceFamily</key>
-    <array>
-        <integer>1</integer>
-        <integer>2</integer>
-    </array>
-    <key>UISupportedInterfaceOrientations</key>
-    <array>
-        <string>UIInterfaceOrientationPortrait</string>
-        <string>UIInterfaceOrientationLandscapeLeft</string>
-        <string>UIInterfaceOrientationLandscapeRight</string>
-    </array>
-    <key>UISupportedInterfaceOrientations~ipad</key>
-    <array>
-        <string>UIInterfaceOrientationPortrait</string>
-        <string>UIInterfaceOrientationPortraitUpsideDown</string>
-        <string>UIInterfaceOrientationLandscapeLeft</string>
-        <string>UIInterfaceOrientationLandscapeRight</string>
-    </array>
-    <key>MinimumOSVersion</key>
-    <string>16.1</string>
-    <key>CFBundleDisplayName</key>
-    <string>PRS.Mobile</string>
-    <key>CFBundleIdentifier</key>
-    <string>com.prsdigital.prssiteapp</string>
-    <key>CFBundleVersion</key>
-    <string>1.0</string>
-    <key>UILaunchStoryboardName</key>
-    <string>LaunchScreen</string>
-    <key>CFBundleName</key>
-    <string>PRS.Mobile</string>
-    <key>XSAppIconAssets</key>
-    <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>UIDeviceFamily</key>
+	<array>
+		<integer>1</integer>
+		<integer>2</integer>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>MinimumOSVersion</key>
+	<string>16.1</string>
+	<key>CFBundleDisplayName</key>
+	<string>PRS.Mobile</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.prsdigital.prssiteapp</string>
+	<key>CFBundleVersion</key>
+	<string>1.0.3</string>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>CFBundleName</key>
+	<string>PRS Site App</string>
+	<key>XSAppIconAssets</key>
+	<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>NSBluetoothPeripheralUsageDescription</key>
+	<string>This app needs access to Bluetooth to keep bluetooth trackers up to date</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>This app needs access to Location to validate user inputs</string>
 </dict>
 </plist>

+ 1 - 1
prs.mobile.new/PRS.Mobile.iOS/Main.cs

@@ -14,7 +14,7 @@ namespace PRS.Mobile.iOS
         {
             // if you want to use a different Application Delegate class from "AppDelegate"
             // you can specify it here.
-            UIApplication.Main(args, null, "AppDelegate");
+            UIApplication.Main(args, null, typeof(AppDelegate));
         }
     }
 }

+ 8 - 0
prs.mobile.new/PRS.Mobile.iOS/PRS.Mobile.iOS.csproj

@@ -52,6 +52,7 @@
         <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
         <Commandlineparameters></Commandlineparameters>
         <CreatePackage></CreatePackage>
+        <MtouchLink>SdkOnly</MtouchLink>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
         <DebugType>none</DebugType>
@@ -64,6 +65,10 @@
         <CodesignKey>iPhone Developer</CodesignKey>
         <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
         <CodesignProvision>Automatic</CodesignProvision>
+        <EnablePackageSigning></EnablePackageSigning>
+        <CodesignExtraArgs></CodesignExtraArgs>
+        <CrashReportingEnabled>false</CrashReportingEnabled>
+        <EnableCodeSigning></EnableCodeSigning>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
         <DebugType>none</DebugType>
@@ -120,6 +125,9 @@
         <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87.png" />
         <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58 1.png" />
         <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\152.png" />
+        <ImageAsset Include="Assets.xcassets\Contents.json" />
+        <ImageAsset Include="Assets.xcassets\logo.imageset\1024.png" />
+        <ImageAsset Include="Assets.xcassets\logo.imageset\Contents.json" />
     </ItemGroup>
     <ItemGroup>
         <Reference Include="System" />

+ 6 - 4
prs.mobile.new/PRS.Mobile/Main/PINLoginPage.xaml.cs

@@ -70,15 +70,17 @@ namespace PRS.Mobile
                     {
                         if ((_settings.URLs?.Any(x=>!String.IsNullOrWhiteSpace(x)) == true)
                             && !string.IsNullOrWhiteSpace(_settings.UserID) 
-                            && !string.IsNullOrWhiteSpace(_settings.Password))
+                            && !string.IsNullOrWhiteSpace(_settings.Password)
+                            )
                             connection = App.ConnectTransport(_settings.URLs);
                     });
-                    
                 }
-                
+
                 if (connection != TransportStatus.OK)
                 {
-                    await DisplayAlert("Connection Error", $"Unable to establish a connection!\n\nERR: {connection}", "OK");
+                    if(_settings.URLs.Any() && !string.IsNullOrWhiteSpace(_settings.UserID))
+                        await DisplayAlert("Connection Error", $"Unable to establish a connection!\n\nERR: {connection}", "OK");
+
                     Navigation.PushAsync(new SettingsPage());
                     return;
                 }

+ 229 - 5
prs.mobile/comal.timesheets.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,6 +1,7 @@
 {
-  "images" : [
+  "images": [
     {
+<<<<<<< HEAD
       "filename" : "40.png",
       "idiom" : "universal",
       "platform" : "ios",
@@ -108,10 +109,233 @@
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
+=======
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "20x20"
+    },
+    {
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "20x20"
+    },
+    {
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "29x29"
+    },
+    {
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "29x29"
+    },
+    {
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "40x40"
+    },
+    {
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "40x40"
+    },
+    {
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "60x60"
+    },
+    {
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "60x60"
+    },
+    {
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "20x20"
+    },
+    {
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "20x20"
+    },
+    {
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "29x29"
+    },
+    {
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "29x29"
+    },
+    {
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "40x40"
+    },
+    {
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "40x40"
+    },
+    {
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "76x76"
+    },
+    {
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "76x76"
+    },
+    {
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "83.5x83.5"
+    },
+    {
+      "idiom": "ios-marketing",
+      "scale": "1x",
+      "size": "1024x1024"
+    },
+    {
+      "idiom": "car",
+      "scale": "2x",
+      "size": "60x60"
+    },
+    {
+      "idiom": "car",
+      "scale": "3x",
+      "size": "60x60"
+    },
+    {
+      "idiom": "watch",
+      "role": "notificationCenter",
+      "scale": "2x",
+      "size": "24x24",
+      "subtype": "38mm"
+    },
+    {
+      "idiom": "watch",
+      "role": "notificationCenter",
+      "scale": "2x",
+      "size": "27.5x27.5",
+      "subtype": "42mm"
+    },
+    {
+      "idiom": "watch",
+      "role": "companionSettings",
+      "scale": "2x",
+      "size": "29x29"
+    },
+    {
+      "idiom": "watch",
+      "role": "companionSettings",
+      "scale": "3x",
+      "size": "29x29"
+    },
+    {
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "40x40",
+      "subtype": "38mm"
+    },
+    {
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "44x44",
+      "subtype": "40mm"
+    },
+    {
+      "idiom": "watch",
+      "role": "appLauncher",
+      "scale": "2x",
+      "size": "50x50",
+      "subtype": "44mm"
+    },
+    {
+      "idiom": "watch",
+      "role": "quickLook",
+      "scale": "2x",
+      "size": "86x86",
+      "subtype": "38mm"
+    },
+    {
+      "idiom": "watch",
+      "role": "quickLook",
+      "scale": "2x",
+      "size": "98x98",
+      "subtype": "42mm"
+    },
+    {
+      "idiom": "watch",
+      "role": "quickLook",
+      "scale": "2x",
+      "size": "108x108",
+      "subtype": "44mm"
+    },
+    {
+      "idiom": "watch-marketing",
+      "scale": "1x",
+      "size": "1024x1024"
+    },
+    {
+      "idiom": "mac",
+      "scale": "1x",
+      "size": "16x16"
+    },
+    {
+      "idiom": "mac",
+      "scale": "2x",
+      "size": "16x16"
+    },
+    {
+      "idiom": "mac",
+      "scale": "1x",
+      "size": "32x32"
+    },
+    {
+      "idiom": "mac",
+      "scale": "2x",
+      "size": "32x32"
+    },
+    {
+      "idiom": "mac",
+      "scale": "1x",
+      "size": "128x128"
+    },
+    {
+      "idiom": "mac",
+      "scale": "2x",
+      "size": "128x128"
+    },
+    {
+      "idiom": "mac",
+      "scale": "1x",
+      "size": "256x256"
+    },
+    {
+      "idiom": "mac",
+      "scale": "2x",
+      "size": "256x256"
+    },
+    {
+      "idiom": "mac",
+      "scale": "1x",
+      "size": "512x512"
+    },
+    {
+      "idiom": "mac",
+      "scale": "2x",
+      "size": "512x512"
+>>>>>>> 3da6b40a07e76f26c8ce57e034ded0bdaed14f32
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
   }
-}
+}