From 72d1421f1d99c6006dfb437ad03243644b0ad336 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 18 Jun 2018 13:59:56 -0400 Subject: [PATCH] shows both accessibility and autofill from tools --- src/Android/Android.csproj | 15 ++++ src/Android/Resources/Resource.Designer.cs | 68 +++++++----------- .../Resources/drawable-hdpi/upload2.png | Bin 0 -> 1113 bytes .../Resources/drawable-xhdpi/upload2.png | Bin 0 -> 1243 bytes .../Resources/drawable-xxhdpi/upload2.png | Bin 0 -> 2185 bytes .../Resources/drawable-xxxhdpi/upload2.png | Bin 0 -> 1948 bytes src/Android/Resources/drawable/upload2.png | Bin 0 -> 689 bytes .../Pages/Tools/ToolsAutofillServicePage.cs | 21 +----- src/App/Pages/Tools/ToolsPage.cs | 40 +++++++---- src/App/Resources/AppResources.Designer.cs | 9 +++ src/App/Resources/AppResources.resx | 3 + 11 files changed, 80 insertions(+), 76 deletions(-) create mode 100644 src/Android/Resources/drawable-hdpi/upload2.png create mode 100644 src/Android/Resources/drawable-xhdpi/upload2.png create mode 100644 src/Android/Resources/drawable-xxhdpi/upload2.png create mode 100644 src/Android/Resources/drawable-xxxhdpi/upload2.png create mode 100644 src/Android/Resources/drawable/upload2.png diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj index 7d938bd12..ba87adba9 100644 --- a/src/Android/Android.csproj +++ b/src/Android/Android.csproj @@ -990,5 +990,20 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Android/Resources/Resource.Designer.cs b/src/Android/Resources/Resource.Designer.cs index 81cb43c92..0b02de05c 100644 --- a/src/Android/Resources/Resource.Designer.cs +++ b/src/Android/Resources/Resource.Designer.cs @@ -4685,26 +4685,26 @@ namespace Bit.Android // aapt resource value: 0x7f02005b public const int avd_hide_password = 2130837595; - // aapt resource value: 0x7f02015c - public const int avd_hide_password_1 = 2130837852; - // aapt resource value: 0x7f02015d - public const int avd_hide_password_2 = 2130837853; + public const int avd_hide_password_1 = 2130837853; // aapt resource value: 0x7f02015e - public const int avd_hide_password_3 = 2130837854; + public const int avd_hide_password_2 = 2130837854; + + // aapt resource value: 0x7f02015f + public const int avd_hide_password_3 = 2130837855; // aapt resource value: 0x7f02005c public const int avd_show_password = 2130837596; - // aapt resource value: 0x7f02015f - public const int avd_show_password_1 = 2130837855; - // aapt resource value: 0x7f020160 - public const int avd_show_password_2 = 2130837856; + public const int avd_show_password_1 = 2130837856; // aapt resource value: 0x7f020161 - public const int avd_show_password_3 = 2130837857; + public const int avd_show_password_2 = 2130837857; + + // aapt resource value: 0x7f020162 + public const int avd_show_password_3 = 2130837858; // aapt resource value: 0x7f02005d public const int bottom_nav_bg = 2130837597; @@ -5411,11 +5411,11 @@ namespace Bit.Android // aapt resource value: 0x7f020147 public const int notification_sm = 2130837831; - // aapt resource value: 0x7f02015a - public const int notification_template_icon_bg = 2130837850; - // aapt resource value: 0x7f02015b - public const int notification_template_icon_low_bg = 2130837851; + public const int notification_template_icon_bg = 2130837851; + + // aapt resource value: 0x7f02015c + public const int notification_template_icon_low_bg = 2130837852; // aapt resource value: 0x7f020148 public const int notification_tile_bg = 2130837832; @@ -5466,10 +5466,13 @@ namespace Bit.Android public const int upload = 2130837847; // aapt resource value: 0x7f020158 - public const int user = 2130837848; + public const int upload2 = 2130837848; // aapt resource value: 0x7f020159 - public const int yubikey = 2130837849; + public const int user = 2130837849; + + // aapt resource value: 0x7f02015a + public const int yubikey = 2130837850; static Drawable() { @@ -6506,17 +6509,17 @@ namespace Bit.Android // aapt resource value: 0x7f0a0051 public const int ApplicationName = 2131361873; - // aapt resource value: 0x7f0a00b2 - public const int AutoFillServiceDescription = 2131361970; + // aapt resource value: 0x7f0a00ab + public const int AutoFillServiceDescription = 2131361963; - // aapt resource value: 0x7f0a00b1 - public const int AutoFillServiceSummary = 2131361969; + // aapt resource value: 0x7f0a00aa + public const int AutoFillServiceSummary = 2131361962; // aapt resource value: 0x7f0a0050 public const int Hello = 2131361872; - // aapt resource value: 0x7f0a00b3 - public const int MyVault = 2131361971; + // aapt resource value: 0x7f0a00ac + public const int MyVault = 2131361964; // aapt resource value: 0x7f0a0027 public const int abc_action_bar_home_description = 2131361831; @@ -6671,27 +6674,6 @@ namespace Bit.Android // aapt resource value: 0x7f0a000f public const int common_signin_button_text_long = 2131361807; - // aapt resource value: 0x7f0a00ac - public const int default_web_client_id = 2131361964; - - // aapt resource value: 0x7f0a00ad - public const int firebase_database_url = 2131361965; - - // aapt resource value: 0x7f0a00aa - public const int gcm_defaultSenderId = 2131361962; - - // aapt resource value: 0x7f0a00ae - public const int google_api_key = 2131361966; - - // aapt resource value: 0x7f0a00ab - public const int google_app_id = 2131361963; - - // aapt resource value: 0x7f0a00af - public const int google_crash_reporting_api_key = 2131361967; - - // aapt resource value: 0x7f0a00b0 - public const int google_storage_bucket = 2131361968; - // aapt resource value: 0x7f0a0052 public const int hockeyapp_crash_dialog_app_name_fallback = 2131361874; diff --git a/src/Android/Resources/drawable-hdpi/upload2.png b/src/Android/Resources/drawable-hdpi/upload2.png new file mode 100644 index 0000000000000000000000000000000000000000..f115db1a5ec4d4ae326ab270690a7c1b00e0188e GIT binary patch literal 1113 zcmeAS@N?(olHy`uVBq!ia0vp^P9V&|1|%PcFuVX#jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJtM=93Yk+G7?@9bx;TbZ#J!EO%@A>vxZAxVV#QJy>0n7wmcT6=gf9vg?KZA1H(U0h zKOtRNY0;5mK^ry%bX4q|FWT%V@Q3lBNmHwsnA8*zLG6n(l%&qzKl1(V+1Atdde*&r zd-vTvn~FQB&u`zX%zu9NUkp$0H|4;Tochks7nPpxOgv`R^>!|6`^JAv$@YndY&IVF z$$s2qd)Ko*hbEr`IX^;;7oO|MoUt+Z%2BD#MY-~;=5q@9@y>o$7AWt(}@u>;xv^N$gZ|eWNGNfN3?MFjnT(-mx_eVVQ#qYYv3oPkXaF}4$#Nc>~gNY?m znS%@g)?;lcN_z#|<_H4~biHk-D*Ups_(u8k7izyWR3@)hc%}GbtKSp(&d4vE^QS-K zRaV@^Dd)Uwrx3fXr@sBipO@5SFTPbe!_Qat)OhB+7^}TM^L1uCTNb0X+3(FRj&OFi zX-RYZRgZu5dGnvCCg9PZ2MZEQLap4`c3-@4#r%@$?R&v5Z5Tu(t+lO}@!wnbM}bB8 zU$tVeVC}xWD=ik+HEiA?UR&KaJ^Y!ay^q_T$)>+l+5R5$T)v%yci%&UGKS3$H@}If zTEwO+t zYZkw=I@2^MBd+1_&%E;3lHLb4>Lt1ii~PM`9lPVdeunSNwp|?OJB;oYUi$AfG2qV5 zykzopr0F@l;=Kufz literal 0 HcmV?d00001 diff --git a/src/Android/Resources/drawable-xhdpi/upload2.png b/src/Android/Resources/drawable-xhdpi/upload2.png new file mode 100644 index 0000000000000000000000000000000000000000..ad7b0da13fc001a8508143a8f68ec81fa52c54c5 GIT binary patch literal 1243 zcmeAS@N?(olHy`uVBq!ia0vp^5g^RL1|$oo8khhn#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pk#?_L`iUdT1k0gQ7S`0VrE{6US4X6f{C7i zo{`~4h0LiygStjt+EfHAQqpMZxYVt5EN9j)2mZJtvmbDOS@PoGb;mtF99BKpnDzI3+A_1ZA-7fT z+ikipU)Pe7UY1sObMDUjsd+8c=tA1VLvPCqAz3qwAhhNq9vtx6*JhM(l6zMAM?EB-t&Q<05gpa4Tc0A!s zSp*cTlvx=H6#K9I6)2YCE~R>1X;S;ri$EF4hm*2Bx2ELnoEGB6=eKC6;*VlNY_`>QV&R~TIK;sMay+Xx}DQx%6Cq4@$&16@m{2&?z>J^aMEP0>q6Nl zJ*Q`PE`2g7X!eDjM^10eI9Yr1jg9f14C5Imw@k5l-@JOUC)*_bnTl?+rFY)(31=7P zzsPNTBxCXRgpz07nTlo+OEoIYHU4Wcw?8r>S-@J5}r|rM69jEcBx!F*buqZ<+)G!_boxn`!_g! zIk6@xiP=!yy>pf5qPJ;VCnaV!&S6$vWWKnim-))?&bx zYj?%|TjsHI^NPZ+2W|Oz@~XI>m)G0tyU(UycPi_c_xt7>p~nrn6L#~y{rflZqQJq~ zw-)>N&*64XVko|DS2M*Wi3x5{+|_m+sefvzDUew&hG~%7Hw;-I%J;|MSSYN%+E))OA z`Br1z>)=!C4^Qt`+1h0I;a-hh{MY>!fBwgOaGEP0-f?ZlBgb{+<>!x8em4%U^wnZb zzVO$)Xs70}z)*$P+gA5IT%Z{?b>F#jp?#YeGev98?vNCH^RMc9`891JUE`x}Zud0` zu6Zs^FnIRYsy6mWpdG`eZL^X>IrSb{pUS?Z6%qd>KK~ET(gjy^YI(1R#xY0!%JcDF z`sMzEug>c}&AP(XcB1b7=c4aX(dzt8Qhag0%5KhJ*XDk8_t2c(4&7gG-%5M%Q!w1p zJBzj5)z#pl{&lB?i~_OO+|QMtYjyf7F!$=@FP6`p7S`?BRrX5wDQkt$N!!)S+Fq=* zYY6i*waJ&|_`5E9Gt+ecf;t=Z3E7MNXBfu5VYdDCLfwa_*5Pt-p5*d+=je4VlRl&v b)icO<*X}$ce@7Bn_Aq$5`njxgN@xNAz%fIw literal 0 HcmV?d00001 diff --git a/src/Android/Resources/drawable-xxhdpi/upload2.png b/src/Android/Resources/drawable-xxhdpi/upload2.png new file mode 100644 index 0000000000000000000000000000000000000000..225ac20cec278bbfde4a392e900a8dad9c10a299 GIT binary patch literal 2185 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 literal 0 HcmV?d00001 diff --git a/src/Android/Resources/drawable/upload2.png b/src/Android/Resources/drawable/upload2.png new file mode 100644 index 0000000000000000000000000000000000000000..45a46d6677adbdd71257e1bfd4dda2e43a8e9477 GIT binary patch literal 689 zcmV;i0#5yjP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00JRNL_t(oN9~wBNW(xFhJ)ayB97uN2(GTW z`Gee#zk>+cLBT;>6a=xGbkJ241b>oNba8VR7ePTsS8)+s1Vxd8`d;}?(sI_==9&n3 z;ib)e_uW1BB~31MZ0LmZ=Ht=P20DzlvQkdFQszA=UpyiDsX3lM1VtoED7c_&R$LY)EmXUsl%@p;t4D7CWgSmnHa|<^llvU7ppz9V+sT{R;@PPhX1H6aw5DW@IW9Y$K!m;A5(V~3Msz5@Ail*oCnw@zHj(Xdm$#oBjRgV z)P7OB0!HxF-xz0u^-@(hR~m?`@np?7ZeL#$O2372U#XJE(x@z)*`ArHr%U_4$Z@^^ X_T^mxAs6Y200000NkvXXu0mjfj9M=Z literal 0 HcmV?d00001 diff --git a/src/App/Pages/Tools/ToolsAutofillServicePage.cs b/src/App/Pages/Tools/ToolsAutofillServicePage.cs index 2ba19616e..e9008856a 100644 --- a/src/App/Pages/Tools/ToolsAutofillServicePage.cs +++ b/src/App/Pages/Tools/ToolsAutofillServicePage.cs @@ -104,7 +104,7 @@ namespace Bit.App.Pages DisabledStackLayout = new StackLayout { - Children = { BuildServiceLabel(), statusDisabledLabel, enableImage, goButton, BuildAccessibilityButton() }, + Children = { BuildServiceLabel(), statusDisabledLabel, enableImage, goButton }, Orientation = StackOrientation.Vertical, Spacing = 20, Padding = new Thickness(20, 30), @@ -113,7 +113,7 @@ namespace Bit.App.Pages EnabledStackLayout = new StackLayout { - Children = { BuildServiceLabel(), statusEnabledLabel, useImage, BuildAccessibilityButton() }, + Children = { BuildServiceLabel(), statusEnabledLabel, useImage }, Orientation = StackOrientation.Vertical, Spacing = 20, Padding = new Thickness(20, 30), @@ -166,22 +166,5 @@ namespace Bit.App.Pages FontSize = Device.GetNamedSize(NamedSize.Small, typeof(Label)) }; } - - private ExtendedButton BuildAccessibilityButton() - { - return new ExtendedButton - { - Text = AppResources.AutofillAccessibilityService, - Command = new Command(async () => - { - await Navigation.PushAsync(new ToolsAccessibilityServicePage()); - }), - VerticalOptions = LayoutOptions.End, - HorizontalOptions = LayoutOptions.Fill, - Style = (Style)Application.Current.Resources["btn-primaryAccent"], - Uppercase = false, - BackgroundColor = Color.Transparent - }; - } } } diff --git a/src/App/Pages/Tools/ToolsPage.cs b/src/App/Pages/Tools/ToolsPage.cs index 0611b4202..8174568d2 100644 --- a/src/App/Pages/Tools/ToolsPage.cs +++ b/src/App/Pages/Tools/ToolsPage.cs @@ -29,6 +29,7 @@ namespace Bit.App.Pages public ToolsViewCell ImportCell { get; set; } public ToolsViewCell ExtensionCell { get; set; } public ToolsViewCell AutofillCell { get; set; } + public ToolsViewCell AccessibilityCell { get; set; } public void Init() { @@ -46,11 +47,17 @@ namespace Bit.App.Pages } if(Device.RuntimePlatform == Device.Android) { - var desc = _deviceInfoService.AutofillServiceSupported ? - AppResources.BitwardenAutofillServiceDescription : - AppResources.BitwardenAutofillAccessibilityServiceDescription; - AutofillCell = new ToolsViewCell(AppResources.BitwardenAutofillService, desc, "upload.png"); - section.Add(AutofillCell); + var accessibilityDesc = AppResources.BitwardenAutofillAccessibilityServiceDescription; + if(_deviceInfoService.AutofillServiceSupported) + { + AutofillCell = new ToolsViewCell(AppResources.AutofillService, + AppResources.BitwardenAutofillServiceDescription, "upload2.png"); + section.Add(AutofillCell); + accessibilityDesc += (" " + AppResources.BitwardenAutofillAccessibilityServiceDescription2); + } + AccessibilityCell = new ToolsViewCell(AppResources.AutofillAccessibilityService, + accessibilityDesc, "upload.png"); + section.Add(AccessibilityCell); } section.Add(WebCell); @@ -96,6 +103,10 @@ namespace Bit.App.Pages { AutofillCell.Tapped += AutofillCell_Tapped; } + if(AccessibilityCell != null) + { + AccessibilityCell.Tapped += AccessibilityCell_Tapped; + } } protected override void OnDisappearing() @@ -112,7 +123,10 @@ namespace Bit.App.Pages { AutofillCell.Tapped -= AutofillCell_Tapped; } - + if(AccessibilityCell != null) + { + AccessibilityCell.Tapped -= AccessibilityCell_Tapped; + } } protected override bool OnBackButtonPressed() @@ -128,14 +142,12 @@ namespace Bit.App.Pages private void AutofillCell_Tapped(object sender, EventArgs e) { - if(_deviceInfoService.AutofillServiceSupported) - { - Navigation.PushModalAsync(new ExtendedNavigationPage(new ToolsAutofillServicePage())); - } - else - { - Navigation.PushModalAsync(new ExtendedNavigationPage(new ToolsAccessibilityServicePage())); - } + Navigation.PushModalAsync(new ExtendedNavigationPage(new ToolsAutofillServicePage())); + } + + private void AccessibilityCell_Tapped(object sender, EventArgs e) + { + Navigation.PushModalAsync(new ExtendedNavigationPage(new ToolsAccessibilityServicePage())); } private void ExtensionCell_Tapped(object sender, EventArgs e) diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs index 53c6458ed..3783bf0ed 100644 --- a/src/App/Resources/AppResources.Designer.cs +++ b/src/App/Resources/AppResources.Designer.cs @@ -492,6 +492,15 @@ namespace Bit.App.Resources { } } + /// + /// Looks up a localized string similar to The accessibility service may be helpful to use when apps do not support the standard auto-fill service.. + /// + public static string BitwardenAutofillAccessibilityServiceDescription2 { + get { + return ResourceManager.GetString("BitwardenAutofillAccessibilityServiceDescription2", resourceCulture); + } + } + /// /// Looks up a localized string similar to We were unable to automatically open the Android autofill settings menu for you. You can navigate to the autofill settings menu manually from Android Settings > System > Languages and input > Advanced > Autofill service.. /// diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx index b01266121..70edde364 100644 --- a/src/App/Resources/AppResources.resx +++ b/src/App/Resources/AppResources.resx @@ -1302,4 +1302,7 @@ To continue, hold your YubiKey NEO against the back of the device. + + The accessibility service may be helpful to use when apps do not support the standard auto-fill service. + \ No newline at end of file