From 83f00d69cef0206bffd79fda22d42aafe495e8d1 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Thu, 2 Feb 2017 22:20:45 -0500 Subject: [PATCH] added close button to autofill list page. if uri is a website on api level < 21, do not autofill and present modal for copying --- src/Android/Android.csproj | 15 + src/Android/Resources/Resource.Designer.cs | 331 +++++++++--------- src/Android/Resources/drawable-hdpi/close.png | Bin 0 -> 347 bytes .../Resources/drawable-xhdpi/close.png | Bin 0 -> 404 bytes .../Resources/drawable-xxhdpi/close.png | Bin 0 -> 374 bytes .../Resources/drawable-xxxhdpi/close.png | Bin 0 -> 564 bytes src/Android/Resources/drawable/close.png | Bin 0 -> 312 bytes .../Vault/VaultAutofillListLoginsPage.cs | 32 +- 8 files changed, 213 insertions(+), 165 deletions(-) create mode 100644 src/Android/Resources/drawable-hdpi/close.png create mode 100644 src/Android/Resources/drawable-xhdpi/close.png create mode 100644 src/Android/Resources/drawable-xxhdpi/close.png create mode 100644 src/Android/Resources/drawable-xxxhdpi/close.png create mode 100644 src/Android/Resources/drawable/close.png diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj index af3be4ea5..cefb60f58 100644 --- a/src/Android/Android.csproj +++ b/src/Android/Android.csproj @@ -812,6 +812,21 @@ + + + + + + + + + + + + + + + diff --git a/src/Android/Resources/Resource.Designer.cs b/src/Android/Resources/Resource.Designer.cs index c61a03c12..122651681 100644 --- a/src/Android/Resources/Resource.Designer.cs +++ b/src/Android/Resources/Resource.Designer.cs @@ -2293,490 +2293,493 @@ namespace Bit.Android public const int accessibility_step2 = 2130837582; // aapt resource value: 0x7f02004f - public const int cloudup = 2130837583; + public const int close = 2130837583; // aapt resource value: 0x7f020050 - public const int cogs = 2130837584; + public const int cloudup = 2130837584; // aapt resource value: 0x7f020051 - public const int cogs_selected = 2130837585; + public const int cogs = 2130837585; // aapt resource value: 0x7f020052 - public const int common_full_open_on_phone = 2130837586; + public const int cogs_selected = 2130837586; // aapt resource value: 0x7f020053 - public const int common_google_signin_btn_icon_dark = 2130837587; + public const int common_full_open_on_phone = 2130837587; // aapt resource value: 0x7f020054 - public const int common_google_signin_btn_icon_dark_disabled = 2130837588; + public const int common_google_signin_btn_icon_dark = 2130837588; // aapt resource value: 0x7f020055 - public const int common_google_signin_btn_icon_dark_focused = 2130837589; + public const int common_google_signin_btn_icon_dark_disabled = 2130837589; // aapt resource value: 0x7f020056 - public const int common_google_signin_btn_icon_dark_normal = 2130837590; + public const int common_google_signin_btn_icon_dark_focused = 2130837590; // aapt resource value: 0x7f020057 - public const int common_google_signin_btn_icon_dark_pressed = 2130837591; + public const int common_google_signin_btn_icon_dark_normal = 2130837591; // aapt resource value: 0x7f020058 - public const int common_google_signin_btn_icon_light = 2130837592; + public const int common_google_signin_btn_icon_dark_pressed = 2130837592; // aapt resource value: 0x7f020059 - public const int common_google_signin_btn_icon_light_disabled = 2130837593; + public const int common_google_signin_btn_icon_light = 2130837593; // aapt resource value: 0x7f02005a - public const int common_google_signin_btn_icon_light_focused = 2130837594; + public const int common_google_signin_btn_icon_light_disabled = 2130837594; // aapt resource value: 0x7f02005b - public const int common_google_signin_btn_icon_light_normal = 2130837595; + public const int common_google_signin_btn_icon_light_focused = 2130837595; // aapt resource value: 0x7f02005c - public const int common_google_signin_btn_icon_light_pressed = 2130837596; + public const int common_google_signin_btn_icon_light_normal = 2130837596; // aapt resource value: 0x7f02005d - public const int common_google_signin_btn_text_dark = 2130837597; + public const int common_google_signin_btn_icon_light_pressed = 2130837597; // aapt resource value: 0x7f02005e - public const int common_google_signin_btn_text_dark_disabled = 2130837598; + public const int common_google_signin_btn_text_dark = 2130837598; // aapt resource value: 0x7f02005f - public const int common_google_signin_btn_text_dark_focused = 2130837599; + public const int common_google_signin_btn_text_dark_disabled = 2130837599; // aapt resource value: 0x7f020060 - public const int common_google_signin_btn_text_dark_normal = 2130837600; + public const int common_google_signin_btn_text_dark_focused = 2130837600; // aapt resource value: 0x7f020061 - public const int common_google_signin_btn_text_dark_pressed = 2130837601; + public const int common_google_signin_btn_text_dark_normal = 2130837601; // aapt resource value: 0x7f020062 - public const int common_google_signin_btn_text_light = 2130837602; + public const int common_google_signin_btn_text_dark_pressed = 2130837602; // aapt resource value: 0x7f020063 - public const int common_google_signin_btn_text_light_disabled = 2130837603; + public const int common_google_signin_btn_text_light = 2130837603; // aapt resource value: 0x7f020064 - public const int common_google_signin_btn_text_light_focused = 2130837604; + public const int common_google_signin_btn_text_light_disabled = 2130837604; // aapt resource value: 0x7f020065 - public const int common_google_signin_btn_text_light_normal = 2130837605; + public const int common_google_signin_btn_text_light_focused = 2130837605; // aapt resource value: 0x7f020066 - public const int common_google_signin_btn_text_light_pressed = 2130837606; + public const int common_google_signin_btn_text_light_normal = 2130837606; // aapt resource value: 0x7f020067 - public const int common_ic_googleplayservices = 2130837607; + public const int common_google_signin_btn_text_light_pressed = 2130837607; // aapt resource value: 0x7f020068 - public const int common_plus_signin_btn_icon_dark = 2130837608; + public const int common_ic_googleplayservices = 2130837608; // aapt resource value: 0x7f020069 - public const int common_plus_signin_btn_icon_dark_disabled = 2130837609; + public const int common_plus_signin_btn_icon_dark = 2130837609; // aapt resource value: 0x7f02006a - public const int common_plus_signin_btn_icon_dark_focused = 2130837610; + public const int common_plus_signin_btn_icon_dark_disabled = 2130837610; // aapt resource value: 0x7f02006b - public const int common_plus_signin_btn_icon_dark_normal = 2130837611; + public const int common_plus_signin_btn_icon_dark_focused = 2130837611; // aapt resource value: 0x7f02006c - public const int common_plus_signin_btn_icon_dark_pressed = 2130837612; + public const int common_plus_signin_btn_icon_dark_normal = 2130837612; // aapt resource value: 0x7f02006d - public const int common_plus_signin_btn_icon_light = 2130837613; + public const int common_plus_signin_btn_icon_dark_pressed = 2130837613; // aapt resource value: 0x7f02006e - public const int common_plus_signin_btn_icon_light_disabled = 2130837614; + public const int common_plus_signin_btn_icon_light = 2130837614; // aapt resource value: 0x7f02006f - public const int common_plus_signin_btn_icon_light_focused = 2130837615; + public const int common_plus_signin_btn_icon_light_disabled = 2130837615; // aapt resource value: 0x7f020070 - public const int common_plus_signin_btn_icon_light_normal = 2130837616; + public const int common_plus_signin_btn_icon_light_focused = 2130837616; // aapt resource value: 0x7f020071 - public const int common_plus_signin_btn_icon_light_pressed = 2130837617; + public const int common_plus_signin_btn_icon_light_normal = 2130837617; // aapt resource value: 0x7f020072 - public const int common_plus_signin_btn_text_dark = 2130837618; + public const int common_plus_signin_btn_icon_light_pressed = 2130837618; // aapt resource value: 0x7f020073 - public const int common_plus_signin_btn_text_dark_disabled = 2130837619; + public const int common_plus_signin_btn_text_dark = 2130837619; // aapt resource value: 0x7f020074 - public const int common_plus_signin_btn_text_dark_focused = 2130837620; + public const int common_plus_signin_btn_text_dark_disabled = 2130837620; // aapt resource value: 0x7f020075 - public const int common_plus_signin_btn_text_dark_normal = 2130837621; + public const int common_plus_signin_btn_text_dark_focused = 2130837621; // aapt resource value: 0x7f020076 - public const int common_plus_signin_btn_text_dark_pressed = 2130837622; + public const int common_plus_signin_btn_text_dark_normal = 2130837622; // aapt resource value: 0x7f020077 - public const int common_plus_signin_btn_text_light = 2130837623; + public const int common_plus_signin_btn_text_dark_pressed = 2130837623; // aapt resource value: 0x7f020078 - public const int common_plus_signin_btn_text_light_disabled = 2130837624; + public const int common_plus_signin_btn_text_light = 2130837624; // aapt resource value: 0x7f020079 - public const int common_plus_signin_btn_text_light_focused = 2130837625; + public const int common_plus_signin_btn_text_light_disabled = 2130837625; // aapt resource value: 0x7f02007a - public const int common_plus_signin_btn_text_light_normal = 2130837626; + public const int common_plus_signin_btn_text_light_focused = 2130837626; // aapt resource value: 0x7f02007b - public const int common_plus_signin_btn_text_light_pressed = 2130837627; + public const int common_plus_signin_btn_text_light_normal = 2130837627; // aapt resource value: 0x7f02007c - public const int design_fab_background = 2130837628; + public const int common_plus_signin_btn_text_light_pressed = 2130837628; // aapt resource value: 0x7f02007d - public const int design_snackbar_background = 2130837629; + public const int design_fab_background = 2130837629; // aapt resource value: 0x7f02007e - public const int envelope = 2130837630; + public const int design_snackbar_background = 2130837630; // aapt resource value: 0x7f02007f - public const int eye = 2130837631; + public const int envelope = 2130837631; // aapt resource value: 0x7f020080 - public const int eye_slash = 2130837632; + public const int eye = 2130837632; // aapt resource value: 0x7f020081 - public const int fa_lock = 2130837633; + public const int eye_slash = 2130837633; // aapt resource value: 0x7f020082 - public const int fa_lock_selected = 2130837634; + public const int fa_lock = 2130837634; // aapt resource value: 0x7f020083 - public const int fingerprint = 2130837635; + public const int fa_lock_selected = 2130837635; // aapt resource value: 0x7f020084 - public const int fingerprint_white = 2130837636; + public const int fingerprint = 2130837636; // aapt resource value: 0x7f020085 - public const int folder = 2130837637; + public const int fingerprint_white = 2130837637; // aapt resource value: 0x7f020086 - public const int globe = 2130837638; + public const int folder = 2130837638; // aapt resource value: 0x7f020087 - public const int hockeyapp_btn_background = 2130837639; + public const int globe = 2130837639; // aapt resource value: 0x7f020088 - public const int ic_audiotrack = 2130837640; + public const int hockeyapp_btn_background = 2130837640; // aapt resource value: 0x7f020089 - public const int ic_audiotrack_light = 2130837641; + public const int ic_audiotrack = 2130837641; // aapt resource value: 0x7f02008a - public const int ic_bluetooth_grey = 2130837642; + public const int ic_audiotrack_light = 2130837642; // aapt resource value: 0x7f02008b - public const int ic_bluetooth_white = 2130837643; + public const int ic_bluetooth_grey = 2130837643; // aapt resource value: 0x7f02008c - public const int ic_cast_dark = 2130837644; + public const int ic_bluetooth_white = 2130837644; // aapt resource value: 0x7f02008d - public const int ic_cast_disabled_light = 2130837645; + public const int ic_cast_dark = 2130837645; // aapt resource value: 0x7f02008e - public const int ic_cast_grey = 2130837646; + public const int ic_cast_disabled_light = 2130837646; // aapt resource value: 0x7f02008f - public const int ic_cast_light = 2130837647; + public const int ic_cast_grey = 2130837647; // aapt resource value: 0x7f020090 - public const int ic_cast_off_light = 2130837648; + public const int ic_cast_light = 2130837648; // aapt resource value: 0x7f020091 - public const int ic_cast_on_0_light = 2130837649; + public const int ic_cast_off_light = 2130837649; // aapt resource value: 0x7f020092 - public const int ic_cast_on_1_light = 2130837650; + public const int ic_cast_on_0_light = 2130837650; // aapt resource value: 0x7f020093 - public const int ic_cast_on_2_light = 2130837651; + public const int ic_cast_on_1_light = 2130837651; // aapt resource value: 0x7f020094 - public const int ic_cast_on_light = 2130837652; + public const int ic_cast_on_2_light = 2130837652; // aapt resource value: 0x7f020095 - public const int ic_cast_white = 2130837653; + public const int ic_cast_on_light = 2130837653; // aapt resource value: 0x7f020096 - public const int ic_close_dark = 2130837654; + public const int ic_cast_white = 2130837654; // aapt resource value: 0x7f020097 - public const int ic_close_light = 2130837655; + public const int ic_close_dark = 2130837655; // aapt resource value: 0x7f020098 - public const int ic_collapse = 2130837656; + public const int ic_close_light = 2130837656; // aapt resource value: 0x7f020099 - public const int ic_collapse_00000 = 2130837657; + public const int ic_collapse = 2130837657; // aapt resource value: 0x7f02009a - public const int ic_collapse_00001 = 2130837658; + public const int ic_collapse_00000 = 2130837658; // aapt resource value: 0x7f02009b - public const int ic_collapse_00002 = 2130837659; + public const int ic_collapse_00001 = 2130837659; // aapt resource value: 0x7f02009c - public const int ic_collapse_00003 = 2130837660; + public const int ic_collapse_00002 = 2130837660; // aapt resource value: 0x7f02009d - public const int ic_collapse_00004 = 2130837661; + public const int ic_collapse_00003 = 2130837661; // aapt resource value: 0x7f02009e - public const int ic_collapse_00005 = 2130837662; + public const int ic_collapse_00004 = 2130837662; // aapt resource value: 0x7f02009f - public const int ic_collapse_00006 = 2130837663; + public const int ic_collapse_00005 = 2130837663; // aapt resource value: 0x7f0200a0 - public const int ic_collapse_00007 = 2130837664; + public const int ic_collapse_00006 = 2130837664; // aapt resource value: 0x7f0200a1 - public const int ic_collapse_00008 = 2130837665; + public const int ic_collapse_00007 = 2130837665; // aapt resource value: 0x7f0200a2 - public const int ic_collapse_00009 = 2130837666; + public const int ic_collapse_00008 = 2130837666; // aapt resource value: 0x7f0200a3 - public const int ic_collapse_00010 = 2130837667; + public const int ic_collapse_00009 = 2130837667; // aapt resource value: 0x7f0200a4 - public const int ic_collapse_00011 = 2130837668; + public const int ic_collapse_00010 = 2130837668; // aapt resource value: 0x7f0200a5 - public const int ic_collapse_00012 = 2130837669; + public const int ic_collapse_00011 = 2130837669; // aapt resource value: 0x7f0200a6 - public const int ic_collapse_00013 = 2130837670; + public const int ic_collapse_00012 = 2130837670; // aapt resource value: 0x7f0200a7 - public const int ic_collapse_00014 = 2130837671; + public const int ic_collapse_00013 = 2130837671; // aapt resource value: 0x7f0200a8 - public const int ic_collapse_00015 = 2130837672; + public const int ic_collapse_00014 = 2130837672; // aapt resource value: 0x7f0200a9 - public const int ic_errorstatus = 2130837673; + public const int ic_collapse_00015 = 2130837673; // aapt resource value: 0x7f0200aa - public const int ic_expand = 2130837674; + public const int ic_errorstatus = 2130837674; // aapt resource value: 0x7f0200ab - public const int ic_expand_00000 = 2130837675; + public const int ic_expand = 2130837675; // aapt resource value: 0x7f0200ac - public const int ic_expand_00001 = 2130837676; + public const int ic_expand_00000 = 2130837676; // aapt resource value: 0x7f0200ad - public const int ic_expand_00002 = 2130837677; + public const int ic_expand_00001 = 2130837677; // aapt resource value: 0x7f0200ae - public const int ic_expand_00003 = 2130837678; + public const int ic_expand_00002 = 2130837678; // aapt resource value: 0x7f0200af - public const int ic_expand_00004 = 2130837679; + public const int ic_expand_00003 = 2130837679; // aapt resource value: 0x7f0200b0 - public const int ic_expand_00005 = 2130837680; + public const int ic_expand_00004 = 2130837680; // aapt resource value: 0x7f0200b1 - public const int ic_expand_00006 = 2130837681; + public const int ic_expand_00005 = 2130837681; // aapt resource value: 0x7f0200b2 - public const int ic_expand_00007 = 2130837682; + public const int ic_expand_00006 = 2130837682; // aapt resource value: 0x7f0200b3 - public const int ic_expand_00008 = 2130837683; + public const int ic_expand_00007 = 2130837683; // aapt resource value: 0x7f0200b4 - public const int ic_expand_00009 = 2130837684; + public const int ic_expand_00008 = 2130837684; // aapt resource value: 0x7f0200b5 - public const int ic_expand_00010 = 2130837685; + public const int ic_expand_00009 = 2130837685; // aapt resource value: 0x7f0200b6 - public const int ic_expand_00011 = 2130837686; + public const int ic_expand_00010 = 2130837686; // aapt resource value: 0x7f0200b7 - public const int ic_expand_00012 = 2130837687; + public const int ic_expand_00011 = 2130837687; // aapt resource value: 0x7f0200b8 - public const int ic_expand_00013 = 2130837688; + public const int ic_expand_00012 = 2130837688; // aapt resource value: 0x7f0200b9 - public const int ic_expand_00014 = 2130837689; + public const int ic_expand_00013 = 2130837689; // aapt resource value: 0x7f0200ba - public const int ic_expand_00015 = 2130837690; + public const int ic_expand_00014 = 2130837690; // aapt resource value: 0x7f0200bb - public const int ic_media_pause = 2130837691; + public const int ic_expand_00015 = 2130837691; // aapt resource value: 0x7f0200bc - public const int ic_media_play = 2130837692; + public const int ic_media_pause = 2130837692; // aapt resource value: 0x7f0200bd - public const int ic_media_route_disabled_mono_dark = 2130837693; + public const int ic_media_play = 2130837693; // aapt resource value: 0x7f0200be - public const int ic_media_route_off_mono_dark = 2130837694; + public const int ic_media_route_disabled_mono_dark = 2130837694; // aapt resource value: 0x7f0200bf - public const int ic_media_route_on_0_mono_dark = 2130837695; + public const int ic_media_route_off_mono_dark = 2130837695; // aapt resource value: 0x7f0200c0 - public const int ic_media_route_on_1_mono_dark = 2130837696; + public const int ic_media_route_on_0_mono_dark = 2130837696; // aapt resource value: 0x7f0200c1 - public const int ic_media_route_on_2_mono_dark = 2130837697; + public const int ic_media_route_on_1_mono_dark = 2130837697; // aapt resource value: 0x7f0200c2 - public const int ic_media_route_on_mono_dark = 2130837698; + public const int ic_media_route_on_2_mono_dark = 2130837698; // aapt resource value: 0x7f0200c3 - public const int ic_pause_dark = 2130837699; + public const int ic_media_route_on_mono_dark = 2130837699; // aapt resource value: 0x7f0200c4 - public const int ic_pause_light = 2130837700; + public const int ic_pause_dark = 2130837700; // aapt resource value: 0x7f0200c5 - public const int ic_play_dark = 2130837701; + public const int ic_pause_light = 2130837701; // aapt resource value: 0x7f0200c6 - public const int ic_play_light = 2130837702; + public const int ic_play_dark = 2130837702; // aapt resource value: 0x7f0200c7 - public const int ic_speaker_dark = 2130837703; + public const int ic_play_light = 2130837703; // aapt resource value: 0x7f0200c8 - public const int ic_speaker_group_dark = 2130837704; + public const int ic_speaker_dark = 2130837704; // aapt resource value: 0x7f0200c9 - public const int ic_speaker_group_light = 2130837705; + public const int ic_speaker_group_dark = 2130837705; // aapt resource value: 0x7f0200ca - public const int ic_speaker_light = 2130837706; + public const int ic_speaker_group_light = 2130837706; // aapt resource value: 0x7f0200cb - public const int ic_successstatus = 2130837707; + public const int ic_speaker_light = 2130837707; // aapt resource value: 0x7f0200cc - public const int ic_tv_dark = 2130837708; + public const int ic_successstatus = 2130837708; // aapt resource value: 0x7f0200cd - public const int ic_tv_light = 2130837709; + public const int ic_tv_dark = 2130837709; // aapt resource value: 0x7f0200ce - public const int icon = 2130837710; + public const int ic_tv_light = 2130837710; // aapt resource value: 0x7f0200cf - public const int ion_chevron_right = 2130837711; + public const int icon = 2130837711; // aapt resource value: 0x7f0200d0 - public const int lightbulb = 2130837712; + public const int ion_chevron_right = 2130837712; // aapt resource value: 0x7f0200d1 - public const int list_selector = 2130837713; + public const int lightbulb = 2130837713; // aapt resource value: 0x7f0200d2 - public const int @lock = 2130837714; + public const int list_selector = 2130837714; // aapt resource value: 0x7f0200d3 - public const int logo = 2130837715; + public const int @lock = 2130837715; // aapt resource value: 0x7f0200d4 - public const int more = 2130837716; + public const int logo = 2130837716; // aapt resource value: 0x7f0200d5 - public const int mr_dialog_material_background_dark = 2130837717; + public const int more = 2130837717; // aapt resource value: 0x7f0200d6 - public const int mr_dialog_material_background_light = 2130837718; + public const int mr_dialog_material_background_dark = 2130837718; // aapt resource value: 0x7f0200d7 - public const int mr_ic_audiotrack_light = 2130837719; + public const int mr_dialog_material_background_light = 2130837719; // aapt resource value: 0x7f0200d8 - public const int mr_ic_cast_dark = 2130837720; + public const int mr_ic_audiotrack_light = 2130837720; // aapt resource value: 0x7f0200d9 - public const int mr_ic_cast_light = 2130837721; + public const int mr_ic_cast_dark = 2130837721; // aapt resource value: 0x7f0200da - public const int mr_ic_close_dark = 2130837722; + public const int mr_ic_cast_light = 2130837722; // aapt resource value: 0x7f0200db - public const int mr_ic_close_light = 2130837723; + public const int mr_ic_close_dark = 2130837723; // aapt resource value: 0x7f0200dc - public const int mr_ic_media_route_connecting_mono_dark = 2130837724; + public const int mr_ic_close_light = 2130837724; // aapt resource value: 0x7f0200dd - public const int mr_ic_media_route_connecting_mono_light = 2130837725; + public const int mr_ic_media_route_connecting_mono_dark = 2130837725; // aapt resource value: 0x7f0200de - public const int mr_ic_media_route_mono_dark = 2130837726; + public const int mr_ic_media_route_connecting_mono_light = 2130837726; // aapt resource value: 0x7f0200df - public const int mr_ic_media_route_mono_light = 2130837727; + public const int mr_ic_media_route_mono_dark = 2130837727; // aapt resource value: 0x7f0200e0 - public const int mr_ic_pause_dark = 2130837728; + public const int mr_ic_media_route_mono_light = 2130837728; // aapt resource value: 0x7f0200e1 - public const int mr_ic_pause_light = 2130837729; + public const int mr_ic_pause_dark = 2130837729; // aapt resource value: 0x7f0200e2 - public const int mr_ic_play_dark = 2130837730; + public const int mr_ic_pause_light = 2130837730; // aapt resource value: 0x7f0200e3 - public const int mr_ic_play_light = 2130837731; + public const int mr_ic_play_dark = 2130837731; // aapt resource value: 0x7f0200e4 - public const int notification_sm = 2130837732; - - // aapt resource value: 0x7f0200f0 - public const int notification_template_icon_bg = 2130837744; + public const int mr_ic_play_light = 2130837732; // aapt resource value: 0x7f0200e5 - public const int plus = 2130837733; + public const int notification_sm = 2130837733; + + // aapt resource value: 0x7f0200f1 + public const int notification_template_icon_bg = 2130837745; // aapt resource value: 0x7f0200e6 - public const int refresh = 2130837734; + public const int plus = 2130837734; // aapt resource value: 0x7f0200e7 - public const int roundedbg = 2130837735; + public const int refresh = 2130837735; // aapt resource value: 0x7f0200e8 - public const int roundedbgdark = 2130837736; + public const int roundedbg = 2130837736; // aapt resource value: 0x7f0200e9 - public const int splash_screen = 2130837737; + public const int roundedbgdark = 2130837737; // aapt resource value: 0x7f0200ea - public const int star = 2130837738; + public const int splash_screen = 2130837738; // aapt resource value: 0x7f0200eb - public const int star_selected = 2130837739; + public const int star = 2130837739; // aapt resource value: 0x7f0200ec - public const int tools = 2130837740; + public const int star_selected = 2130837740; // aapt resource value: 0x7f0200ed - public const int tools_selected = 2130837741; + public const int tools = 2130837741; // aapt resource value: 0x7f0200ee - public const int upload = 2130837742; + public const int tools_selected = 2130837742; // aapt resource value: 0x7f0200ef - public const int user = 2130837743; + public const int upload = 2130837743; + + // aapt resource value: 0x7f0200f0 + public const int user = 2130837744; static Drawable() { diff --git a/src/Android/Resources/drawable-hdpi/close.png b/src/Android/Resources/drawable-hdpi/close.png new file mode 100644 index 0000000000000000000000000000000000000000..6335d4fd6f4e62f1286b53fd6f91a1a5a4a4c2cb GIT binary patch literal 347 zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i3?z4Pv7`g3kN}?$S0MeL+Q1;*W*W${k|4ie z21X`9VF@WU4NWa=!;I>>*0zqGS#zJgc>VS-tBy1)P}yux7sn8d;L=Ms#hMIwSS~mQ z6tZ`9J^TMZSZLce$=??yU;aJGhdF`0h->%ih2KQxbzODe$JgBPDE3I=h3$VMN}}e- z$gVwOxJdH+l%O*l8Q~>c6c|k3?#4J%UA`Zk^_7~T!Hj|8iQG`ybFNVD3k>G z1v46e*K=kt?)Ha?Ez00#}Etu+KV^E znhbbYE)+7C7anGv`saUm7Pr%_G%Nnx^CxRF*%+=ph&;1v_oQHp0L@wL;Zr$6U6mhA zG4`=kE}H-7!Niqa)8+4~J@ArT#pE24;xkpkSyC-+vojr2d&BPZ zXr%}2vo7gl*ZR9(A5CiDSr>=_@DseP8L-vyf-9#$^WU zwH=%yrctpgey%<*vtlLVwsSgnS1&uZ@|yGm58e%tfBW=1kDBn5AJ)tU`h~&M)z4*} HQ$iB}YaQ0E literal 0 HcmV?d00001 diff --git a/src/Android/Resources/drawable-xxhdpi/close.png b/src/Android/Resources/drawable-xxhdpi/close.png new file mode 100644 index 0000000000000000000000000000000000000000..af66a0d19ae516c6d843d3c80ea1662aece854ed GIT binary patch literal 374 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`IR*HHxB}__lmU+TOKm_?L`#DF zf*Dx&1ZCt5O)cyl+>7h#TYFx-e*gK8-$Qqxf^(iOjv*eMZ?Aar9aa!vIC#=ep>y-c z|Lc!Mm>pbm_U;^s%vVhT-8+g!s{9WA%{(8VY0YxVY5B3UM=g)enPt}QAh`UQ@AG%p zoR|xSdJ!{ty`qEZdKR1gaGUTUz_wwN=YM|J4h%ohu*zAW@6WZL zEw`4|z1~yIw(3Ic(cOLLUS}Ew==zHl*$|`;aL N;OXk;vd$@?2>{fF#{vKV literal 0 HcmV?d00001 diff --git a/src/Android/Resources/drawable-xxxhdpi/close.png b/src/Android/Resources/drawable-xxxhdpi/close.png new file mode 100644 index 0000000000000000000000000000000000000000..115dd3d8fe8d05008f4c78532780a1b8cb8849b3 GIT binary patch literal 564 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAjKLV!<*E0F$AOHiXKvkPd4d`XaB zFaskK8waO~nuey9c4Tx+Y+QV1_rz7J*B(7_^VXf8f2aNr(Pm&^O!0Ja42d|r_S$Q| z!v;L83F2WA(+ef1oaXxad;im2rAs@r&A(|rPhV6Mq!MlA;;eN@>Ar1UT%zCSIo4+; zgqWULxh1)6$>hU-CRsO_SWNzMgvWF7;Xkvi9W#sAGLL)O{Rw(Cr+)ie1`bah z8&$3{svPF@UM4(6Y|hM(g?zL*ho z!%*cwpz4W0l?yXHudh&E8h>M=&^uJ&4bE4?*=m#D2E1c!ej892_T|j~2_fmO=VP>I zp6i--^ZfaJ%&HG_j;8EdI@5W^5{n5-tQt}*5>J*iU1}1Z)KaXz?rzY*LT}gOnwB!t zpA^YVx~%Dyw_Jhq`8QaGJY=BRQE0F$AGZ3it`zg=@xso8i zU;1>yD^Av*0;N&O5 zuFA~~dCj_RQr}#Wmyc@$mJ}N9zN(+!_q~Ka+cxp$Z1qh3-RsT$-}7!bI_=sAX13d0 V3yca5iU93p@O1TaS?83{1ON;LsoMYm literal 0 HcmV?d00001 diff --git a/src/App/Pages/Vault/VaultAutofillListLoginsPage.cs b/src/App/Pages/Vault/VaultAutofillListLoginsPage.cs index 23e656f21..b7238d9ea 100644 --- a/src/App/Pages/Vault/VaultAutofillListLoginsPage.cs +++ b/src/App/Pages/Vault/VaultAutofillListLoginsPage.cs @@ -18,6 +18,7 @@ namespace Bit.App.Pages public class VaultAutofillListLoginsPage : ExtendedContentPage { private readonly ILoginService _loginService; + private readonly IDeviceInfoService _deviceInfoService; private readonly IUserDialogs _userDialogs; private readonly IClipboardService _clipboardService; private CancellationTokenSource _filterResultsCancellationTokenSource; @@ -44,8 +45,9 @@ namespace Bit.App.Pages { _name = _domainName.BaseDomain; } - + _loginService = Resolver.Resolve(); + _deviceInfoService = Resolver.Resolve(); _userDialogs = Resolver.Resolve(); _clipboardService = Resolver.Resolve(); @@ -91,6 +93,7 @@ namespace Bit.App.Pages }; ToolbarItems.Add(new AddLoginToolBarItem(this)); + ToolbarItems.Add(new CloseToolBarItem(this)); ListView = new ListView(ListViewCachingStrategy.RecycleElement) { @@ -171,6 +174,13 @@ namespace Bit.App.Pages private void LoginSelected(object sender, SelectedItemChangedEventArgs e) { var login = e.SelectedItem as VaultListPageModel.Login; + + if(_uri.StartsWith("http") && _deviceInfoService.Version < 21) + { + MoreClickedAsync(login); + return; + } + MessagingCenter.Send(Application.Current, "Autofill", login); } @@ -230,6 +240,7 @@ namespace Bit.App.Pages Text = AppResources.Add; Icon = "plus"; Clicked += ClickedItem; + Priority = 1; } private void ClickedItem(object sender, EventArgs e) @@ -237,5 +248,24 @@ namespace Bit.App.Pages _page.AddLoginAsync(); } } + + private class CloseToolBarItem : ToolbarItem + { + private readonly VaultAutofillListLoginsPage _page; + + public CloseToolBarItem(VaultAutofillListLoginsPage page) + { + _page = page; + Text = AppResources.Close; + Icon = "close"; + Clicked += ClickedItem; + Priority = 2; + } + + private void ClickedItem(object sender, EventArgs e) + { + Application.Current.MainPage = new MainPage(); + } + } } }