From ebbe7046728b0f173e13c6ef0e158a805be8e607 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Thu, 19 Oct 2017 14:56:11 -0400 Subject: [PATCH] replace launch and clipboard buttons with icons --- src/Android/Android.csproj | 30 ++ src/Android/Resources/Resource.Designer.cs | 352 +++++++++--------- .../Resources/drawable-hdpi/clipboard.png | Bin 0 -> 426 bytes .../Resources/drawable-hdpi/launch.png | Bin 0 -> 686 bytes .../Resources/drawable-xhdpi/clipboard.png | Bin 0 -> 487 bytes .../Resources/drawable-xhdpi/launch.png | Bin 0 -> 910 bytes .../Resources/drawable-xxhdpi/clipboard.png | Bin 0 -> 677 bytes .../Resources/drawable-xxhdpi/launch.png | Bin 0 -> 1207 bytes .../Resources/drawable-xxxhdpi/clipboard.png | Bin 0 -> 737 bytes .../Resources/drawable-xxxhdpi/launch.png | Bin 0 -> 1512 bytes src/Android/Resources/drawable/clipboard.png | Bin 0 -> 350 bytes src/Android/Resources/drawable/launch.png | Bin 0 -> 596 bytes src/App/Controls/FormEntryCell.cs | 1 + src/App/Controls/LabeledValueCell.cs | 14 +- src/App/Pages/Vault/VaultAddCipherPage.cs | 12 - src/App/Pages/Vault/VaultCustomFieldsPage.cs | 9 +- src/App/Pages/Vault/VaultEditCipherPage.cs | 13 +- src/App/Pages/Vault/VaultViewCipherPage.cs | 31 +- src/UWP.Images/UWP.Images.projitems | 2 + src/UWP.Images/clipboard.png | Bin 0 -> 737 bytes src/UWP.Images/launch.png | Bin 0 -> 1512 bytes src/iOS/Resources/clipboard.png | Bin 0 -> 350 bytes src/iOS/Resources/clipboard@2x.png | Bin 0 -> 487 bytes src/iOS/Resources/clipboard@3x.png | Bin 0 -> 677 bytes src/iOS/Resources/launch.png | Bin 0 -> 596 bytes src/iOS/Resources/launch@2x.png | Bin 0 -> 910 bytes src/iOS/Resources/launch@3x.png | Bin 0 -> 1207 bytes src/iOS/iOS.csproj | 18 + 28 files changed, 252 insertions(+), 230 deletions(-) create mode 100644 src/Android/Resources/drawable-hdpi/clipboard.png create mode 100644 src/Android/Resources/drawable-hdpi/launch.png create mode 100644 src/Android/Resources/drawable-xhdpi/clipboard.png create mode 100644 src/Android/Resources/drawable-xhdpi/launch.png create mode 100644 src/Android/Resources/drawable-xxhdpi/clipboard.png create mode 100644 src/Android/Resources/drawable-xxhdpi/launch.png create mode 100644 src/Android/Resources/drawable-xxxhdpi/clipboard.png create mode 100644 src/Android/Resources/drawable-xxxhdpi/launch.png create mode 100644 src/Android/Resources/drawable/clipboard.png create mode 100644 src/Android/Resources/drawable/launch.png create mode 100644 src/UWP.Images/clipboard.png create mode 100644 src/UWP.Images/launch.png create mode 100644 src/iOS/Resources/clipboard.png create mode 100644 src/iOS/Resources/clipboard@2x.png create mode 100644 src/iOS/Resources/clipboard@3x.png create mode 100644 src/iOS/Resources/launch.png create mode 100644 src/iOS/Resources/launch@2x.png create mode 100644 src/iOS/Resources/launch@3x.png diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj index d4e820d1b..4d7449248 100644 --- a/src/Android/Android.csproj +++ b/src/Android/Android.csproj @@ -942,6 +942,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Android/Resources/Resource.Designer.cs b/src/Android/Resources/Resource.Designer.cs index 4ed63b046..ab8c11390 100644 --- a/src/Android/Resources/Resource.Designer.cs +++ b/src/Android/Resources/Resource.Designer.cs @@ -2314,517 +2314,523 @@ namespace Bit.Android public const int camera = 2130837583; // aapt resource value: 0x7f020050 - public const int cloudup = 2130837584; + public const int clipboard = 2130837584; // aapt resource value: 0x7f020051 - public const int cog = 2130837585; + public const int cloudup = 2130837585; // aapt resource value: 0x7f020052 - public const int cogs = 2130837586; + public const int cog = 2130837586; // aapt resource value: 0x7f020053 - public const int cogs_selected = 2130837587; + public const int cogs = 2130837587; // aapt resource value: 0x7f020054 - public const int common_full_open_on_phone = 2130837588; + public const int cogs_selected = 2130837588; // aapt resource value: 0x7f020055 - public const int common_google_signin_btn_icon_dark = 2130837589; + public const int common_full_open_on_phone = 2130837589; // aapt resource value: 0x7f020056 - public const int common_google_signin_btn_icon_dark_disabled = 2130837590; + public const int common_google_signin_btn_icon_dark = 2130837590; // aapt resource value: 0x7f020057 - public const int common_google_signin_btn_icon_dark_focused = 2130837591; + public const int common_google_signin_btn_icon_dark_disabled = 2130837591; // aapt resource value: 0x7f020058 - public const int common_google_signin_btn_icon_dark_normal = 2130837592; + public const int common_google_signin_btn_icon_dark_focused = 2130837592; // aapt resource value: 0x7f020059 - public const int common_google_signin_btn_icon_dark_pressed = 2130837593; + public const int common_google_signin_btn_icon_dark_normal = 2130837593; // aapt resource value: 0x7f02005a - public const int common_google_signin_btn_icon_light = 2130837594; + public const int common_google_signin_btn_icon_dark_pressed = 2130837594; // aapt resource value: 0x7f02005b - public const int common_google_signin_btn_icon_light_disabled = 2130837595; + public const int common_google_signin_btn_icon_light = 2130837595; // aapt resource value: 0x7f02005c - public const int common_google_signin_btn_icon_light_focused = 2130837596; + public const int common_google_signin_btn_icon_light_disabled = 2130837596; // aapt resource value: 0x7f02005d - public const int common_google_signin_btn_icon_light_normal = 2130837597; + public const int common_google_signin_btn_icon_light_focused = 2130837597; // aapt resource value: 0x7f02005e - public const int common_google_signin_btn_icon_light_pressed = 2130837598; + public const int common_google_signin_btn_icon_light_normal = 2130837598; // aapt resource value: 0x7f02005f - public const int common_google_signin_btn_text_dark = 2130837599; + public const int common_google_signin_btn_icon_light_pressed = 2130837599; // aapt resource value: 0x7f020060 - public const int common_google_signin_btn_text_dark_disabled = 2130837600; + public const int common_google_signin_btn_text_dark = 2130837600; // aapt resource value: 0x7f020061 - public const int common_google_signin_btn_text_dark_focused = 2130837601; + public const int common_google_signin_btn_text_dark_disabled = 2130837601; // aapt resource value: 0x7f020062 - public const int common_google_signin_btn_text_dark_normal = 2130837602; + public const int common_google_signin_btn_text_dark_focused = 2130837602; // aapt resource value: 0x7f020063 - public const int common_google_signin_btn_text_dark_pressed = 2130837603; + public const int common_google_signin_btn_text_dark_normal = 2130837603; // aapt resource value: 0x7f020064 - public const int common_google_signin_btn_text_light = 2130837604; + public const int common_google_signin_btn_text_dark_pressed = 2130837604; // aapt resource value: 0x7f020065 - public const int common_google_signin_btn_text_light_disabled = 2130837605; + public const int common_google_signin_btn_text_light = 2130837605; // aapt resource value: 0x7f020066 - public const int common_google_signin_btn_text_light_focused = 2130837606; + public const int common_google_signin_btn_text_light_disabled = 2130837606; // aapt resource value: 0x7f020067 - public const int common_google_signin_btn_text_light_normal = 2130837607; + public const int common_google_signin_btn_text_light_focused = 2130837607; // aapt resource value: 0x7f020068 - public const int common_google_signin_btn_text_light_pressed = 2130837608; + public const int common_google_signin_btn_text_light_normal = 2130837608; // aapt resource value: 0x7f020069 - public const int common_ic_googleplayservices = 2130837609; + public const int common_google_signin_btn_text_light_pressed = 2130837609; // aapt resource value: 0x7f02006a - public const int common_plus_signin_btn_icon_dark = 2130837610; + public const int common_ic_googleplayservices = 2130837610; // aapt resource value: 0x7f02006b - public const int common_plus_signin_btn_icon_dark_disabled = 2130837611; + public const int common_plus_signin_btn_icon_dark = 2130837611; // aapt resource value: 0x7f02006c - public const int common_plus_signin_btn_icon_dark_focused = 2130837612; + public const int common_plus_signin_btn_icon_dark_disabled = 2130837612; // aapt resource value: 0x7f02006d - public const int common_plus_signin_btn_icon_dark_normal = 2130837613; + public const int common_plus_signin_btn_icon_dark_focused = 2130837613; // aapt resource value: 0x7f02006e - public const int common_plus_signin_btn_icon_dark_pressed = 2130837614; + public const int common_plus_signin_btn_icon_dark_normal = 2130837614; // aapt resource value: 0x7f02006f - public const int common_plus_signin_btn_icon_light = 2130837615; + public const int common_plus_signin_btn_icon_dark_pressed = 2130837615; // aapt resource value: 0x7f020070 - public const int common_plus_signin_btn_icon_light_disabled = 2130837616; + public const int common_plus_signin_btn_icon_light = 2130837616; // aapt resource value: 0x7f020071 - public const int common_plus_signin_btn_icon_light_focused = 2130837617; + public const int common_plus_signin_btn_icon_light_disabled = 2130837617; // aapt resource value: 0x7f020072 - public const int common_plus_signin_btn_icon_light_normal = 2130837618; + public const int common_plus_signin_btn_icon_light_focused = 2130837618; // aapt resource value: 0x7f020073 - public const int common_plus_signin_btn_icon_light_pressed = 2130837619; + public const int common_plus_signin_btn_icon_light_normal = 2130837619; // aapt resource value: 0x7f020074 - public const int common_plus_signin_btn_text_dark = 2130837620; + public const int common_plus_signin_btn_icon_light_pressed = 2130837620; // aapt resource value: 0x7f020075 - public const int common_plus_signin_btn_text_dark_disabled = 2130837621; + public const int common_plus_signin_btn_text_dark = 2130837621; // aapt resource value: 0x7f020076 - public const int common_plus_signin_btn_text_dark_focused = 2130837622; + public const int common_plus_signin_btn_text_dark_disabled = 2130837622; // aapt resource value: 0x7f020077 - public const int common_plus_signin_btn_text_dark_normal = 2130837623; + public const int common_plus_signin_btn_text_dark_focused = 2130837623; // aapt resource value: 0x7f020078 - public const int common_plus_signin_btn_text_dark_pressed = 2130837624; + public const int common_plus_signin_btn_text_dark_normal = 2130837624; // aapt resource value: 0x7f020079 - public const int common_plus_signin_btn_text_light = 2130837625; + public const int common_plus_signin_btn_text_dark_pressed = 2130837625; // aapt resource value: 0x7f02007a - public const int common_plus_signin_btn_text_light_disabled = 2130837626; + public const int common_plus_signin_btn_text_light = 2130837626; // aapt resource value: 0x7f02007b - public const int common_plus_signin_btn_text_light_focused = 2130837627; + public const int common_plus_signin_btn_text_light_disabled = 2130837627; // aapt resource value: 0x7f02007c - public const int common_plus_signin_btn_text_light_normal = 2130837628; + public const int common_plus_signin_btn_text_light_focused = 2130837628; // aapt resource value: 0x7f02007d - public const int common_plus_signin_btn_text_light_pressed = 2130837629; + public const int common_plus_signin_btn_text_light_normal = 2130837629; // aapt resource value: 0x7f02007e - public const int design_fab_background = 2130837630; + public const int common_plus_signin_btn_text_light_pressed = 2130837630; // aapt resource value: 0x7f02007f - public const int design_snackbar_background = 2130837631; + public const int design_fab_background = 2130837631; // aapt resource value: 0x7f020080 - public const int download = 2130837632; + public const int design_snackbar_background = 2130837632; // aapt resource value: 0x7f020081 - public const int envelope = 2130837633; + public const int download = 2130837633; // aapt resource value: 0x7f020082 - public const int eye = 2130837634; + public const int envelope = 2130837634; // aapt resource value: 0x7f020083 - public const int eye_slash = 2130837635; + public const int eye = 2130837635; // aapt resource value: 0x7f020084 - public const int fa_lock = 2130837636; + public const int eye_slash = 2130837636; // aapt resource value: 0x7f020085 - public const int fa_lock_selected = 2130837637; + public const int fa_lock = 2130837637; // aapt resource value: 0x7f020086 - public const int fingerprint = 2130837638; + public const int fa_lock_selected = 2130837638; // aapt resource value: 0x7f020087 - public const int fingerprint_white = 2130837639; + public const int fingerprint = 2130837639; // aapt resource value: 0x7f020088 - public const int folder = 2130837640; + public const int fingerprint_white = 2130837640; // aapt resource value: 0x7f020089 - public const int globe = 2130837641; + public const int folder = 2130837641; // aapt resource value: 0x7f02008a - public const int hockeyapp_btn_background = 2130837642; + public const int globe = 2130837642; // aapt resource value: 0x7f02008b - public const int ic_audiotrack = 2130837643; + public const int hockeyapp_btn_background = 2130837643; // aapt resource value: 0x7f02008c - public const int ic_audiotrack_light = 2130837644; + public const int ic_audiotrack = 2130837644; // aapt resource value: 0x7f02008d - public const int ic_bluetooth_grey = 2130837645; + public const int ic_audiotrack_light = 2130837645; // aapt resource value: 0x7f02008e - public const int ic_bluetooth_white = 2130837646; + public const int ic_bluetooth_grey = 2130837646; // aapt resource value: 0x7f02008f - public const int ic_cast_dark = 2130837647; + public const int ic_bluetooth_white = 2130837647; // aapt resource value: 0x7f020090 - public const int ic_cast_disabled_light = 2130837648; + public const int ic_cast_dark = 2130837648; // aapt resource value: 0x7f020091 - public const int ic_cast_grey = 2130837649; + public const int ic_cast_disabled_light = 2130837649; // aapt resource value: 0x7f020092 - public const int ic_cast_light = 2130837650; + public const int ic_cast_grey = 2130837650; // aapt resource value: 0x7f020093 - public const int ic_cast_off_light = 2130837651; + public const int ic_cast_light = 2130837651; // aapt resource value: 0x7f020094 - public const int ic_cast_on_0_light = 2130837652; + public const int ic_cast_off_light = 2130837652; // aapt resource value: 0x7f020095 - public const int ic_cast_on_1_light = 2130837653; + public const int ic_cast_on_0_light = 2130837653; // aapt resource value: 0x7f020096 - public const int ic_cast_on_2_light = 2130837654; + public const int ic_cast_on_1_light = 2130837654; // aapt resource value: 0x7f020097 - public const int ic_cast_on_light = 2130837655; + public const int ic_cast_on_2_light = 2130837655; // aapt resource value: 0x7f020098 - public const int ic_cast_white = 2130837656; + public const int ic_cast_on_light = 2130837656; // aapt resource value: 0x7f020099 - public const int ic_close_dark = 2130837657; + public const int ic_cast_white = 2130837657; // aapt resource value: 0x7f02009a - public const int ic_close_light = 2130837658; + public const int ic_close_dark = 2130837658; // aapt resource value: 0x7f02009b - public const int ic_collapse = 2130837659; + public const int ic_close_light = 2130837659; // aapt resource value: 0x7f02009c - public const int ic_collapse_00000 = 2130837660; + public const int ic_collapse = 2130837660; // aapt resource value: 0x7f02009d - public const int ic_collapse_00001 = 2130837661; + public const int ic_collapse_00000 = 2130837661; // aapt resource value: 0x7f02009e - public const int ic_collapse_00002 = 2130837662; + public const int ic_collapse_00001 = 2130837662; // aapt resource value: 0x7f02009f - public const int ic_collapse_00003 = 2130837663; + public const int ic_collapse_00002 = 2130837663; // aapt resource value: 0x7f0200a0 - public const int ic_collapse_00004 = 2130837664; + public const int ic_collapse_00003 = 2130837664; // aapt resource value: 0x7f0200a1 - public const int ic_collapse_00005 = 2130837665; + public const int ic_collapse_00004 = 2130837665; // aapt resource value: 0x7f0200a2 - public const int ic_collapse_00006 = 2130837666; + public const int ic_collapse_00005 = 2130837666; // aapt resource value: 0x7f0200a3 - public const int ic_collapse_00007 = 2130837667; + public const int ic_collapse_00006 = 2130837667; // aapt resource value: 0x7f0200a4 - public const int ic_collapse_00008 = 2130837668; + public const int ic_collapse_00007 = 2130837668; // aapt resource value: 0x7f0200a5 - public const int ic_collapse_00009 = 2130837669; + public const int ic_collapse_00008 = 2130837669; // aapt resource value: 0x7f0200a6 - public const int ic_collapse_00010 = 2130837670; + public const int ic_collapse_00009 = 2130837670; // aapt resource value: 0x7f0200a7 - public const int ic_collapse_00011 = 2130837671; + public const int ic_collapse_00010 = 2130837671; // aapt resource value: 0x7f0200a8 - public const int ic_collapse_00012 = 2130837672; + public const int ic_collapse_00011 = 2130837672; // aapt resource value: 0x7f0200a9 - public const int ic_collapse_00013 = 2130837673; + public const int ic_collapse_00012 = 2130837673; // aapt resource value: 0x7f0200aa - public const int ic_collapse_00014 = 2130837674; + public const int ic_collapse_00013 = 2130837674; // aapt resource value: 0x7f0200ab - public const int ic_collapse_00015 = 2130837675; + public const int ic_collapse_00014 = 2130837675; // aapt resource value: 0x7f0200ac - public const int ic_errorstatus = 2130837676; + public const int ic_collapse_00015 = 2130837676; // aapt resource value: 0x7f0200ad - public const int ic_expand = 2130837677; + public const int ic_errorstatus = 2130837677; // aapt resource value: 0x7f0200ae - public const int ic_expand_00000 = 2130837678; + public const int ic_expand = 2130837678; // aapt resource value: 0x7f0200af - public const int ic_expand_00001 = 2130837679; + public const int ic_expand_00000 = 2130837679; // aapt resource value: 0x7f0200b0 - public const int ic_expand_00002 = 2130837680; + public const int ic_expand_00001 = 2130837680; // aapt resource value: 0x7f0200b1 - public const int ic_expand_00003 = 2130837681; + public const int ic_expand_00002 = 2130837681; // aapt resource value: 0x7f0200b2 - public const int ic_expand_00004 = 2130837682; + public const int ic_expand_00003 = 2130837682; // aapt resource value: 0x7f0200b3 - public const int ic_expand_00005 = 2130837683; + public const int ic_expand_00004 = 2130837683; // aapt resource value: 0x7f0200b4 - public const int ic_expand_00006 = 2130837684; + public const int ic_expand_00005 = 2130837684; // aapt resource value: 0x7f0200b5 - public const int ic_expand_00007 = 2130837685; + public const int ic_expand_00006 = 2130837685; // aapt resource value: 0x7f0200b6 - public const int ic_expand_00008 = 2130837686; + public const int ic_expand_00007 = 2130837686; // aapt resource value: 0x7f0200b7 - public const int ic_expand_00009 = 2130837687; + public const int ic_expand_00008 = 2130837687; // aapt resource value: 0x7f0200b8 - public const int ic_expand_00010 = 2130837688; + public const int ic_expand_00009 = 2130837688; // aapt resource value: 0x7f0200b9 - public const int ic_expand_00011 = 2130837689; + public const int ic_expand_00010 = 2130837689; // aapt resource value: 0x7f0200ba - public const int ic_expand_00012 = 2130837690; + public const int ic_expand_00011 = 2130837690; // aapt resource value: 0x7f0200bb - public const int ic_expand_00013 = 2130837691; + public const int ic_expand_00012 = 2130837691; // aapt resource value: 0x7f0200bc - public const int ic_expand_00014 = 2130837692; + public const int ic_expand_00013 = 2130837692; // aapt resource value: 0x7f0200bd - public const int ic_expand_00015 = 2130837693; + public const int ic_expand_00014 = 2130837693; // aapt resource value: 0x7f0200be - public const int ic_media_pause = 2130837694; + public const int ic_expand_00015 = 2130837694; // aapt resource value: 0x7f0200bf - public const int ic_media_play = 2130837695; + public const int ic_media_pause = 2130837695; // aapt resource value: 0x7f0200c0 - public const int ic_media_route_disabled_mono_dark = 2130837696; + public const int ic_media_play = 2130837696; // aapt resource value: 0x7f0200c1 - public const int ic_media_route_off_mono_dark = 2130837697; + public const int ic_media_route_disabled_mono_dark = 2130837697; // aapt resource value: 0x7f0200c2 - public const int ic_media_route_on_0_mono_dark = 2130837698; + public const int ic_media_route_off_mono_dark = 2130837698; // aapt resource value: 0x7f0200c3 - public const int ic_media_route_on_1_mono_dark = 2130837699; + public const int ic_media_route_on_0_mono_dark = 2130837699; // aapt resource value: 0x7f0200c4 - public const int ic_media_route_on_2_mono_dark = 2130837700; + public const int ic_media_route_on_1_mono_dark = 2130837700; // aapt resource value: 0x7f0200c5 - public const int ic_media_route_on_mono_dark = 2130837701; + public const int ic_media_route_on_2_mono_dark = 2130837701; // aapt resource value: 0x7f0200c6 - public const int ic_pause_dark = 2130837702; + public const int ic_media_route_on_mono_dark = 2130837702; // aapt resource value: 0x7f0200c7 - public const int ic_pause_light = 2130837703; + public const int ic_pause_dark = 2130837703; // aapt resource value: 0x7f0200c8 - public const int ic_play_dark = 2130837704; + public const int ic_pause_light = 2130837704; // aapt resource value: 0x7f0200c9 - public const int ic_play_light = 2130837705; + public const int ic_play_dark = 2130837705; // aapt resource value: 0x7f0200ca - public const int ic_speaker_dark = 2130837706; + public const int ic_play_light = 2130837706; // aapt resource value: 0x7f0200cb - public const int ic_speaker_group_dark = 2130837707; + public const int ic_speaker_dark = 2130837707; // aapt resource value: 0x7f0200cc - public const int ic_speaker_group_light = 2130837708; + public const int ic_speaker_group_dark = 2130837708; // aapt resource value: 0x7f0200cd - public const int ic_speaker_light = 2130837709; + public const int ic_speaker_group_light = 2130837709; // aapt resource value: 0x7f0200ce - public const int ic_successstatus = 2130837710; + public const int ic_speaker_light = 2130837710; // aapt resource value: 0x7f0200cf - public const int ic_tv_dark = 2130837711; + public const int ic_successstatus = 2130837711; // aapt resource value: 0x7f0200d0 - public const int ic_tv_light = 2130837712; + public const int ic_tv_dark = 2130837712; // aapt resource value: 0x7f0200d1 - public const int icon = 2130837713; + public const int ic_tv_light = 2130837713; // aapt resource value: 0x7f0200d2 - public const int ion_chevron_right = 2130837714; + public const int icon = 2130837714; // aapt resource value: 0x7f0200d3 - public const int lightbulb = 2130837715; + public const int ion_chevron_right = 2130837715; // aapt resource value: 0x7f0200d4 - public const int list_selector = 2130837716; + public const int launch = 2130837716; // aapt resource value: 0x7f0200d5 - public const int @lock = 2130837717; + public const int lightbulb = 2130837717; // aapt resource value: 0x7f0200d6 - public const int logo = 2130837718; + public const int list_selector = 2130837718; // aapt resource value: 0x7f0200d7 - public const int more = 2130837719; + public const int @lock = 2130837719; // aapt resource value: 0x7f0200d8 - public const int mr_dialog_material_background_dark = 2130837720; + public const int logo = 2130837720; // aapt resource value: 0x7f0200d9 - public const int mr_dialog_material_background_light = 2130837721; + public const int more = 2130837721; // aapt resource value: 0x7f0200da - public const int mr_ic_audiotrack_light = 2130837722; + public const int mr_dialog_material_background_dark = 2130837722; // aapt resource value: 0x7f0200db - public const int mr_ic_cast_dark = 2130837723; + public const int mr_dialog_material_background_light = 2130837723; // aapt resource value: 0x7f0200dc - public const int mr_ic_cast_light = 2130837724; + public const int mr_ic_audiotrack_light = 2130837724; // aapt resource value: 0x7f0200dd - public const int mr_ic_close_dark = 2130837725; + public const int mr_ic_cast_dark = 2130837725; // aapt resource value: 0x7f0200de - public const int mr_ic_close_light = 2130837726; + public const int mr_ic_cast_light = 2130837726; // aapt resource value: 0x7f0200df - public const int mr_ic_media_route_connecting_mono_dark = 2130837727; + public const int mr_ic_close_dark = 2130837727; // aapt resource value: 0x7f0200e0 - public const int mr_ic_media_route_connecting_mono_light = 2130837728; + public const int mr_ic_close_light = 2130837728; // aapt resource value: 0x7f0200e1 - public const int mr_ic_media_route_mono_dark = 2130837729; + public const int mr_ic_media_route_connecting_mono_dark = 2130837729; // aapt resource value: 0x7f0200e2 - public const int mr_ic_media_route_mono_light = 2130837730; + public const int mr_ic_media_route_connecting_mono_light = 2130837730; // aapt resource value: 0x7f0200e3 - public const int mr_ic_pause_dark = 2130837731; + public const int mr_ic_media_route_mono_dark = 2130837731; // aapt resource value: 0x7f0200e4 - public const int mr_ic_pause_light = 2130837732; + public const int mr_ic_media_route_mono_light = 2130837732; // aapt resource value: 0x7f0200e5 - public const int mr_ic_play_dark = 2130837733; + public const int mr_ic_pause_dark = 2130837733; // aapt resource value: 0x7f0200e6 - public const int mr_ic_play_light = 2130837734; + public const int mr_ic_pause_light = 2130837734; // aapt resource value: 0x7f0200e7 - public const int notification_sm = 2130837735; - - // aapt resource value: 0x7f0200fa - public const int notification_template_icon_bg = 2130837754; + public const int mr_ic_play_dark = 2130837735; // aapt resource value: 0x7f0200e8 - public const int paperclip = 2130837736; + public const int mr_ic_play_light = 2130837736; // aapt resource value: 0x7f0200e9 - public const int plus = 2130837737; + public const int notification_sm = 2130837737; + + // aapt resource value: 0x7f0200fc + public const int notification_template_icon_bg = 2130837756; // aapt resource value: 0x7f0200ea - public const int refresh = 2130837738; + public const int paperclip = 2130837738; // aapt resource value: 0x7f0200eb - public const int roundedbg = 2130837739; + public const int plus = 2130837739; // aapt resource value: 0x7f0200ec - public const int roundedbgdark = 2130837740; + public const int refresh = 2130837740; // aapt resource value: 0x7f0200ed - public const int search = 2130837741; + public const int roundedbg = 2130837741; // aapt resource value: 0x7f0200ee - public const int share = 2130837742; + public const int roundedbgdark = 2130837742; // aapt resource value: 0x7f0200ef - public const int share_tools = 2130837743; + public const int search = 2130837743; // aapt resource value: 0x7f0200f0 - public const int shield = 2130837744; + public const int share = 2130837744; // aapt resource value: 0x7f0200f1 - public const int splash_screen = 2130837745; + public const int share_tools = 2130837745; // aapt resource value: 0x7f0200f2 - public const int star = 2130837746; + public const int shield = 2130837746; // aapt resource value: 0x7f0200f3 - public const int star_selected = 2130837747; + public const int splash_screen = 2130837747; // aapt resource value: 0x7f0200f4 - public const int tools = 2130837748; + public const int star = 2130837748; // aapt resource value: 0x7f0200f5 - public const int tools_selected = 2130837749; + public const int star_selected = 2130837749; // aapt resource value: 0x7f0200f6 - public const int trash = 2130837750; + public const int tools = 2130837750; // aapt resource value: 0x7f0200f7 - public const int upload = 2130837751; + public const int tools_selected = 2130837751; // aapt resource value: 0x7f0200f8 - public const int user = 2130837752; + public const int trash = 2130837752; // aapt resource value: 0x7f0200f9 - public const int yubikey = 2130837753; + public const int upload = 2130837753; + + // aapt resource value: 0x7f0200fa + public const int user = 2130837754; + + // aapt resource value: 0x7f0200fb + public const int yubikey = 2130837755; static Drawable() { diff --git a/src/Android/Resources/drawable-hdpi/clipboard.png b/src/Android/Resources/drawable-hdpi/clipboard.png new file mode 100644 index 0000000000000000000000000000000000000000..bc3b024c89adcaf6ac8f13e30c8182b21c6d6ff6 GIT binary patch literal 426 zcmeAS@N?(olHy`uVBq!ia0vp^iXhCv3?vh*jADV*gaDrqS0HWEyJzqqxhcP90Ntct z666=mz{teH%ErmVD_+?2g1;Xu#d|MkxgE)qL+^JugB?;BrTX1zTh zrMl5I!05h1O4e; z666=mz{teR!pg?U#my%mBrGB>A*-OItf6aQWMXPzZDZ@;=H(L*8Wx$9oR(2oTHe|= zamv)`a~G^wyw_&jwkmNY#X3Z9>3S4a9vIRRwDI}h`^P8DzO+Qw;&DaY(v#-q#^&35{u+k;eBXD<@9Sx}bad@6@@McV7>fHfIt8^Qt_P zdlOE#v}AB^_}93ofN6(tKzE>wJ6E+0bB~UuTzX^Ip441Eg~B;Gwf1v=%e~K^z$Em& zgv0 z%BM#!uM~_vIZgGsqU8CHQo$Ry9=<)H}70esX1w+mDj1n)a%iCP_E6U$Yy3Gk^KDU2^%VBl5qG&p)_^CvMuodtH|cm+2pj u$#`tJ=j!89zU%&0)nB;pox9W$?SD_>P|4BdA65Xp#^CAd=d#Wzp$PzDg5lQy literal 0 HcmV?d00001 diff --git a/src/Android/Resources/drawable-xhdpi/launch.png b/src/Android/Resources/drawable-xhdpi/launch.png new file mode 100644 index 0000000000000000000000000000000000000000..3b67da0d8f2a619ba7e5dbe180491bf868d945c0 GIT binary patch literal 910 zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!3?wz9Rv9xeFq#JVgt!8^HobdB5lJE7WwF5; z7;tGNL4Lsuj7-cdtn3_|T--c-fnDKvU2hYipr{L8k$-Q zo?hO*q0#XvnYqOkmDM$M^_|_5rp}r@ciz&~8#Zm(xogk9gGY~_ICbXS`HR=@Jb3iv z+3UBTzkdJu`|l-}V`{)CTjc5D7-DgH@0Il6Lk(!M#`O?vCKD0d-@xe+QwPxU4AH2^70Dn zgqjT-;(ou^XkE^#c5Tc1-b5fjax0g)hI(y>l{hVT8`M0}GB9 zPQ8{V>UE#Nc#|F5j*yorqE&8}d>bmAesV>yzUFIKaHB$cjdA-2HO1Q=$B!MF*R?a; z`u3-l7RlL_E*rn!Zd_V%t#hfxdh3soH~dr=KXjZk>0r>Gb(eCM>^6@R@!rsWiR*lZ zN){)dz-;r<`f~}Kash8P&%U^5ma4^)2a?71={(aC;pqU42t?YgEaj?aro`E<9^JBB5n_> z)p=B>TyRpqBI4C1Ejr*A=0>X7J={u%`?s@C} z=TNuE5qkmYEVUhB#s{ai2|Nvnp1(YnSK-p>*7c9QO@(7tw7y^}SjVPxkM)61z2B4+ z_J%$wj-M4XgG~iCaUSTD;#kR8u!ha)8ly!Jvtl-bN|r*3Xv4PF38D;qx-B})7kJcf z-It&C*PJ2ExnouF=Ov6smQ^` zojYT*a8RwO@FL~K&8m(qo2wj`aPHsKF>CvWNv|VEOU{`1%GKY#xXZZ9~`z`&I4>Eaj?aro)A zo8gxoM2>&Fy~UN)aY|R%QZ0>;l;ZTjJAsajtgeANVG|ccga}NZ_Wu4m=M3w~%VsXA z{3uhOzf=A5NnfL#>Pr99rNrxeA|7^>DoCH|aEws)%SfJHU@rB0+2;6t(?0#|F@Kn3 za(-d@O@|Q4TE2wzWmjD+daSKBT$DGqpuF0ZOych z_g8;!{@ndOtaxXP-uAZD8(9vtuF~E%XZD}I@-p7tor=$YZRD*vVy4Hu=X&Gf^?%mr zOXoBAW$u2{8lP}Ig8jzgyh%w6jGLy3FiZ)z5#?Y=W0_ka7Q(<@XuV^@TH%!snAA-U z-Qv2ix%?H$1RIy|^`%(xLUbn)b@PNS&ttKa%fR?jjhu?&-v{pn3Zu{P4zL1M+ zVb7}MN4^uS$@98wmXkS~AK;p;P_LzSW2X&+<3 z=_@R9M_d_>9TvEFpTYc)fDu=LzKGyoP8%-Q69NYEeH~9823t4a71HjG?SX z`lW0`f7IH$|Bi?U^G-A5U3vZ6&9}R(y&m*fR?p_qvRSup|HBEk9UU_N9>_;zihtk2 ooBrw8|L;k5#*-%08`m=~%k*lV%6Qium;o3(UHx3vIVCg!0K?5ENdN!< literal 0 HcmV?d00001 diff --git a/src/Android/Resources/drawable-xxxhdpi/clipboard.png b/src/Android/Resources/drawable-xxxhdpi/clipboard.png new file mode 100644 index 0000000000000000000000000000000000000000..633580c6e23b1757fd136c3ad3b7001ce1c59e98 GIT binary patch literal 737 zcmeAS@N?(olHy`uVBq!ia0vp^5g^RL3?$vW53m8Ls{uYCu0YzRch4|G5)BHaAb*ww z`2{mDF|%-T@d*lxh>Ak7EjAly2M#sd=)q;%Z&tjax;< z8=6n^Ue7)F!kg3Y6pee@bmR>VXPo>dXWY}bX8nxATmN&)AOG5Te(Od5Wh?p5r+;goXZ9wY zKjLy*;Z(~9LGs^>|GV3~KK$X4+}~DvlZMU{tnU)ot#2IUD=Rqppi%e7J+VC*+{d=* zN)$gY=TDi(^WcmNUzq``ct01P>D>@k_E{fh7oFNwRj{aKamewvRj*ddWX}1Vt9qS@ h>(Gh-F)fBVhCI$LZqbQWtAJ6;;OXk;vd$@?2>_09Q`!Ik literal 0 HcmV?d00001 diff --git a/src/Android/Resources/drawable-xxxhdpi/launch.png b/src/Android/Resources/drawable-xxxhdpi/launch.png new file mode 100644 index 0000000000000000000000000000000000000000..ae4826f6e33d0c0bd8db6c52867efd348c9fdbc0 GIT binary patch literal 1512 zcmeAS@N?(olHy`uVBq!ia0vp^5g^RL3?$vW53n&XFm4O*32_B-ZF={NqM;Q6YpcCm zfiX9+B*-tAfsu)sg_Vt+gOiJ!hnJ6EKu}0nL{v;%LQ+avMpi*lSw&StQ%hG*-@wqw z)Xdt(*51*{*~Qh(-P6n4$Im|?FeoG}JR&kCHZCzKIVCMUBRi+0yt1agp{cpGt)shV z;?(IgX3d^EZ_(mqD^{)Ev~~N=J%^7TKXK~Jx$_qhbbWiwkPsJ|G@_|_1 zffT*&_QL{J%I*uCKN*yGoICV0W#x;6nPyARY?v8y$&~wKkI~__PmP`)-A8z&PdtoW zWqqXXSV*MQ@|B-+;|?&tPSx~EJl_AQgf+HqW%_cyk6Wcf^G;n$-z|M^nb4Qu*%za$ zY$EO#to$1maW*|e?Q~aEP5zB-tf9FRC0RGQDBA~k*OpufmX2(eIeF?*e2Bz?mFsqO z#-5njQ^Qpovn00Bnrn+dXkCXLYw4QbAN96~sVtVeS2!{6v3!PQW~J#~N#*>T(HZKR zmD+p1N|pc3z7Xff++gNru-$3n%R?5T-|`)A7X~I&Ufs9b%lh$(+UZrjvsremT&Iv2 zDfsx+1NWvFp=sM$cdFdUy3Na|^~ZOL_W{>KF--dss;)dc^yP%Z|G#;U%j3?eKIoYE zbLsb*nd-K#9m@6#a{(9?&eR~QfCcSx7u=Uv7REd|~$ApcqHZXq6e2{%0?nC>8 zv=B~?R#W5FXbqWjy9(`&h3D|epF4CpCXc@R(w~WB#NRJB5XFG^Vfq9MTy2y@%_C zSl;xDeg2b7w_7y!UDscqn)YZ$&e63$*2=xRTzk)AgtArH(JX@j!3w6=23^@O1TaS?83{1OQkT)QJE9 literal 0 HcmV?d00001 diff --git a/src/Android/Resources/drawable/clipboard.png b/src/Android/Resources/drawable/clipboard.png new file mode 100644 index 0000000000000000000000000000000000000000..c35d2563e60659a9f6ac4d206982f584a6323170 GIT binary patch literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H3?x5i&EW)6`2jv5u0YzRcMsi=U|Wwn&`On( zAirP+Rt_$19$qnV-@uU2u(;&XipnWdSFBpQXWzwp4<0>v@$&7@-*)Y)KY;41JY5_^ zB*NETI4RU*AmDmY!;!61fQ^ySvG)J}UN$C`vZJk`_pZL)oTHZbonxloTc0&s9g=?R z@GE0%N!)$^$1_1ceys(M=ga7aU*x}Yu!+C?{z0FgCl8)-_p7+HTSaEhbM-6!hpZa^ te>iyMtieEs(0=da&?{{B0y^dtw+*ejkcjv*3~y$3su4hJx_ zUDOZUDz;U>^X)3#EmOLpx=nmP@Bjb%gzxdWM#n7L>pzzN@LkX`@zurH?bY!MMZBiV zwXWR0=CaiqCgI7KjoBy7k}H^ahVftC?)CcSaw_TvzU@9%YLlXHf&cS~2lX#z*KntB zq&($6`+0N3r2^&&2R*88ebHzM+UDli=27)Uv(+nnV~WMJYmzJXU(r0dLI0wB?SG*E7(8A5T-G@yGywqHTM-uk literal 0 HcmV?d00001 diff --git a/src/App/Controls/FormEntryCell.cs b/src/App/Controls/FormEntryCell.cs index 7dbe76498..074386373 100644 --- a/src/App/Controls/FormEntryCell.cs +++ b/src/App/Controls/FormEntryCell.cs @@ -129,6 +129,7 @@ namespace Bit.App.Controls { Button.Padding = new Thickness(0); Button.BackgroundColor = Color.Transparent; + Button.WidthRequest = 40; } } diff --git a/src/App/Controls/LabeledValueCell.cs b/src/App/Controls/LabeledValueCell.cs index 6a74e11ed..ca77575e8 100644 --- a/src/App/Controls/LabeledValueCell.cs +++ b/src/App/Controls/LabeledValueCell.cs @@ -7,8 +7,8 @@ namespace Bit.App.Controls public LabeledValueCell( string labelText = null, string valueText = null, - string button1Text = null, - string button2Text = null, + string button1Image = null, + string button2Image = null, string subText = null) { var containerStackLayout = new StackLayout @@ -69,11 +69,11 @@ namespace Bit.App.Controls buttonStackLayout.Children.Add(Sub); } - if(button1Text != null) + if(button1Image != null) { Button1 = new ExtendedButton { - Text = button1Text, + Image = button1Image, HorizontalOptions = LayoutOptions.End, VerticalOptions = LayoutOptions.Center, Margin = new Thickness(0) @@ -82,11 +82,11 @@ namespace Bit.App.Controls buttonStackLayout.Children.Add(Button1); } - if(button2Text != null) + if(button2Image != null) { Button2 = new ExtendedButton { - Text = button2Text, + Image = button2Image, HorizontalOptions = LayoutOptions.End, VerticalOptions = LayoutOptions.Center, Margin = new Thickness(0) @@ -103,11 +103,13 @@ namespace Bit.App.Controls { Button1.Padding = new Thickness(0); Button1.BackgroundColor = Color.Transparent; + Button1.WidthRequest = 40; } if(Button2 != null) { Button2.Padding = new Thickness(0); Button2.BackgroundColor = Color.Transparent; + Button2.WidthRequest = 40; } containerStackLayout.AdjustPaddingForDevice(); diff --git a/src/App/Pages/Vault/VaultAddCipherPage.cs b/src/App/Pages/Vault/VaultAddCipherPage.cs index 16c6b2d79..086b62c01 100644 --- a/src/App/Pages/Vault/VaultAddCipherPage.cs +++ b/src/App/Pages/Vault/VaultAddCipherPage.cs @@ -481,18 +481,6 @@ namespace Bit.App.Pages Table.RowHeight = -1; Table.EstimatedRowHeight = 70; } - else if(Device.RuntimePlatform == Device.Android) - { - if(LoginPasswordCell?.Button != null) - { - LoginPasswordCell.Button.WidthRequest = 40; - } - - if(LoginTotpCell?.Button != null) - { - LoginTotpCell.Button.WidthRequest = 40; - } - } } private void InitSave() diff --git a/src/App/Pages/Vault/VaultCustomFieldsPage.cs b/src/App/Pages/Vault/VaultCustomFieldsPage.cs index b76cc27bd..5e5c2b09c 100644 --- a/src/App/Pages/Vault/VaultCustomFieldsPage.cs +++ b/src/App/Pages/Vault/VaultCustomFieldsPage.cs @@ -183,20 +183,15 @@ namespace Bit.App.Pages { textFieldCell.Entry.FontFamily = Helpers.OnPlatform( iOS: "Menlo-Regular", Android: "monospace", WinPhone: "Courier"); - textFieldCell.Button.Image = "eye"; + textFieldCell.Button.Image = "eye.png"; textFieldCell.Button.Command = new Command(() => { textFieldCell.Entry.InvokeToggleIsPassword(); textFieldCell.Button.Image = - "eye" + (!textFieldCell.Entry.IsPasswordFromToggled ? "_slash" : string.Empty); + "eye" + (!textFieldCell.Entry.IsPasswordFromToggled ? "_slash" : string.Empty) + ".png"; }); } - if(Device.RuntimePlatform == Device.Android && textFieldCell.Button != null) - { - textFieldCell.Button.WidthRequest = 40; - } - textFieldCell.InitEvents(); FieldsSection.Add(textFieldCell); break; diff --git a/src/App/Pages/Vault/VaultEditCipherPage.cs b/src/App/Pages/Vault/VaultEditCipherPage.cs index 110f6001b..7112dd648 100644 --- a/src/App/Pages/Vault/VaultEditCipherPage.cs +++ b/src/App/Pages/Vault/VaultEditCipherPage.cs @@ -65,7 +65,7 @@ namespace Bit.App.Pages useButton: _deviceInfo.HasCamera); if(_deviceInfo.HasCamera) { - TotpCell.Button.Image = "camera"; + TotpCell.Button.Image = "camera.png"; } TotpCell.Entry.Text = cipher.Login?.Totp?.Decrypt(cipher.OrganizationId); TotpCell.Entry.DisableAutocapitalize = true; @@ -75,7 +75,7 @@ namespace Bit.App.Pages PasswordCell = new FormEntryCell(AppResources.Password, isPassword: true, nextElement: TotpCell.Entry, useButton: true); PasswordCell.Entry.Text = cipher.Login?.Password?.Decrypt(cipher.OrganizationId); - PasswordCell.Button.Image = "eye"; + PasswordCell.Button.Image = "eye.png"; PasswordCell.Entry.DisableAutocapitalize = true; PasswordCell.Entry.Autocorrect = false; PasswordCell.Entry.FontFamily = Helpers.OnPlatform(iOS: "Menlo-Regular", Android: "monospace", WinPhone: "Courier"); @@ -173,15 +173,6 @@ namespace Bit.App.Pages table.RowHeight = -1; table.EstimatedRowHeight = 70; } - else if(Device.RuntimePlatform == Device.Android) - { - PasswordCell.Button.WidthRequest = 40; - - if(TotpCell.Button != null) - { - TotpCell.Button.WidthRequest = 40; - } - } var saveToolBarItem = new ToolbarItem(AppResources.Save, null, async () => { diff --git a/src/App/Pages/Vault/VaultViewCipherPage.cs b/src/App/Pages/Vault/VaultViewCipherPage.cs index 6c825e2b6..a2e646e07 100644 --- a/src/App/Pages/Vault/VaultViewCipherPage.cs +++ b/src/App/Pages/Vault/VaultViewCipherPage.cs @@ -64,14 +64,14 @@ namespace Bit.App.Pages nameCell.Value.SetBinding(Label.TextProperty, nameof(VaultViewLoginPageModel.Name)); // Username - UsernameCell = new LabeledValueCell(AppResources.Username, button1Text: AppResources.Copy); + UsernameCell = new LabeledValueCell(AppResources.Username, button1Image: "clipboard.png"); UsernameCell.Value.SetBinding(Label.TextProperty, nameof(VaultViewLoginPageModel.Username)); UsernameCell.Button1.Command = new Command(() => Copy(Model.Username, AppResources.Username)); UsernameCell.Value.LineBreakMode = LineBreakMode.WordWrap; // Password - PasswordCell = new LabeledValueCell(AppResources.Password, button1Text: string.Empty, - button2Text: AppResources.Copy); + PasswordCell = new LabeledValueCell(AppResources.Password, button1Image: string.Empty, + button2Image: "clipboard.png"); PasswordCell.Value.SetBinding(Label.TextProperty, nameof(VaultViewLoginPageModel.MaskedPassword)); PasswordCell.Button1.SetBinding(Button.ImageProperty, nameof(VaultViewLoginPageModel.ShowHideImage)); if(Device.RuntimePlatform == Device.iOS) @@ -84,7 +84,7 @@ namespace Bit.App.Pages PasswordCell.Value.LineBreakMode = LineBreakMode.WordWrap; // URI - UriCell = new LabeledValueCell(AppResources.Website, button1Text: AppResources.Launch); + UriCell = new LabeledValueCell(AppResources.Website, button1Image: "launch.png"); UriCell.Value.SetBinding(Label.TextProperty, nameof(VaultViewLoginPageModel.UriHost)); UriCell.Button1.SetBinding(IsVisibleProperty, nameof(VaultViewLoginPageModel.ShowLaunch)); UriCell.Button1.Command = new Command(() => @@ -100,7 +100,7 @@ namespace Bit.App.Pages }); // Totp - TotpCodeCell = new LabeledValueCell(AppResources.VerificationCodeTotp, button1Text: AppResources.Copy, subText: "--"); + TotpCodeCell = new LabeledValueCell(AppResources.VerificationCodeTotp, button1Image: "clipboard.png", subText: "--"); TotpCodeCell.Value.SetBinding(Label.TextProperty, nameof(VaultViewLoginPageModel.TotpCodeFormatted)); TotpCodeCell.Value.SetBinding(Label.TextColorProperty, nameof(VaultViewLoginPageModel.TotpColor)); TotpCodeCell.Button1.Command = new Command(() => Copy(Model.TotpCode, AppResources.VerificationCodeTotp)); @@ -140,15 +140,6 @@ namespace Bit.App.Pages Table.RowHeight = -1; Table.EstimatedRowHeight = 70; } - else if(Device.RuntimePlatform == Device.Android) - { - // NOTE: This is going to cause problems with i18n strings since various languages have difference string sizes - PasswordCell.Button1.WidthRequest = 40; - PasswordCell.Button2.WidthRequest = 59; - UsernameCell.Button1.WidthRequest = 59; - TotpCodeCell.Button1.WidthRequest = 59; - UriCell.Button1.WidthRequest = 75; - } Title = AppResources.ViewItem; Content = Table; @@ -429,13 +420,13 @@ namespace Bit.App.Pages } public FieldViewCell(VaultViewCipherPage page, VaultViewLoginPageModel.Field field, bool? a) - : base(field.Name, field.Value, AppResources.Copy) + : base(field.Name, field.Value, "clipboard.png") { Init(page, field, Button1); } public FieldViewCell(VaultViewCipherPage page, VaultViewLoginPageModel.Field field, bool? a, bool? b) - : base(field.Name, field.MaskedValue, string.Empty, AppResources.Copy) + : base(field.Name, field.MaskedValue, string.Empty, "clipboard.png") { Value.FontFamily = Helpers.OnPlatform(iOS: "Menlo-Regular", Android: "monospace", WinPhone: "Courier"); @@ -443,20 +434,19 @@ namespace Bit.App.Pages { Button1.Margin = new Thickness(10, 0); } - - Button1.WidthRequest = 40; + Button1.Image = "eye"; Button1.Command = new Command(() => { field.Revealed = !field.Revealed; if(field.Revealed) { - Button1.Image = "eye_slash"; + Button1.Image = "eye_slash.png"; Value.Text = field.Value; } else { - Button1.Image = "eye"; + Button1.Image = "eye.png"; Value.Text = field.MaskedValue; } }); @@ -470,7 +460,6 @@ namespace Bit.App.Pages if(copyButton != null) { copyButton.Command = new Command(() => page.Copy(field.Value, field.Name)); - copyButton.WidthRequest = 59; } } } diff --git a/src/UWP.Images/UWP.Images.projitems b/src/UWP.Images/UWP.Images.projitems index 5eb620da8..c5f4a499a 100644 --- a/src/UWP.Images/UWP.Images.projitems +++ b/src/UWP.Images/UWP.Images.projitems @@ -10,6 +10,7 @@ + @@ -25,6 +26,7 @@ + diff --git a/src/UWP.Images/clipboard.png b/src/UWP.Images/clipboard.png new file mode 100644 index 0000000000000000000000000000000000000000..633580c6e23b1757fd136c3ad3b7001ce1c59e98 GIT binary patch literal 737 zcmeAS@N?(olHy`uVBq!ia0vp^5g^RL3?$vW53m8Ls{uYCu0YzRch4|G5)BHaAb*ww z`2{mDF|%-T@d*lxh>Ak7EjAly2M#sd=)q;%Z&tjax;< z8=6n^Ue7)F!kg3Y6pee@bmR>VXPo>dXWY}bX8nxATmN&)AOG5Te(Od5Wh?p5r+;goXZ9wY zKjLy*;Z(~9LGs^>|GV3~KK$X4+}~DvlZMU{tnU)ot#2IUD=Rqppi%e7J+VC*+{d=* zN)$gY=TDi(^WcmNUzq``ct01P>D>@k_E{fh7oFNwRj{aKamewvRj*ddWX}1Vt9qS@ h>(Gh-F)fBVhCI$LZqbQWtAJ6;;OXk;vd$@?2>_09Q`!Ik literal 0 HcmV?d00001 diff --git a/src/UWP.Images/launch.png b/src/UWP.Images/launch.png new file mode 100644 index 0000000000000000000000000000000000000000..ae4826f6e33d0c0bd8db6c52867efd348c9fdbc0 GIT binary patch literal 1512 zcmeAS@N?(olHy`uVBq!ia0vp^5g^RL3?$vW53n&XFm4O*32_B-ZF={NqM;Q6YpcCm zfiX9+B*-tAfsu)sg_Vt+gOiJ!hnJ6EKu}0nL{v;%LQ+avMpi*lSw&StQ%hG*-@wqw z)Xdt(*51*{*~Qh(-P6n4$Im|?FeoG}JR&kCHZCzKIVCMUBRi+0yt1agp{cpGt)shV z;?(IgX3d^EZ_(mqD^{)Ev~~N=J%^7TKXK~Jx$_qhbbWiwkPsJ|G@_|_1 zffT*&_QL{J%I*uCKN*yGoICV0W#x;6nPyARY?v8y$&~wKkI~__PmP`)-A8z&PdtoW zWqqXXSV*MQ@|B-+;|?&tPSx~EJl_AQgf+HqW%_cyk6Wcf^G;n$-z|M^nb4Qu*%za$ zY$EO#to$1maW*|e?Q~aEP5zB-tf9FRC0RGQDBA~k*OpufmX2(eIeF?*e2Bz?mFsqO z#-5njQ^Qpovn00Bnrn+dXkCXLYw4QbAN96~sVtVeS2!{6v3!PQW~J#~N#*>T(HZKR zmD+p1N|pc3z7Xff++gNru-$3n%R?5T-|`)A7X~I&Ufs9b%lh$(+UZrjvsremT&Iv2 zDfsx+1NWvFp=sM$cdFdUy3Na|^~ZOL_W{>KF--dss;)dc^yP%Z|G#;U%j3?eKIoYE zbLsb*nd-K#9m@6#a{(9?&eR~QfCcSx7u=Uv7REd|~$ApcqHZXq6e2{%0?nC>8 zv=B~?R#W5FXbqWjy9(`&h3D|epF4CpCXc@R(w~WB#NRJB5XFG^Vfq9MTy2y@%_C zSl;xDeg2b7w_7y!UDscqn)YZ$&e63$*2=xRTzk)AgtArH(JX@j!3w6=23^@O1TaS?83{1OQkT)QJE9 literal 0 HcmV?d00001 diff --git a/src/iOS/Resources/clipboard.png b/src/iOS/Resources/clipboard.png new file mode 100644 index 0000000000000000000000000000000000000000..c35d2563e60659a9f6ac4d206982f584a6323170 GIT binary patch literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H3?x5i&EW)6`2jv5u0YzRcMsi=U|Wwn&`On( zAirP+Rt_$19$qnV-@uU2u(;&XipnWdSFBpQXWzwp4<0>v@$&7@-*)Y)KY;41JY5_^ zB*NETI4RU*AmDmY!;!61fQ^ySvG)J}UN$C`vZJk`_pZL)oTHZbonxloTc0&s9g=?R z@GE0%N!)$^$1_1ceys(M=ga7aU*x}Yu!+C?{z0FgCl8)-_p7+HTSaEhbM-6!hpZa^ te>igv0 z%BM#!uM~_vIZgGsqU8CHQo$Ry9=<)H}70esX1w+mDj1n)a%iCP_E6U$Yy3Gk^KDU2^%VBl5qG&p)_^CvMuodtH|cm+2pj u$#`tJ=j!89zU%&0)nB;pox9W$?SD_>P|4BdA65Xp#^CAd=d#Wzp$PzDg5lQy literal 0 HcmV?d00001 diff --git a/src/iOS/Resources/clipboard@3x.png b/src/iOS/Resources/clipboard@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..e8ce1e1eac9645d56dbbee379ff66b6d63953a87 GIT binary patch literal 677 zcmeAS@N?(olHy`uVBq!ia0vp^P9V&|3?#2~eYgdrZU^{;xB_XL-aW$--AEK%0`#6o zNswPK10ypl8#@Olx1flqn3k@dzJZ0MuU}w9OiFrYPJVGoX+>pqU42t?YgEaj?aro`E<9^JBB5n_> z)p=B>TyRpqBI4C1Ejr*A=0>X7J={u%`?s@C} z=TNuE5qkmYEVUhB#s{ai2|Nvnp1(YnSK-p>*7c9QO@(7tw7y^}SjVPxkM)61z2B4+ z_J%$wj-M4XgG~iCaUSTD;#kR8u!ha)8ly!Jvtl-bN|r*3Xv4PF38D;qx-B})7kJcf z-It&C*PJ2ExnouF=Ov6smQ^` zojYT*a8RwO@FL~K&8m(qo2wj`aPHsKF>CvWNvyMtieEs(0=da&?{{B0y^dtw+*ejkcjv*3~y$3su4hJx_ zUDOZUDz;U>^X)3#EmOLpx=nmP@Bjb%gzxdWM#n7L>pzzN@LkX`@zurH?bY!MMZBiV zwXWR0=CaiqCgI7KjoBy7k}H^ahVftC?)CcSaw_TvzU@9%YLlXHf&cS~2lX#z*KntB zq&($6`+0N3r2^&&2R*88ebHzM+UDli=27)Uv(+nnV~WMJYmzJXU(r0dLI0wB?SG*E7(8A5T-G@yGywqHTM-uk literal 0 HcmV?d00001 diff --git a/src/iOS/Resources/launch@2x.png b/src/iOS/Resources/launch@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..3b67da0d8f2a619ba7e5dbe180491bf868d945c0 GIT binary patch literal 910 zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!3?wz9Rv9xeFq#JVgt!8^HobdB5lJE7WwF5; z7;tGNL4Lsuj7-cdtn3_|T--c-fnDKvU2hYipr{L8k$-Q zo?hO*q0#XvnYqOkmDM$M^_|_5rp}r@ciz&~8#Zm(xogk9gGY~_ICbXS`HR=@Jb3iv z+3UBTzkdJu`|l-}V`{)CTjc5D7-DgH@0Il6Lk(!M#`O?vCKD0d-@xe+QwPxU4AH2^70Dn zgqjT-;(ou^XkE^#c5Tc1-b5fjax0g)hI(y>l{hVT8`M0}GB9 zPQ8{V>UE#Nc#|F5j*yorqE&8}d>bmAesV>yzUFIKaHB$cjdA-2HO1Q=$B!MF*R?a; z`u3-l7RlL_E*rn!Zd_V%t#hfxdh3soH~dr=KXjZk>0r>Gb(eCM>^6@R@!rsWiR*lZ zN){)dz-;r<`f~}Kash8P&%U^5ma4^)2a?71={(aC;|VEOU{`1%GKY#xXZZ9~`z`&I4>Eaj?aro)A zo8gxoM2>&Fy~UN)aY|R%QZ0>;l;ZTjJAsajtgeANVG|ccga}NZ_Wu4m=M3w~%VsXA z{3uhOzf=A5NnfL#>Pr99rNrxeA|7^>DoCH|aEws)%SfJHU@rB0+2;6t(?0#|F@Kn3 za(-d@O@|Q4TE2wzWmjD+daSKBT$DGqpuF0ZOych z_g8;!{@ndOtaxXP-uAZD8(9vtuF~E%XZD}I@-p7tor=$YZRD*vVy4Hu=X&Gf^?%mr zOXoBAW$u2{8lP}Ig8jzgyh%w6jGLy3FiZ)z5#?Y=W0_ka7Q(<@XuV^@TH%!snAA-U z-Qv2ix%?H$1RIy|^`%(xLUbn)b@PNS&ttKa%fR?jjhu?&-v{pn3Zu{P4zL1M+ zVb7}MN4^uS$@98wmXkS~AK;p;P_LzSW2X&+<3 z=_@R9M_d_>9TvEFpTYc)fDu=LzKGyoP8%-Q69NYEeH~9823t4a71HjG?SX z`lW0`f7IH$|Bi?U^G-A5U3vZ6&9}R(y&m*fR?p_qvRSup|HBEk9UU_N9>_;zihtk2 ooBrw8|L;k5#*-%08`m=~%k*lV%6Qium;o3(UHx3vIVCg!0K?5ENdN!< literal 0 HcmV?d00001 diff --git a/src/iOS/iOS.csproj b/src/iOS/iOS.csproj index 07c3a3bbd..bda76a012 100644 --- a/src/iOS/iOS.csproj +++ b/src/iOS/iOS.csproj @@ -745,6 +745,24 @@ false + + + + + + + + + + + + + + + + + +