diff --git a/MobileApp1.Android/MobileApp1.Android.csproj b/MobileApp1.Android/MobileApp1.Android.csproj index 5bc5ccc..1fda381 100644 --- a/MobileApp1.Android/MobileApp1.Android.csproj +++ b/MobileApp1.Android/MobileApp1.Android.csproj @@ -97,19 +97,19 @@ - + - + - + - + - + \ No newline at end of file diff --git a/MobileApp1.Android/Resources/Resource.designer.cs b/MobileApp1.Android/Resources/Resource.designer.cs index 451556d..56b05ed 100644 --- a/MobileApp1.Android/Resources/Resource.designer.cs +++ b/MobileApp1.Android/Resources/Resource.designer.cs @@ -11683,118 +11683,118 @@ namespace MobileApp1.Droid public const int design_snackbar_background = 2131165292; // aapt resource value: 0x7F07006D - public const int help = 2131165293; + public const int ic_folder = 2131165293; // aapt resource value: 0x7F07006E - public const int home = 2131165294; + public const int ic_helpcircle = 2131165294; // aapt resource value: 0x7F07006F - public const int ic_mtrl_checked_circle = 2131165295; + public const int ic_home = 2131165295; // aapt resource value: 0x7F070070 - public const int ic_mtrl_chip_checked_black = 2131165296; + public const int ic_logout = 2131165296; // aapt resource value: 0x7F070071 - public const int ic_mtrl_chip_checked_circle = 2131165297; + public const int ic_mtrl_checked_circle = 2131165297; // aapt resource value: 0x7F070072 - public const int ic_mtrl_chip_close_circle = 2131165298; + public const int ic_mtrl_chip_checked_black = 2131165298; // aapt resource value: 0x7F070073 - public const int layers = 2131165299; + public const int ic_mtrl_chip_checked_circle = 2131165299; // aapt resource value: 0x7F070074 - public const int logout = 2131165300; + public const int ic_mtrl_chip_close_circle = 2131165300; // aapt resource value: 0x7F070075 - public const int material_ic_calendar_black_24dp = 2131165301; + public const int ic_settings = 2131165301; // aapt resource value: 0x7F070076 - public const int material_ic_clear_black_24dp = 2131165302; + public const int material_ic_calendar_black_24dp = 2131165302; // aapt resource value: 0x7F070077 - public const int material_ic_edit_black_24dp = 2131165303; + public const int material_ic_clear_black_24dp = 2131165303; // aapt resource value: 0x7F070078 - public const int material_ic_keyboard_arrow_left_black_24dp = 2131165304; + public const int material_ic_edit_black_24dp = 2131165304; // aapt resource value: 0x7F070079 - public const int material_ic_keyboard_arrow_right_black_24dp = 2131165305; + public const int material_ic_keyboard_arrow_left_black_24dp = 2131165305; // aapt resource value: 0x7F07007A - public const int material_ic_menu_arrow_down_black_24dp = 2131165306; + public const int material_ic_keyboard_arrow_right_black_24dp = 2131165306; // aapt resource value: 0x7F07007B - public const int material_ic_menu_arrow_up_black_24dp = 2131165307; + public const int material_ic_menu_arrow_down_black_24dp = 2131165307; // aapt resource value: 0x7F07007C - public const int mtrl_dialog_background = 2131165308; + public const int material_ic_menu_arrow_up_black_24dp = 2131165308; // aapt resource value: 0x7F07007D - public const int mtrl_dropdown_arrow = 2131165309; + public const int mtrl_dialog_background = 2131165309; // aapt resource value: 0x7F07007E - public const int mtrl_ic_arrow_drop_down = 2131165310; + public const int mtrl_dropdown_arrow = 2131165310; // aapt resource value: 0x7F07007F - public const int mtrl_ic_arrow_drop_up = 2131165311; + public const int mtrl_ic_arrow_drop_down = 2131165311; // aapt resource value: 0x7F070080 - public const int mtrl_ic_cancel = 2131165312; + public const int mtrl_ic_arrow_drop_up = 2131165312; // aapt resource value: 0x7F070081 - public const int mtrl_ic_error = 2131165313; + public const int mtrl_ic_cancel = 2131165313; // aapt resource value: 0x7F070082 - public const int mtrl_popupmenu_background = 2131165314; + public const int mtrl_ic_error = 2131165314; // aapt resource value: 0x7F070083 - public const int mtrl_popupmenu_background_dark = 2131165315; + public const int mtrl_popupmenu_background = 2131165315; // aapt resource value: 0x7F070084 - public const int mtrl_tabs_default_indicator = 2131165316; + public const int mtrl_popupmenu_background_dark = 2131165316; // aapt resource value: 0x7F070085 - public const int navigation_empty_icon = 2131165317; + public const int mtrl_tabs_default_indicator = 2131165317; // aapt resource value: 0x7F070086 - public const int notification_action_background = 2131165318; + public const int navigation_empty_icon = 2131165318; // aapt resource value: 0x7F070087 - public const int notification_bg = 2131165319; + public const int notification_action_background = 2131165319; // aapt resource value: 0x7F070088 - public const int notification_bg_low = 2131165320; + public const int notification_bg = 2131165320; // aapt resource value: 0x7F070089 - public const int notification_bg_low_normal = 2131165321; + public const int notification_bg_low = 2131165321; // aapt resource value: 0x7F07008A - public const int notification_bg_low_pressed = 2131165322; + public const int notification_bg_low_normal = 2131165322; // aapt resource value: 0x7F07008B - public const int notification_bg_normal = 2131165323; + public const int notification_bg_low_pressed = 2131165323; // aapt resource value: 0x7F07008C - public const int notification_bg_normal_pressed = 2131165324; + public const int notification_bg_normal = 2131165324; // aapt resource value: 0x7F07008D - public const int notification_icon_background = 2131165325; + public const int notification_bg_normal_pressed = 2131165325; // aapt resource value: 0x7F07008E - public const int notification_template_icon_bg = 2131165326; + public const int notification_icon_background = 2131165326; // aapt resource value: 0x7F07008F - public const int notification_template_icon_low_bg = 2131165327; + public const int notification_template_icon_bg = 2131165327; // aapt resource value: 0x7F070090 - public const int notification_tile_bg = 2131165328; + public const int notification_template_icon_low_bg = 2131165328; // aapt resource value: 0x7F070091 - public const int notify_panel_notification_icon_bg = 2131165329; + public const int notification_tile_bg = 2131165329; // aapt resource value: 0x7F070092 - public const int settings = 2131165330; + public const int notify_panel_notification_icon_bg = 2131165330; // aapt resource value: 0x7F070093 public const int splash_logo = 2131165331; diff --git a/MobileApp1.Android/Resources/drawable/help.png b/MobileApp1.Android/Resources/drawable/help.png deleted file mode 100644 index 58ff6ce..0000000 Binary files a/MobileApp1.Android/Resources/drawable/help.png and /dev/null differ diff --git a/MobileApp1.Android/Resources/drawable/home.png b/MobileApp1.Android/Resources/drawable/home.png deleted file mode 100644 index dc959eb..0000000 Binary files a/MobileApp1.Android/Resources/drawable/home.png and /dev/null differ diff --git a/MobileApp1.Android/Resources/drawable/ic_folder.xml b/MobileApp1.Android/Resources/drawable/ic_folder.xml new file mode 100644 index 0000000..8fc0f89 --- /dev/null +++ b/MobileApp1.Android/Resources/drawable/ic_folder.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/MobileApp1.Android/Resources/drawable/ic_helpcircle.xml b/MobileApp1.Android/Resources/drawable/ic_helpcircle.xml new file mode 100644 index 0000000..a48c69e --- /dev/null +++ b/MobileApp1.Android/Resources/drawable/ic_helpcircle.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/MobileApp1.Android/Resources/drawable/ic_home.xml b/MobileApp1.Android/Resources/drawable/ic_home.xml new file mode 100644 index 0000000..8ab143a --- /dev/null +++ b/MobileApp1.Android/Resources/drawable/ic_home.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/MobileApp1.Android/Resources/drawable/ic_logout.xml b/MobileApp1.Android/Resources/drawable/ic_logout.xml new file mode 100644 index 0000000..f1224a9 --- /dev/null +++ b/MobileApp1.Android/Resources/drawable/ic_logout.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/MobileApp1.Android/Resources/drawable/ic_settings.xml b/MobileApp1.Android/Resources/drawable/ic_settings.xml new file mode 100644 index 0000000..036a4c5 --- /dev/null +++ b/MobileApp1.Android/Resources/drawable/ic_settings.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/MobileApp1.Android/Resources/drawable/layers.png b/MobileApp1.Android/Resources/drawable/layers.png deleted file mode 100644 index 18ab26b..0000000 Binary files a/MobileApp1.Android/Resources/drawable/layers.png and /dev/null differ diff --git a/MobileApp1.Android/Resources/drawable/logout.png b/MobileApp1.Android/Resources/drawable/logout.png deleted file mode 100644 index 0ee107a..0000000 Binary files a/MobileApp1.Android/Resources/drawable/logout.png and /dev/null differ diff --git a/MobileApp1.Android/Resources/drawable/settings.png b/MobileApp1.Android/Resources/drawable/settings.png deleted file mode 100644 index 92be663..0000000 Binary files a/MobileApp1.Android/Resources/drawable/settings.png and /dev/null differ diff --git a/MobileApp1/Services/CorporationMockService.cs b/MobileApp1/Services/CorporationMockService.cs index fb415c0..d82ea8f 100644 --- a/MobileApp1/Services/CorporationMockService.cs +++ b/MobileApp1/Services/CorporationMockService.cs @@ -31,7 +31,7 @@ public ServiceResult Logout() { - System.Threading.Thread.Sleep(2000); + System.Threading.Thread.Sleep(1000); this.DisplayName = string.Empty; this.IsLoggedIn = false; @@ -45,7 +45,7 @@ public ServiceResult RequestPasswordReset(string username) { - System.Threading.Thread.Sleep(2000); + System.Threading.Thread.Sleep(1000); this.DisplayName = string.Empty; this.IsLoggedIn = false; diff --git a/MobileApp1/Views/FlyoutMenuPage.xaml b/MobileApp1/Views/FlyoutMenuPage.xaml index 710b3b4..9d0b32c 100644 --- a/MobileApp1/Views/FlyoutMenuPage.xaml +++ b/MobileApp1/Views/FlyoutMenuPage.xaml @@ -25,11 +25,11 @@ --> - - - - - + + + + + @@ -40,8 +40,8 @@ - -