Browse Source

Main Page UI Tweaks

Frank van den Bos 1 year ago
parent
commit
642c2dd20c

+ 1 - 0
prs.mobile.new/PRS.Mobile.Droid/PRS.Mobile.Droid.csproj

@@ -43,6 +43,7 @@
         <AndroidSigningStorePass>Fr0g50ftw4r3</AndroidSigningStorePass>
         <AndroidPackageFormat>aab</AndroidPackageFormat>
         <DefineConstants></DefineConstants>
+        <AndroidLinkMode>None</AndroidLinkMode>
     </PropertyGroup>
     <ItemGroup>
         <Reference Include="Mono.Android" />

+ 393 - 198
prs.mobile.new/PRS.Mobile.Droid/Resources/Resource.designer.cs

@@ -15,7 +15,7 @@ namespace PRS.Mobile.Droid
 {
 	
 	
-	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.99")]
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.1.111")]
 	public partial class Resource
 	{
 		
@@ -43887,565 +43887,760 @@ namespace PRS.Mobile.Droid
 			public const int arrow_up = 2131165272;
 			
 			// aapt resource value: 0x7F070059
-			public const int Avatar1 = 2131165273;
+			public const int arrow_white_down = 2131165273;
 			
 			// aapt resource value: 0x7F07005A
-			public const int Avatar10 = 2131165274;
+			public const int arrow_white_left = 2131165274;
 			
 			// aapt resource value: 0x7F07005B
-			public const int Avatar11 = 2131165275;
+			public const int arrow_white_right = 2131165275;
 			
 			// aapt resource value: 0x7F07005C
-			public const int Avatar12 = 2131165276;
+			public const int arrow_white_up = 2131165276;
 			
 			// aapt resource value: 0x7F07005D
-			public const int Avatar13 = 2131165277;
+			public const int Avatar1 = 2131165277;
 			
 			// aapt resource value: 0x7F07005E
-			public const int Avatar14 = 2131165278;
+			public const int Avatar10 = 2131165278;
 			
 			// aapt resource value: 0x7F07005F
-			public const int Avatar15 = 2131165279;
+			public const int Avatar11 = 2131165279;
 			
 			// aapt resource value: 0x7F070060
-			public const int Avatar16 = 2131165280;
+			public const int Avatar12 = 2131165280;
 			
 			// aapt resource value: 0x7F070061
-			public const int Avatar17 = 2131165281;
+			public const int Avatar13 = 2131165281;
 			
 			// aapt resource value: 0x7F070062
-			public const int Avatar18 = 2131165282;
+			public const int Avatar14 = 2131165282;
 			
 			// aapt resource value: 0x7F070063
-			public const int Avatar19 = 2131165283;
+			public const int Avatar15 = 2131165283;
 			
 			// aapt resource value: 0x7F070064
-			public const int Avatar2 = 2131165284;
+			public const int Avatar16 = 2131165284;
 			
 			// aapt resource value: 0x7F070065
-			public const int Avatar20 = 2131165285;
+			public const int Avatar17 = 2131165285;
 			
 			// aapt resource value: 0x7F070066
-			public const int Avatar21 = 2131165286;
+			public const int Avatar18 = 2131165286;
 			
 			// aapt resource value: 0x7F070067
-			public const int Avatar22 = 2131165287;
+			public const int Avatar19 = 2131165287;
 			
 			// aapt resource value: 0x7F070068
-			public const int Avatar23 = 2131165288;
+			public const int Avatar2 = 2131165288;
 			
 			// aapt resource value: 0x7F070069
-			public const int Avatar24 = 2131165289;
+			public const int Avatar20 = 2131165289;
 			
 			// aapt resource value: 0x7F07006A
-			public const int Avatar25 = 2131165290;
+			public const int Avatar21 = 2131165290;
 			
 			// aapt resource value: 0x7F07006B
-			public const int Avatar26 = 2131165291;
+			public const int Avatar22 = 2131165291;
 			
 			// aapt resource value: 0x7F07006C
-			public const int Avatar27 = 2131165292;
+			public const int Avatar23 = 2131165292;
 			
 			// aapt resource value: 0x7F07006D
-			public const int Avatar28 = 2131165293;
+			public const int Avatar24 = 2131165293;
 			
 			// aapt resource value: 0x7F07006E
-			public const int Avatar29 = 2131165294;
+			public const int Avatar25 = 2131165294;
 			
 			// aapt resource value: 0x7F07006F
-			public const int Avatar3 = 2131165295;
+			public const int Avatar26 = 2131165295;
 			
 			// aapt resource value: 0x7F070070
-			public const int Avatar30 = 2131165296;
+			public const int Avatar27 = 2131165296;
 			
 			// aapt resource value: 0x7F070071
-			public const int Avatar4 = 2131165297;
+			public const int Avatar28 = 2131165297;
 			
 			// aapt resource value: 0x7F070072
-			public const int Avatar5 = 2131165298;
+			public const int Avatar29 = 2131165298;
 			
 			// aapt resource value: 0x7F070073
-			public const int Avatar6 = 2131165299;
+			public const int Avatar3 = 2131165299;
 			
 			// aapt resource value: 0x7F070074
-			public const int Avatar7 = 2131165300;
+			public const int Avatar30 = 2131165300;
 			
 			// aapt resource value: 0x7F070075
-			public const int Avatar8 = 2131165301;
+			public const int Avatar4 = 2131165301;
 			
 			// aapt resource value: 0x7F070076
-			public const int Avatar9 = 2131165302;
+			public const int Avatar5 = 2131165302;
 			
 			// aapt resource value: 0x7F070077
-			public const int avd_hide_password = 2131165303;
+			public const int Avatar6 = 2131165303;
 			
 			// aapt resource value: 0x7F070078
-			public const int avd_show_password = 2131165304;
+			public const int Avatar7 = 2131165304;
 			
 			// aapt resource value: 0x7F070079
-			public const int Bookmark = 2131165305;
+			public const int Avatar8 = 2131165305;
 			
 			// aapt resource value: 0x7F07007A
-			public const int border_layout = 2131165306;
+			public const int Avatar9 = 2131165306;
 			
 			// aapt resource value: 0x7F07007B
-			public const int btn_checkbox_checked_mtrl = 2131165307;
+			public const int avd_hide_password = 2131165307;
 			
 			// aapt resource value: 0x7F07007C
-			public const int btn_checkbox_checked_to_unchecked_mtrl_animation = 2131165308;
+			public const int avd_show_password = 2131165308;
 			
 			// aapt resource value: 0x7F07007D
-			public const int btn_checkbox_unchecked_mtrl = 2131165309;
+			public const int badge = 2131165309;
 			
 			// aapt resource value: 0x7F07007E
-			public const int btn_checkbox_unchecked_to_checked_mtrl_animation = 2131165310;
+			public const int barcode = 2131165310;
 			
 			// aapt resource value: 0x7F07007F
-			public const int btn_radio_off_mtrl = 2131165311;
+			public const int Bookmark = 2131165311;
 			
 			// aapt resource value: 0x7F070080
-			public const int btn_radio_off_to_on_mtrl_animation = 2131165312;
+			public const int bookmark_gray = 2131165312;
 			
 			// aapt resource value: 0x7F070081
-			public const int btn_radio_on_mtrl = 2131165313;
+			public const int bookmark_green = 2131165313;
 			
 			// aapt resource value: 0x7F070082
-			public const int btn_radio_on_to_off_mtrl_animation = 2131165314;
+			public const int books = 2131165314;
 			
 			// aapt resource value: 0x7F070083
-			public const int CheckableMaterialColor = 2131165315;
+			public const int border_layout = 2131165315;
 			
 			// aapt resource value: 0x7F070084
-			public const int clear_button_icon = 2131165316;
+			public const int btn_checkbox_checked_mtrl = 2131165316;
 			
 			// aapt resource value: 0x7F070085
-			public const int common_full_open_on_phone = 2131165317;
+			public const int btn_checkbox_checked_to_unchecked_mtrl_animation = 2131165317;
 			
 			// aapt resource value: 0x7F070086
-			public const int common_google_signin_btn_icon_dark = 2131165318;
+			public const int btn_checkbox_unchecked_mtrl = 2131165318;
 			
 			// aapt resource value: 0x7F070087
-			public const int common_google_signin_btn_icon_dark_focused = 2131165319;
+			public const int btn_checkbox_unchecked_to_checked_mtrl_animation = 2131165319;
 			
 			// aapt resource value: 0x7F070088
-			public const int common_google_signin_btn_icon_dark_normal = 2131165320;
+			public const int btn_radio_off_mtrl = 2131165320;
 			
 			// aapt resource value: 0x7F070089
-			public const int common_google_signin_btn_icon_dark_normal_background = 2131165321;
+			public const int btn_radio_off_to_on_mtrl_animation = 2131165321;
 			
 			// aapt resource value: 0x7F07008A
-			public const int common_google_signin_btn_icon_disabled = 2131165322;
+			public const int btn_radio_on_mtrl = 2131165322;
 			
 			// aapt resource value: 0x7F07008B
-			public const int common_google_signin_btn_icon_light = 2131165323;
+			public const int btn_radio_on_to_off_mtrl_animation = 2131165323;
 			
 			// aapt resource value: 0x7F07008C
-			public const int common_google_signin_btn_icon_light_focused = 2131165324;
+			public const int cache = 2131165324;
 			
 			// aapt resource value: 0x7F07008D
-			public const int common_google_signin_btn_icon_light_normal = 2131165325;
+			public const int camera = 2131165325;
 			
 			// aapt resource value: 0x7F07008E
-			public const int common_google_signin_btn_icon_light_normal_background = 2131165326;
+			public const int certificate = 2131165326;
 			
 			// aapt resource value: 0x7F07008F
-			public const int common_google_signin_btn_text_dark = 2131165327;
+			public const int CheckableMaterialColor = 2131165327;
 			
 			// aapt resource value: 0x7F070090
-			public const int common_google_signin_btn_text_dark_focused = 2131165328;
+			public const int @checked = 2131165328;
 			
 			// aapt resource value: 0x7F070091
-			public const int common_google_signin_btn_text_dark_normal = 2131165329;
+			public const int circle_gray = 2131165329;
 			
 			// aapt resource value: 0x7F070092
-			public const int common_google_signin_btn_text_dark_normal_background = 2131165330;
+			public const int circle_green = 2131165330;
 			
 			// aapt resource value: 0x7F070093
-			public const int common_google_signin_btn_text_disabled = 2131165331;
+			public const int circle_red = 2131165331;
 			
 			// aapt resource value: 0x7F070094
-			public const int common_google_signin_btn_text_light = 2131165332;
+			public const int clear_button_icon = 2131165332;
 			
 			// aapt resource value: 0x7F070095
-			public const int common_google_signin_btn_text_light_focused = 2131165333;
+			public const int clock = 2131165333;
 			
 			// aapt resource value: 0x7F070096
-			public const int common_google_signin_btn_text_light_normal = 2131165334;
+			public const int cloud = 2131165334;
 			
 			// aapt resource value: 0x7F070097
-			public const int common_google_signin_btn_text_light_normal_background = 2131165335;
+			public const int common_full_open_on_phone = 2131165335;
 			
 			// aapt resource value: 0x7F070098
-			public const int custom_thumb = 2131165336;
+			public const int common_google_signin_btn_icon_dark = 2131165336;
 			
 			// aapt resource value: 0x7F070099
-			public const int dashed_border = 2131165337;
+			public const int common_google_signin_btn_icon_dark_focused = 2131165337;
 			
 			// aapt resource value: 0x7F07009A
-			public const int design_fab_background = 2131165338;
+			public const int common_google_signin_btn_icon_dark_normal = 2131165338;
 			
 			// aapt resource value: 0x7F07009B
-			public const int design_ic_visibility = 2131165339;
+			public const int common_google_signin_btn_icon_dark_normal_background = 2131165339;
 			
 			// aapt resource value: 0x7F07009C
-			public const int design_ic_visibility_off = 2131165340;
+			public const int common_google_signin_btn_icon_disabled = 2131165340;
 			
 			// aapt resource value: 0x7F07009D
-			public const int design_password_eye = 2131165341;
+			public const int common_google_signin_btn_icon_light = 2131165341;
 			
 			// aapt resource value: 0x7F07009E
-			public const int design_snackbar_background = 2131165342;
+			public const int common_google_signin_btn_icon_light_focused = 2131165342;
 			
 			// aapt resource value: 0x7F07009F
-			public const int drawable_ripple = 2131165343;
+			public const int common_google_signin_btn_icon_light_normal = 2131165343;
 			
 			// aapt resource value: 0x7F0700A0
-			public const int drawable_ripple_image = 2131165344;
+			public const int common_google_signin_btn_icon_light_normal_background = 2131165344;
 			
 			// aapt resource value: 0x7F0700A1
-			public const int drawable_ripple_outlined = 2131165345;
+			public const int common_google_signin_btn_text_dark = 2131165345;
 			
 			// aapt resource value: 0x7F0700A2
-			public const int drawable_ripple_outlined_with_icon = 2131165346;
+			public const int common_google_signin_btn_text_dark_focused = 2131165346;
 			
 			// aapt resource value: 0x7F0700A3
-			public const int drawable_ripple_text = 2131165347;
+			public const int common_google_signin_btn_text_dark_normal = 2131165347;
 			
 			// aapt resource value: 0x7F0700A4
-			public const int drawable_ripple_with_icon = 2131165348;
+			public const int common_google_signin_btn_text_dark_normal_background = 2131165348;
 			
 			// aapt resource value: 0x7F0700A5
-			public const int drawable_selector = 2131165349;
+			public const int common_google_signin_btn_text_disabled = 2131165349;
 			
 			// aapt resource value: 0x7F0700A6
-			public const int drawable_shape = 2131165350;
+			public const int common_google_signin_btn_text_light = 2131165350;
 			
 			// aapt resource value: 0x7F0700A7
-			public const int drawable_shape_text = 2131165351;
+			public const int common_google_signin_btn_text_light_focused = 2131165351;
 			
 			// aapt resource value: 0x7F0700A8
-			public const int drawable_shape_with_icon = 2131165352;
+			public const int common_google_signin_btn_text_light_normal = 2131165352;
 			
 			// aapt resource value: 0x7F0700A9
-			public const int dropdownbuttonimage = 2131165353;
+			public const int common_google_signin_btn_text_light_normal_background = 2131165353;
 			
 			// aapt resource value: 0x7F0700AA
-			public const int editTextBackground = 2131165354;
+			public const int construction = 2131165354;
 			
 			// aapt resource value: 0x7F0700AB
-			public const int editTextPageCount = 2131165355;
+			public const int cross = 2131165355;
 			
 			// aapt resource value: 0x7F0700AC
-			public const int FormFieldCheckbox = 2131165356;
+			public const int custom_thumb = 2131165356;
 			
 			// aapt resource value: 0x7F0700AD
-			public const int FormFieldCheckbox_Checked = 2131165357;
+			public const int dashed_border = 2131165357;
 			
 			// aapt resource value: 0x7F0700AE
-			public const int FormFieldCheckbox_UnChecked = 2131165358;
+			public const int delivery = 2131165358;
 			
 			// aapt resource value: 0x7F0700AF
-			public const int formfieldradiobuttonstyle = 2131165359;
+			public const int design_fab_background = 2131165359;
 			
 			// aapt resource value: 0x7F0700B0
-			public const int formfieldtextboxcursorcolor = 2131165360;
+			public const int design_ic_visibility = 2131165360;
 			
 			// aapt resource value: 0x7F0700B1
-			public const int googleg_disabled_color_18 = 2131165361;
+			public const int design_ic_visibility_off = 2131165361;
 			
 			// aapt resource value: 0x7F0700B2
-			public const int googleg_standard_color_18 = 2131165362;
-			
-			// aapt resource value: 0x7F0700BA
-			public const int Icon = 2131165370;
+			public const int design_password_eye = 2131165362;
 			
 			// aapt resource value: 0x7F0700B3
-			public const int ic_arrow_down_24dp = 2131165363;
+			public const int design_snackbar_background = 2131165363;
 			
 			// aapt resource value: 0x7F0700B4
-			public const int ic_clock_black_24dp = 2131165364;
+			public const int digitalform = 2131165364;
 			
 			// aapt resource value: 0x7F0700B5
-			public const int ic_keyboard_black_24dp = 2131165365;
+			public const int disconnected = 2131165365;
 			
 			// aapt resource value: 0x7F0700B6
-			public const int ic_mtrl_checked_circle = 2131165366;
+			public const int dots = 2131165366;
 			
 			// aapt resource value: 0x7F0700B7
-			public const int ic_mtrl_chip_checked_black = 2131165367;
+			public const int drawable_ripple = 2131165367;
 			
 			// aapt resource value: 0x7F0700B8
-			public const int ic_mtrl_chip_checked_circle = 2131165368;
+			public const int drawable_ripple_image = 2131165368;
 			
 			// aapt resource value: 0x7F0700B9
-			public const int ic_mtrl_chip_close_circle = 2131165369;
+			public const int drawable_ripple_outlined = 2131165369;
+			
+			// aapt resource value: 0x7F0700BA
+			public const int drawable_ripple_outlined_with_icon = 2131165370;
+			
+			// aapt resource value: 0x7F0700BB
+			public const int drawable_ripple_text = 2131165371;
 			
 			// aapt resource value: 0x7F0700BC
-			public const int inputlayout_togglecollapseicon = 2131165372;
+			public const int drawable_ripple_with_icon = 2131165372;
 			
 			// aapt resource value: 0x7F0700BD
-			public const int inputlayout_togglevisibleicon = 2131165373;
-			
-			// aapt resource value: 0x7F0700BB
-			public const int input_layout_drop_down_icon = 2131165371;
+			public const int drawable_selector = 2131165373;
 			
 			// aapt resource value: 0x7F0700BE
-			public const int layoutBorder = 2131165374;
+			public const int drawable_shape = 2131165374;
 			
 			// aapt resource value: 0x7F0700BF
-			public const int logo = 2131165375;
+			public const int drawable_shape_text = 2131165375;
 			
 			// aapt resource value: 0x7F0700C0
-			public const int material_cursor_drawable = 2131165376;
+			public const int drawable_shape_with_icon = 2131165376;
 			
 			// aapt resource value: 0x7F0700C1
-			public const int material_ic_calendar_black_24dp = 2131165377;
+			public const int drawing = 2131165377;
 			
 			// aapt resource value: 0x7F0700C2
-			public const int material_ic_clear_black_24dp = 2131165378;
+			public const int drill = 2131165378;
 			
 			// aapt resource value: 0x7F0700C3
-			public const int material_ic_edit_black_24dp = 2131165379;
+			public const int dropdownbuttonimage = 2131165379;
 			
 			// aapt resource value: 0x7F0700C4
-			public const int material_ic_keyboard_arrow_left_black_24dp = 2131165380;
+			public const int editTextBackground = 2131165380;
 			
 			// aapt resource value: 0x7F0700C5
-			public const int material_ic_keyboard_arrow_next_black_24dp = 2131165381;
+			public const int editTextPageCount = 2131165381;
 			
 			// aapt resource value: 0x7F0700C6
-			public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165382;
+			public const int factory = 2131165382;
 			
 			// aapt resource value: 0x7F0700C7
-			public const int material_ic_keyboard_arrow_right_black_24dp = 2131165383;
+			public const int flowchart = 2131165383;
 			
 			// aapt resource value: 0x7F0700C8
-			public const int material_ic_menu_arrow_down_black_24dp = 2131165384;
+			public const int folder = 2131165384;
 			
 			// aapt resource value: 0x7F0700C9
-			public const int material_ic_menu_arrow_up_black_24dp = 2131165385;
+			public const int FormFieldCheckbox = 2131165385;
 			
 			// aapt resource value: 0x7F0700CA
-			public const int More = 2131165386;
+			public const int FormFieldCheckbox_Checked = 2131165386;
 			
 			// aapt resource value: 0x7F0700CB
-			public const int mtrl_dialog_background = 2131165387;
+			public const int FormFieldCheckbox_UnChecked = 2131165387;
 			
 			// aapt resource value: 0x7F0700CC
-			public const int mtrl_dropdown_arrow = 2131165388;
+			public const int formfieldradiobuttonstyle = 2131165388;
 			
 			// aapt resource value: 0x7F0700CD
-			public const int mtrl_ic_arrow_drop_down = 2131165389;
+			public const int formfieldtextboxcursorcolor = 2131165389;
 			
 			// aapt resource value: 0x7F0700CE
-			public const int mtrl_ic_arrow_drop_up = 2131165390;
+			public const int googleg_disabled_color_18 = 2131165390;
 			
 			// aapt resource value: 0x7F0700CF
-			public const int mtrl_ic_cancel = 2131165391;
+			public const int googleg_standard_color_18 = 2131165391;
 			
 			// aapt resource value: 0x7F0700D0
-			public const int mtrl_ic_error = 2131165392;
+			public const int holiday = 2131165392;
+			
+			// aapt resource value: 0x7F0700D8
+			public const int Icon = 2131165400;
 			
 			// aapt resource value: 0x7F0700D1
-			public const int mtrl_navigation_bar_item_background = 2131165393;
+			public const int ic_arrow_down_24dp = 2131165393;
 			
 			// aapt resource value: 0x7F0700D2
-			public const int mtrl_popupmenu_background = 2131165394;
+			public const int ic_clock_black_24dp = 2131165394;
 			
 			// aapt resource value: 0x7F0700D3
-			public const int mtrl_popupmenu_background_dark = 2131165395;
+			public const int ic_keyboard_black_24dp = 2131165395;
 			
 			// aapt resource value: 0x7F0700D4
-			public const int mtrl_tabs_default_indicator = 2131165396;
+			public const int ic_mtrl_checked_circle = 2131165396;
 			
 			// aapt resource value: 0x7F0700D5
-			public const int navigation_empty_icon = 2131165397;
+			public const int ic_mtrl_chip_checked_black = 2131165397;
 			
 			// aapt resource value: 0x7F0700D6
-			public const int NodeCollapse = 2131165398;
+			public const int ic_mtrl_chip_checked_circle = 2131165398;
 			
 			// aapt resource value: 0x7F0700D7
-			public const int NodeExpand = 2131165399;
-			
-			// aapt resource value: 0x7F0700D8
-			public const int notification_action_background = 2131165400;
-			
-			// aapt resource value: 0x7F0700D9
-			public const int notification_bg = 2131165401;
+			public const int ic_mtrl_chip_close_circle = 2131165399;
 			
 			// aapt resource value: 0x7F0700DA
-			public const int notification_bg_low = 2131165402;
+			public const int inputlayout_togglecollapseicon = 2131165402;
 			
 			// aapt resource value: 0x7F0700DB
-			public const int notification_bg_low_normal = 2131165403;
+			public const int inputlayout_togglevisibleicon = 2131165403;
+			
+			// aapt resource value: 0x7F0700D9
+			public const int input_layout_drop_down_icon = 2131165401;
 			
 			// aapt resource value: 0x7F0700DC
-			public const int notification_bg_low_pressed = 2131165404;
+			public const int key = 2131165404;
 			
 			// aapt resource value: 0x7F0700DD
-			public const int notification_bg_normal = 2131165405;
+			public const int layoutBorder = 2131165405;
 			
 			// aapt resource value: 0x7F0700DE
-			public const int notification_bg_normal_pressed = 2131165406;
+			public const int lines = 2131165406;
 			
 			// aapt resource value: 0x7F0700DF
-			public const int notification_icon_background = 2131165407;
+			public const int logo = 2131165407;
 			
 			// aapt resource value: 0x7F0700E0
-			public const int notification_template_icon_bg = 2131165408;
+			public const int map = 2131165408;
 			
 			// aapt resource value: 0x7F0700E1
-			public const int notification_template_icon_low_bg = 2131165409;
+			public const int material_cursor_drawable = 2131165409;
 			
 			// aapt resource value: 0x7F0700E2
-			public const int notification_tile_bg = 2131165410;
+			public const int material_ic_calendar_black_24dp = 2131165410;
 			
 			// aapt resource value: 0x7F0700E3
-			public const int notify_panel_notification_icon_bg = 2131165411;
+			public const int material_ic_clear_black_24dp = 2131165411;
 			
 			// aapt resource value: 0x7F0700E4
-			public const int PasswordAlertDialogBottomLine = 2131165412;
+			public const int material_ic_edit_black_24dp = 2131165412;
 			
 			// aapt resource value: 0x7F0700E5
-			public const int PasswordAlertDialogCursorStyle = 2131165413;
+			public const int material_ic_keyboard_arrow_left_black_24dp = 2131165413;
 			
 			// aapt resource value: 0x7F0700E6
-			public const int popup_forms_android_close_icon = 2131165414;
+			public const int material_ic_keyboard_arrow_next_black_24dp = 2131165414;
 			
 			// aapt resource value: 0x7F0700E7
-			public const int popup_forms_android_shadow = 2131165415;
+			public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165415;
 			
 			// aapt resource value: 0x7F0700E8
-			public const int popup_forms_dark_theme_close_icon = 2131165416;
+			public const int material_ic_keyboard_arrow_right_black_24dp = 2131165416;
 			
 			// aapt resource value: 0x7F0700E9
-			public const int popup_forms_light_theme_close_icon = 2131165417;
+			public const int material_ic_menu_arrow_down_black_24dp = 2131165417;
 			
 			// aapt resource value: 0x7F0700EA
-			public const int preference_list_divider_material = 2131165418;
+			public const int material_ic_menu_arrow_up_black_24dp = 2131165418;
 			
 			// aapt resource value: 0x7F0700EB
-			public const int Recurrence = 2131165419;
+			public const int meeting = 2131165419;
 			
 			// aapt resource value: 0x7F0700EC
-			public const int roundCornerButton = 2131165420;
+			public const int menu = 2131165420;
 			
 			// aapt resource value: 0x7F0700ED
-			public const int savebutton = 2131165421;
+			public const int minus = 2131165421;
 			
 			// aapt resource value: 0x7F0700EE
-			public const int Search = 2131165422;
+			public const int More = 2131165422;
 			
 			// aapt resource value: 0x7F0700EF
-			public const int Separator = 2131165423;
+			public const int mtrl_dialog_background = 2131165423;
 			
 			// aapt resource value: 0x7F0700F0
-			public const int sfcheckbox_animation = 2131165424;
+			public const int mtrl_dropdown_arrow = 2131165424;
 			
 			// aapt resource value: 0x7F0700F1
-			public const int sfcheckbox_checked = 2131165425;
+			public const int mtrl_ic_arrow_drop_down = 2131165425;
 			
 			// aapt resource value: 0x7F0700F2
-			public const int sfcheckbox_checked_indeterminate = 2131165426;
+			public const int mtrl_ic_arrow_drop_up = 2131165426;
 			
 			// aapt resource value: 0x7F0700F3
-			public const int sfcheckbox_checked_unchecked = 2131165427;
+			public const int mtrl_ic_cancel = 2131165427;
 			
 			// aapt resource value: 0x7F0700F4
-			public const int sfcheckbox_indeterminate = 2131165428;
+			public const int mtrl_ic_error = 2131165428;
 			
 			// aapt resource value: 0x7F0700F5
-			public const int sfcheckbox_indeterminate_checked = 2131165429;
+			public const int mtrl_navigation_bar_item_background = 2131165429;
 			
 			// aapt resource value: 0x7F0700F6
-			public const int sfcheckbox_indeterminate_unchecked = 2131165430;
+			public const int mtrl_popupmenu_background = 2131165430;
 			
 			// aapt resource value: 0x7F0700F7
-			public const int sfcheckbox_unchecked = 2131165431;
+			public const int mtrl_popupmenu_background_dark = 2131165431;
 			
 			// aapt resource value: 0x7F0700F8
-			public const int sfcheckbox_unchecked_checked = 2131165432;
+			public const int mtrl_tabs_default_indicator = 2131165432;
 			
 			// aapt resource value: 0x7F0700F9
-			public const int sfcheckbox_unchecked_indeterminate = 2131165433;
+			public const int navigation_empty_icon = 2131165433;
 			
 			// aapt resource value: 0x7F0700FA
-			public const int sfprogressbar_determinate_linear = 2131165434;
+			public const int NodeCollapse = 2131165434;
 			
 			// aapt resource value: 0x7F0700FB
-			public const int sfprogressbar_indeterminate_circular = 2131165435;
+			public const int NodeExpand = 2131165435;
 			
 			// aapt resource value: 0x7F0700FC
-			public const int sfprogressbar_indeterminate_linear = 2131165436;
+			public const int notification = 2131165436;
 			
 			// aapt resource value: 0x7F0700FD
-			public const int shadow_effect = 2131165437;
+			public const int notification_action_background = 2131165437;
 			
 			// aapt resource value: 0x7F0700FE
-			public const int SignaturePadBottomCorner = 2131165438;
+			public const int notification_bg = 2131165438;
 			
 			// aapt resource value: 0x7F0700FF
-			public const int SignaturepadRoundedCorners = 2131165439;
+			public const int notification_bg_low = 2131165439;
 			
 			// aapt resource value: 0x7F070100
-			public const int SignaturePadTopCorner = 2131165440;
+			public const int notification_bg_low_normal = 2131165440;
 			
 			// aapt resource value: 0x7F070101
-			public const int splash = 2131165441;
+			public const int notification_bg_low_pressed = 2131165441;
 			
 			// aapt resource value: 0x7F070102
-			public const int test_custom_background = 2131165442;
+			public const int notification_bg_normal = 2131165442;
 			
 			// aapt resource value: 0x7F070103
-			public const int text_color_button = 2131165443;
+			public const int notification_bg_normal_pressed = 2131165443;
 			
 			// aapt resource value: 0x7F070104
-			public const int toolbaritem_background = 2131165444;
+			public const int notification_icon_background = 2131165444;
 			
 			// aapt resource value: 0x7F070105
-			public const int toolbaritem_pressed = 2131165445;
+			public const int notification_template_icon_bg = 2131165445;
 			
 			// aapt resource value: 0x7F070106
-			public const int tooltip_frame_dark = 2131165446;
+			public const int notification_template_icon_low_bg = 2131165446;
 			
 			// aapt resource value: 0x7F070107
-			public const int tooltip_frame_light = 2131165447;
-			
-			// aapt resource value: 0x7F070109
-			public const int undoButton = 2131165449;
+			public const int notification_tile_bg = 2131165447;
 			
 			// aapt resource value: 0x7F070108
-			public const int undo_redo_background = 2131165448;
+			public const int notify_panel_notification_icon_bg = 2131165448;
+			
+			// aapt resource value: 0x7F070109
+			public const int paperclip = 2131165449;
 			
 			// aapt resource value: 0x7F07010A
-			public const int Viewmode = 2131165450;
+			public const int PasswordAlertDialogBottomLine = 2131165450;
 			
 			// aapt resource value: 0x7F07010B
-			public const int xf_arrow_dropdown = 2131165451;
+			public const int PasswordAlertDialogCursorStyle = 2131165451;
 			
 			// aapt resource value: 0x7F07010C
-			public const int xf_arrow_right = 2131165452;
+			public const int person = 2131165452;
 			
 			// aapt resource value: 0x7F07010D
-			public const int xf_check = 2131165453;
+			public const int phone = 2131165453;
 			
 			// aapt resource value: 0x7F07010E
-			public const int xf_checkbox_selected = 2131165454;
+			public const int plus = 2131165454;
 			
 			// aapt resource value: 0x7F07010F
-			public const int xf_checkbox_unselected = 2131165455;
+			public const int popup_forms_android_close_icon = 2131165455;
 			
 			// aapt resource value: 0x7F070110
-			public const int xf_clear = 2131165456;
+			public const int popup_forms_android_shadow = 2131165456;
 			
 			// aapt resource value: 0x7F070111
-			public const int xf_error = 2131165457;
+			public const int popup_forms_dark_theme_close_icon = 2131165457;
 			
 			// aapt resource value: 0x7F070112
-			public const int xf_radio_button_selected = 2131165458;
+			public const int popup_forms_light_theme_close_icon = 2131165458;
 			
 			// aapt resource value: 0x7F070113
-			public const int xf_radio_button_unselected = 2131165459;
+			public const int preference_list_divider_material = 2131165459;
+			
+			// aapt resource value: 0x7F070114
+			public const int print = 2131165460;
+			
+			// aapt resource value: 0x7F070115
+			public const int question = 2131165461;
+			
+			// aapt resource value: 0x7F070116
+			public const int Recurrence = 2131165462;
+			
+			// aapt resource value: 0x7F070117
+			public const int refresh = 2131165463;
+			
+			// aapt resource value: 0x7F070118
+			public const int roundCornerButton = 2131165464;
+			
+			// aapt resource value: 0x7F070119
+			public const int save = 2131165465;
+			
+			// aapt resource value: 0x7F07011A
+			public const int savebutton = 2131165466;
+			
+			// aapt resource value: 0x7F07011B
+			public const int schedule = 2131165467;
+			
+			// aapt resource value: 0x7F07011C
+			public const int Search = 2131165468;
+			
+			// aapt resource value: 0x7F07011D
+			public const int Separator = 2131165469;
+			
+			// aapt resource value: 0x7F07011E
+			public const int settings = 2131165470;
+			
+			// aapt resource value: 0x7F07011F
+			public const int sfcheckbox_animation = 2131165471;
+			
+			// aapt resource value: 0x7F070120
+			public const int sfcheckbox_checked = 2131165472;
+			
+			// aapt resource value: 0x7F070121
+			public const int sfcheckbox_checked_indeterminate = 2131165473;
+			
+			// aapt resource value: 0x7F070122
+			public const int sfcheckbox_checked_unchecked = 2131165474;
+			
+			// aapt resource value: 0x7F070123
+			public const int sfcheckbox_indeterminate = 2131165475;
+			
+			// aapt resource value: 0x7F070124
+			public const int sfcheckbox_indeterminate_checked = 2131165476;
+			
+			// aapt resource value: 0x7F070125
+			public const int sfcheckbox_indeterminate_unchecked = 2131165477;
+			
+			// aapt resource value: 0x7F070126
+			public const int sfcheckbox_unchecked = 2131165478;
+			
+			// aapt resource value: 0x7F070127
+			public const int sfcheckbox_unchecked_checked = 2131165479;
+			
+			// aapt resource value: 0x7F070128
+			public const int sfcheckbox_unchecked_indeterminate = 2131165480;
+			
+			// aapt resource value: 0x7F070129
+			public const int sfprogressbar_determinate_linear = 2131165481;
+			
+			// aapt resource value: 0x7F07012A
+			public const int sfprogressbar_indeterminate_circular = 2131165482;
+			
+			// aapt resource value: 0x7F07012B
+			public const int sfprogressbar_indeterminate_linear = 2131165483;
+			
+			// aapt resource value: 0x7F07012C
+			public const int shadow_effect = 2131165484;
+			
+			// aapt resource value: 0x7F07012D
+			public const int share = 2131165485;
+			
+			// aapt resource value: 0x7F07012E
+			public const int sharedcross = 2131165486;
+			
+			// aapt resource value: 0x7F07012F
+			public const int sharedtick = 2131165487;
+			
+			// aapt resource value: 0x7F070130
+			public const int shoppingcart = 2131165488;
+			
+			// aapt resource value: 0x7F070131
+			public const int SignaturePadBottomCorner = 2131165489;
+			
+			// aapt resource value: 0x7F070132
+			public const int SignaturepadRoundedCorners = 2131165490;
+			
+			// aapt resource value: 0x7F070133
+			public const int SignaturePadTopCorner = 2131165491;
+			
+			// aapt resource value: 0x7F070134
+			public const int splash = 2131165492;
+			
+			// aapt resource value: 0x7F070135
+			public const int stock = 2131165493;
+			
+			// aapt resource value: 0x7F070136
+			public const int stock_issue = 2131165494;
+			
+			// aapt resource value: 0x7F070137
+			public const int stock_receive = 2131165495;
+			
+			// aapt resource value: 0x7F070138
+			public const int stock_relocate = 2131165496;
+			
+			// aapt resource value: 0x7F070139
+			public const int stock_search = 2131165497;
+			
+			// aapt resource value: 0x7F07013A
+			public const int stock_stocktake = 2131165498;
+			
+			// aapt resource value: 0x7F07013B
+			public const int stock_transfer = 2131165499;
+			
+			// aapt resource value: 0x7F07013C
+			public const int task = 2131165500;
+			
+			// aapt resource value: 0x7F07013D
+			public const int test_custom_background = 2131165501;
+			
+			// aapt resource value: 0x7F07013E
+			public const int text_color_button = 2131165502;
+			
+			// aapt resource value: 0x7F07013F
+			public const int tick = 2131165503;
+			
+			// aapt resource value: 0x7F070140
+			public const int toolbaritem_background = 2131165504;
+			
+			// aapt resource value: 0x7F070141
+			public const int toolbaritem_pressed = 2131165505;
+			
+			// aapt resource value: 0x7F070142
+			public const int tooltip_frame_dark = 2131165506;
+			
+			// aapt resource value: 0x7F070143
+			public const int tooltip_frame_light = 2131165507;
+			
+			// aapt resource value: 0x7F070144
+			public const int trolley = 2131165508;
+			
+			// aapt resource value: 0x7F070145
+			public const int @unchecked = 2131165509;
+			
+			// aapt resource value: 0x7F070147
+			public const int undoButton = 2131165511;
+			
+			// aapt resource value: 0x7F070146
+			public const int undo_redo_background = 2131165510;
+			
+			// aapt resource value: 0x7F070148
+			public const int version = 2131165512;
+			
+			// aapt resource value: 0x7F070149
+			public const int Viewmode = 2131165513;
+			
+			// aapt resource value: 0x7F07014A
+			public const int warehouse = 2131165514;
+			
+			// aapt resource value: 0x7F07014B
+			public const int warning = 2131165515;
+			
+			// aapt resource value: 0x7F07014C
+			public const int xf_arrow_dropdown = 2131165516;
+			
+			// aapt resource value: 0x7F07014D
+			public const int xf_arrow_right = 2131165517;
+			
+			// aapt resource value: 0x7F07014E
+			public const int xf_check = 2131165518;
+			
+			// aapt resource value: 0x7F07014F
+			public const int xf_checkbox_selected = 2131165519;
+			
+			// aapt resource value: 0x7F070150
+			public const int xf_checkbox_unselected = 2131165520;
+			
+			// aapt resource value: 0x7F070151
+			public const int xf_clear = 2131165521;
+			
+			// aapt resource value: 0x7F070152
+			public const int xf_error = 2131165522;
+			
+			// aapt resource value: 0x7F070153
+			public const int xf_radio_button_selected = 2131165523;
+			
+			// aapt resource value: 0x7F070154
+			public const int xf_radio_button_unselected = 2131165524;
 			
 			static Drawable()
 			{

+ 32 - 16
prs.mobile.new/PRS.Mobile/MainPage.xaml

@@ -106,98 +106,114 @@
                         x:Name="Assignments"
                         Text="Assignments"
                         Image="schedule"
-                        Clicked="AssignmentListTapped"/>  
+                        Clicked="AssignmentListTapped"
+                        IsEnabled="False"/>  
                     
                     <mobile:MobileToolItem
                         x:Name="Deliveries"
                         Text="Deliveries"
                         Image="delivery"
-                        Clicked="DeliveryModuleTapped"/>
+                        Clicked="DeliveryModuleTapped"
+                        IsEnabled="False"/>
                     
                     <mobile:MobileToolItem
                         x:Name="Equipment"
                         Text="Equipment"
                         Image="drill"
-                        Clicked="EquipmentModuleTapped"/>  
+                        Clicked="EquipmentModuleTapped"
+                        IsEnabled="False"/>  
                     
                     <mobile:MobileToolItem
                         x:Name="Forms"
                         Text="Forms"
                         Image="digitalform"
-                        Clicked="KanbanFormsTapped"/>  
+                        Clicked="KanbanFormsTapped"
+                        IsEnabled="False"/>  
                                 
                     <mobile:MobileToolItem
                         x:Name="InOut"
                         Text="In/Out"
                         Image="clock"
-                        Clicked="StaffStatusPageTapped"/>  
+                        Clicked="StaffStatusPageTapped"
+                        IsEnabled="False"/>  
                     
                     <mobile:MobileToolItem
                         x:Name="Manufacturing"
                         Text="Factory"
                         Image="factory"
-                        Clicked="ManufacturingListTapped"/>  
+                        Clicked="ManufacturingListTapped"
+                        IsEnabled="False"/>  
                     
                     <mobile:MobileToolItem
                         x:Name="Meetings"
                         Text="Meetings"
                         Image="meeting"
-                        Clicked="MeetingsModuleTapped"/>  
+                        Clicked="MeetingsModuleTapped"
+                        IsEnabled="False"/>  
                     
                     <mobile:MobileToolItem
                         x:Name="MyHR"
                         Text="My HR"
                         Image="person"
-                        Clicked="HumanResourcesModuleTapped"/>  
+                        Clicked="HumanResourcesModuleTapped"
+                        IsEnabled="False"/>  
                                 
                     <mobile:MobileToolItem
                         x:Name="Notifications"
                         Text="Notifications"
                         Image="notification"
-                        Clicked="NotificationListTapped"/>  
+                        Clicked="NotificationListTapped"
+                        IsEnabled="False"/>  
                                 
                     <mobile:MobileToolItem
                         x:Name="Products"
                         Text="Products"
                         Image="stock"
-                        Clicked="ProductListTapped"/>  
+                        Clicked="ProductListTapped"
+                        IsEnabled="False"/>  
                                 
                     <mobile:MobileToolItem
                         x:Name="PurchaseOrders"
                         Text="Orders"
                         Image="shoppingcart"
-                        Clicked="PurchaseOrderListTapped"/>  
+                        Clicked="PurchaseOrderListTapped"
+                        IsEnabled="False"/>  
                                 
                     <mobile:MobileToolItem
                         x:Name="Site"
                         Text="Site"
                         Image="construction"
-                        Clicked="SiteModuleTapped"/>  
+                        Clicked="SiteModuleTapped"
+                        IsEnabled="False"/>  
                                 
                     <mobile:MobileToolItem
                         x:Name="StoreRequis"
                         Text="Stores"
                         Image="trolley"
-                        Clicked="StoreRequiListTapped"/>  
+                        Clicked="StoreRequiListTapped"
+                        IsEnabled="False"/>  
                                 
                     <mobile:MobileToolItem
                         x:Name="MyTasks"
                         Text="My Tasks"
                         Image="task"
-                        Clicked="KanbanListTapped"/>  
+                        Clicked="KanbanListTapped"
+                        IsEnabled="False"/>  
                                 
                     <mobile:MobileToolItem
                         x:Name="Warehousing"
                         Text="Warehouse"
                         Image="warehouse"
-                        Clicked="WarehouseModuleTapped"/>  
+                        Clicked="WarehouseModuleTapped"
+                        IsEnabled="False"/>  
                     
                     <mobile:MobileToolItem
                         x:Name="Update"
                         Text="Update App"
                         Image="version"
                         IsVisible="False"
-                        Clicked="UpdatePageTapped"/>  
+                        Clicked="UpdatePageTapped"
+                        IsEnabled="False"/>  
      
                 </mobile:MobileToolGrid.Items>
                 

+ 54 - 87
prs.mobile.new/PRS.Mobile/MainPage.xaml.cs

@@ -56,13 +56,28 @@ namespace PRS.Mobile
             {
                 Task.Run(() => App.Data.GPSTrackers.Refresh(false)),
                 Task.Run(() => App.Data.BluetoothGates.Refresh(false)),
+                Task.Run(() => CheckTimeSheet())
             };
             
+            App.Data.GPSLocationUpdated += OnGPSLocationUpdated;
+            App.Data.BluetoothScanFinished += OnBluetothScanFinished;
+            
             InitializeComponent();
             
-            SetupClockOnButton(_settings.ClockOnDisabled);
+            ProgressVisible = true;
             
-            InitNotificationCentre();
+            // LocalNotificationCenter.Current.NotificationActionTapped += (Plugin.LocalNotification.EventArgs.NotificationActionEventArgs e) =>
+            // {
+            //     if (MainPageUtils.DetermineCorrectPage(e) != null)
+            //     {
+            //         Device.BeginInvokeOnMainThread(() =>
+            //         {
+            //             Navigation.PushAsync(MainPageUtils.DetermineCorrectPage(e));
+            //         });
+            //     }
+            // };
+            //
+            // MainPageUtils.OnMainPageNotificationsChanged += RefreshOnNotificationsChange;
             
             MessagingCenter.Subscribe<App>(this, App.MessageOnResume,
                 (o) =>
@@ -84,25 +99,17 @@ namespace PRS.Mobile
 
         protected override void OnAppearing()
         {
+            _pollingToken = new CancellationTokenSource();
+                
+            StartMonitoringNotifications();
+            StartMonitoringTasks();
+            StartMonitoringVersion();
+            StartMonitoringEmpoyeeDetails();
+            
             //ProgressVisible = false;
             if (_selectionpage == null)
             {
-                _pollingToken = new CancellationTokenSource();
                 
-                BackButtonEnabled = App.IsSharedDevice;
-
-                EnableModules();
-
-                StartMonitoringNotifications();
-                StartMonitoringTasks();
-                StartMonitoringVersion();
-                StartMonitoringEmpoyeeDetails();
-
-                //StartPromptingForUpdates();
-
-                App.Data.GPSLocationUpdated += OnGPSLocationUpdated;
-                App.Data.BluetoothScanFinished += OnBluetothScanFinished;
-
                 //LoadHRToDos(); to be uncommented when ready for roll out
 
                 CheckTimeSheet();
@@ -112,6 +119,8 @@ namespace PRS.Mobile
 
             Task.WaitAll(_setuptasks);
 
+            ProgressVisible = false;
+
             RefreshScreen();
             base.OnAppearing();
         }
@@ -120,9 +129,6 @@ namespace PRS.Mobile
         {
             base.OnDisappearing();
             
-            //App.Data.GPSLocationUpdated -= OnGPSLocationUpdated;
-            //App.Data.BluetoothScanFinished -= OnBluetothScanFinished;
-            
             _pollingToken.Cancel();
         }
         
@@ -150,7 +156,7 @@ namespace PRS.Mobile
             taskBtn.IsVisible = !disable;
         }
 
-        private void EnableModules()
+        private void SetupModules()
         {          
             SetupClockOnButton(Security.IsAllowed<IsJobOnlyEmployee>());
 
@@ -298,39 +304,15 @@ namespace PRS.Mobile
                 token
             );
         }
-
-        
-        
-        // private void StartPromptingForUpdates()
-        // {
-        //     var token = _pollingToken.Token;
-        //     Task.Run(
-        //         () =>
-        //         {
-        //             while (!token.IsCancellationRequested)
-        //             {
-        //                 bool isLatest = MobileUtils.AppVersion.IsUsingLatestVersion().Result;
-        //                 if (!isLatest)
-        //                 {
-        //                     string latestVersionNumber = MobileUtils.AppVersion.GetLatestVersionNumber().Result;
-        //                     string chosenOption = DisplayActionSheet(
-        //                         $"Version {latestVersionNumber} Available. Update now?",
-        //                         "You will be reminded again in 10 minutes.", null, "Yes", "No").Result;
-        //                     if (String.Equals(chosenOption,"Yes"))
-        //                         Dispatcher.BeginInvokeOnMainThread(() => { MobileUtils.AppVersion.OpenAppInStore(); });
-        //                 }
-        //
-        //                 Task.Delay(TimeSpan.FromMinutes(10), token)
-        //                     .Wait(token);
-        //             }
-        //             
-        //         }
-        //         , token
-        //     );
-        // }
         
         private void RefreshScreen()
         {
+         
+            BackButtonEnabled = App.IsSharedDevice;
+
+            SetupModules();
+            
+            SetupClockOnButton(_settings.ClockOnDisabled);
             
             bool GateReady = CheckLocation();
 
@@ -375,6 +357,7 @@ namespace PRS.Mobile
             Forms.IsEnabled = App.Data.IsConnected();
             InOut.IsEnabled = App.Data.IsConnected();
             MyHR.IsEnabled = App.Data.IsConnected();
+            Meetings.IsEnabled = App.Data.IsConnected();
             Notifications.IsEnabled = App.Data.IsConnected();
             Products.IsEnabled = App.Data.IsConnected();
             PurchaseOrders.IsEnabled = App.Data.IsConnected();
@@ -399,31 +382,31 @@ namespace PRS.Mobile
                     .And(x => x.Finish).IsEqualTo(TimeSpan.Zero);
                 var table = client.Query(filter);
                 _currenttimesheet = table.Rows.FirstOrDefault()?.ToObject<TimeSheet>();
-            }
-
-            var token = _pollingToken.Token;
-            Task.Run(
-                () =>
-                {
-                    while (!token.IsCancellationRequested)
+                    
+                var token = _pollingToken.Token;
+                Task.Run(
+                    () =>
                     {
-                        if (_currenttimesheet != null)
+                        while (!token.IsCancellationRequested)
                         {
-                            if (_currenttimesheet.Date != DateTime.Today)
+                            if (_currenttimesheet != null)
                             {
-                                var here = GPSLocation();
-                                _currenttimesheet.FinishLocation = here;
-                                _currenttimesheet.Finish = TimeSpan.FromDays(1).Subtract(TimeSpan.FromSeconds(1));
-                                new Client<TimeSheet>().Save(_currenttimesheet,
-                                    "Closing Timesheet at Modnight on Mobile Device");
-                                CreateTimeSheet(_currenttimesheet.JobLink.ID, _currenttimesheet.JobLink.JobNumber, _currenttimesheet.JobLink.Name, here, here.Address, "Creating Timeheet at Midnight on Mobile Device");
+                                if (_currenttimesheet.Date != DateTime.Today)
+                                {
+                                    var here = GPSLocation();
+                                    _currenttimesheet.FinishLocation = here;
+                                    _currenttimesheet.Finish = TimeSpan.FromDays(1).Subtract(TimeSpan.FromSeconds(1));
+                                    new Client<TimeSheet>().Save(_currenttimesheet,
+                                        "Closing Timesheet at Modnight on Mobile Device");
+                                    CreateTimeSheet(_currenttimesheet.JobLink.ID, _currenttimesheet.JobLink.JobNumber, _currenttimesheet.JobLink.Name, here, here.Address, "Creating Timeheet at Midnight on Mobile Device");
+                                }
                             }
+                            Task.Delay(TimeSpan.FromMinutes(1), token).Wait(token);
                         }
-                        Task.Delay(TimeSpan.FromMinutes(1), token).Wait(token);
-                    }
-                },
-                token
-            );
+                    },
+                    token
+                );
+            }
         }
         
         private DateTime _debounce = DateTime.MinValue;
@@ -520,22 +503,6 @@ namespace PRS.Mobile
 
         #region Utilities
         
-        private void InitNotificationCentre()
-        {
-            // LocalNotificationCenter.Current.NotificationActionTapped += (Plugin.LocalNotification.EventArgs.NotificationActionEventArgs e) =>
-            // {
-            //     if (MainPageUtils.DetermineCorrectPage(e) != null)
-            //     {
-            //         Device.BeginInvokeOnMainThread(() =>
-            //         {
-            //             Navigation.PushAsync(MainPageUtils.DetermineCorrectPage(e));
-            //         });
-            //     }
-            // };
-            //
-            // MainPageUtils.OnMainPageNotificationsChanged += RefreshOnNotificationsChange;
-        }
-        
         //private void CheckNotificationsPushed(CoreTable table)
         //{
             // try

+ 10 - 5
prs.mobile.new/PRS.Mobile/Modules/Notifications/NotificationList.xaml

@@ -57,7 +57,8 @@
                             CornerRadius="5" 
                             HasShadow="False"
                             VerticalOptions="StartAndExpand"
-                            HeightRequest="100">
+                            HeightRequest="100"
+                            BackgroundColor="White">
                             <Frame.GestureRecognizers>
                                 <TapGestureRecognizer Tapped="_notification_Tapped" />
                             </Frame.GestureRecognizers>
@@ -98,7 +99,8 @@
                                         VerticalOptions="Center"
                                         VerticalTextAlignment="Center"
                                         FontAttributes="Bold"
-                                        FontSize="Small"/>
+                                        FontSize="Small"
+                                        TextColor="Black"/>
                                     
                                     <Image 
                                         Grid.Row="0"
@@ -121,7 +123,8 @@
                                         MaxLines="3"
                                         Margin="5,0"
                                         FontSize="Small"
-                                        FontAttributes="Italic"/>
+                                        FontAttributes="Italic"
+                                        TextColor="Black"/>
 
                                     <Label 
                                         Grid.Row="2"
@@ -131,7 +134,8 @@
                                         HorizontalTextAlignment="Start"
                                         Text="{Binding Sender}" 
                                         Margin="5,0"
-                                        FontSize="Micro" />
+                                        FontSize="Micro" 
+                                        TextColor="Black"/>
                                     
                                     <Label
                                         Grid.Row="2"
@@ -141,7 +145,8 @@
                                         FontSize="Micro" 
                                         VerticalOptions="Center"
                                         Margin="5,0"
-                                        HorizontalTextAlignment="End"/>
+                                        HorizontalTextAlignment="End"
+                                        TextColor="Black"/>
                                     
                                 </Grid>