From 17e6ca60b17d2ce492a6a13943c72d81128dfe7b Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 6 Aug 2021 14:15:24 +0100 Subject: [PATCH] WIP: swap to vector icons (for android only, iOS can SVG) --- MobileApp1.Android/MobileApp1.Android.csproj | 10 +- .../Resources/Resource.designer.cs | 76 ++++----- .../Resources/drawable/help.png | Bin 3611 -> 0 bytes .../Resources/drawable/home.png | Bin 1845 -> 0 bytes .../Resources/drawable/ic_folder.xml | 12 ++ .../Resources/drawable/ic_helpcircle.xml | 19 +++ .../Resources/drawable/ic_home.xml | 16 ++ .../Resources/drawable/ic_logout.xml | 20 +++ .../Resources/drawable/ic_settings.xml | 16 ++ .../Resources/drawable/layers.png | Bin 1576 -> 0 bytes .../Resources/drawable/logout.png | Bin 1565 -> 0 bytes .../Resources/drawable/settings.png | Bin 3974 -> 0 bytes MobileApp1/Services/CorporationMockService.cs | 4 +- MobileApp1/Views/FlyoutMenuPage.xaml | 14 +- MobileApp1/Views/HomePage.xaml.cs | 2 +- .../{MyStuffPage.xaml => MyFoldersPage.xaml} | 2 +- ...tuffPage.xaml.cs => MyFoldersPage.xaml.cs} | 4 +- Resources/graphics-icons.svg | 149 ------------------ Resources/ic/arrow-right-circle.svg | 1 + Resources/ic/folder.svg | 60 +++++++ Resources/ic/help-circle.svg | 54 +++++++ Resources/ic/home.svg | 41 +++++ Resources/ic/log-out.svg | 71 +++++++++ Resources/ic/settings.svg | 66 ++++++++ 24 files changed, 432 insertions(+), 205 deletions(-) delete mode 100644 MobileApp1.Android/Resources/drawable/help.png delete mode 100644 MobileApp1.Android/Resources/drawable/home.png create mode 100644 MobileApp1.Android/Resources/drawable/ic_folder.xml create mode 100644 MobileApp1.Android/Resources/drawable/ic_helpcircle.xml create mode 100644 MobileApp1.Android/Resources/drawable/ic_home.xml create mode 100644 MobileApp1.Android/Resources/drawable/ic_logout.xml create mode 100644 MobileApp1.Android/Resources/drawable/ic_settings.xml delete mode 100644 MobileApp1.Android/Resources/drawable/layers.png delete mode 100644 MobileApp1.Android/Resources/drawable/logout.png delete mode 100644 MobileApp1.Android/Resources/drawable/settings.png rename MobileApp1/Views/{MyStuffPage.xaml => MyFoldersPage.xaml} (93%) rename MobileApp1/Views/{MyStuffPage.xaml.cs => MyFoldersPage.xaml.cs} (69%) delete mode 100644 Resources/graphics-icons.svg create mode 100644 Resources/ic/arrow-right-circle.svg create mode 100644 Resources/ic/folder.svg create mode 100644 Resources/ic/help-circle.svg create mode 100644 Resources/ic/home.svg create mode 100644 Resources/ic/log-out.svg create mode 100644 Resources/ic/settings.svg 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 58ff6ce7f134d70ff842eefb56c10479e95e4d50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3611 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 T-Zv4vJOIl4ni=I+_vC*7rSOJ$ 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 18ab26bf93f144bee412b0504af3cfef625ef322..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1576 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 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 @@ - -