mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-24 18:08:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

autofill service tools page labels

Browse source
This commit is contained in:
Kyle Spearrin 2017-11-27 19:23:26 -05:00
parent 783c4d104c
commit 40b861acbe
5 changed files with 98 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/App/Pages/Tools/ToolsAutofillServicePage.cs
View file

@ -207,7 +207,7 @@ namespace Bit.App.Pages
{
return new Label
{
Text = AppResources.AutofillDescription,
Text = AppResources.AutofillAccessibilityDescription,
VerticalOptions = LayoutOptions.Start,
HorizontalTextAlignment = TextAlignment.Center,
LineBreakMode = LineBreakMode.WordWrap,
@ -219,7 +219,7 @@ namespace Bit.App.Pages
{
return new ExtendedButton
{
Text = AppResources.BitwardenAutofillServiceOpenSettings,
Text = AppResources.BitwardenAutofillServiceOpenAccessibilitySettings,
Command = new Command(() =>
{
_googleAnalyticsService.TrackAppEvent("OpenAccessibilitySettings");

39
src/App/Pages/Tools/ToolsAutofillServicePage2.cs
View file

@ -46,7 +46,8 @@ namespace Bit.App.Pages
HorizontalTextAlignment = TextAlignment.Center,
LineBreakMode = LineBreakMode.WordWrap,
FontSize = Device.GetNamedSize(NamedSize.Medium, typeof(Label)),
TextColor = Color.Black
TextColor = Color.Black,
VerticalOptions = LayoutOptions.CenterAndExpand
};
var disabledFs = new FormattedString();
@ -65,12 +66,27 @@ namespace Bit.App.Pages
HorizontalTextAlignment = TextAlignment.Center,
LineBreakMode = LineBreakMode.WordWrap,
FontSize = Device.GetNamedSize(NamedSize.Medium, typeof(Label)),
TextColor = Color.Black
TextColor = Color.Black,
VerticalOptions = LayoutOptions.CenterAndExpand
};
var goButton = new ExtendedButton
{
Text = AppResources.BitwardenAutofillServiceOpenAutofillSettings,
Command = new Command(() =>
{
_googleAnalyticsService.TrackAppEvent("OpenAutofillSettings");
_deviceActionService.OpenAutofillSettings();
}),
VerticalOptions = LayoutOptions.End,
HorizontalOptions = LayoutOptions.Fill,
Style = (Style)Application.Current.Resources["btn-primary"],
FontSize = Device.GetNamedSize(NamedSize.Medium, typeof(Button))
};
DisabledStackLayout = new StackLayout
{
Children = { BuildServiceLabel(), statusDisabledLabel, BuildGoButton() },
Children = { BuildServiceLabel(), statusDisabledLabel, goButton, BuildAccessibilityButton() },
Orientation = StackOrientation.Vertical,
Spacing = 20,
Padding = new Thickness(20, 30),
@ -79,7 +95,7 @@ namespace Bit.App.Pages
EnabledStackLayout = new StackLayout
{
Children = { BuildServiceLabel(), statusEnabledLabel },
Children = { BuildServiceLabel(), statusEnabledLabel, BuildAccessibilityButton() },
Orientation = StackOrientation.Vertical,
Spacing = 20,
Padding = new Thickness(20, 30),
@ -125,7 +141,7 @@ namespace Bit.App.Pages
{
return new Label
{
Text = AppResources.AutofillDescription,
Text = AppResources.AutofillServiceDescription,
VerticalOptions = LayoutOptions.Start,
HorizontalTextAlignment = TextAlignment.Center,
LineBreakMode = LineBreakMode.WordWrap,
@ -133,19 +149,20 @@ namespace Bit.App.Pages
};
}
private ExtendedButton BuildGoButton()
private ExtendedButton BuildAccessibilityButton()
{
return new ExtendedButton
{
Text = AppResources.BitwardenAutofillServiceOpenSettings,
Command = new Command(() =>
Text = AppResources.AutofillAccessibilityService,
Command = new Command(async () =>
{
_googleAnalyticsService.TrackAppEvent("OpenAutofillSettings");
_deviceActionService.OpenAutofillSettings();
await Navigation.PushAsync(new ToolsAutofillServicePage());
}),
VerticalOptions = LayoutOptions.End,
HorizontalOptions = LayoutOptions.Fill,
Style = (Style)Application.Current.Resources["btn-primary"],
Style = (Style)Application.Current.Resources["btn-primaryAccent"],
Uppercase = false,
BackgroundColor = Color.Transparent,
FontSize = Device.GetNamedSize(NamedSize.Medium, typeof(Button))
};
}

8
src/App/Pages/Tools/ToolsPage.cs
View file

@ -46,13 +46,15 @@ namespace Bit.App.Pages
if(Device.RuntimePlatform == Device.iOS)
{
ExtensionCell = new ToolsViewCell(AppResources.BitwardenAppExtension,
AppResources.BitwardenAppExtensionDescription, "upload");
AppResources.BitwardenAppExtensionDescription, "upload.png");
section.Add(ExtensionCell);
}
else
{
AutofillCell = new ToolsViewCell(AppResources.BitwardenAutofillService,
AppResources.BitwardenAutofillServiceDescription, "upload.png");
var desc = _deviceInfoService.AutofillServiceSupported ?
AppResources.BitwardenAutofillServiceDescription :
AppResources.BitwardenAutofillAccessibilityServiceDescription;
AutofillCell = new ToolsViewCell(AppResources.BitwardenAutofillService, desc, "upload.png");
section.Add(AutofillCell);
}

60
src/App/Resources/AppResources.Designer.cs generated
View file

@ -295,6 +295,24 @@ namespace Bit.App.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Use the bitwarden accessibility service to auto-fill your logins across apps and the web..
/// </summary>
public static string AutofillAccessibilityDescription {
get {
return ResourceManager.GetString("AutofillAccessibilityDescription", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Auto-fill Accessibility Service.
/// </summary>
public static string AutofillAccessibilityService {
get {
return ResourceManager.GetString("AutofillAccessibilityService", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Always Scan.
/// </summary>
@ -313,15 +331,6 @@ namespace Bit.App.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Use the bitwarden accessibility service to auto-fill your logins across apps and the web..
/// </summary>
public static string AutofillDescription {
get {
return ResourceManager.GetString("AutofillDescription", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Do you want to auto-fill or view this item?.
/// </summary>
@ -376,6 +385,15 @@ namespace Bit.App.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to The bitwarden auto-fill service uses the Android Autofill Framework to assist in filling logins, credit cards, and identity information into other apps on your device..
/// </summary>
public static string AutofillServiceDescription {
get {
return ResourceManager.GetString("AutofillServiceDescription", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Auto-fill with bitwarden.
/// </summary>
@ -448,6 +466,15 @@ namespace Bit.App.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Use the bitwarden accessibility service to auto-fill your logins..
/// </summary>
public static string BitwardenAutofillAccessibilityServiceDescription {
get {
return ResourceManager.GetString("BitwardenAutofillAccessibilityServiceDescription", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to bitwarden Auto-fill Service.
/// </summary>
@ -467,7 +494,7 @@ namespace Bit.App.Resources {
}
/// <summary>
/// Looks up a localized string similar to Use the bitwarden accessibility service to auto-fill your logins..
/// Looks up a localized string similar to Use the bitwarden auto-fill service to fill logins, credit cards, and identity information into other apps..
/// </summary>
public static string BitwardenAutofillServiceDescription {
get {
@ -514,9 +541,18 @@ namespace Bit.App.Resources {
/// <summary>
/// Looks up a localized string similar to Open Accessibility Settings.
/// </summary>
public static string BitwardenAutofillServiceOpenSettings {
public static string BitwardenAutofillServiceOpenAccessibilitySettings {
get {
return ResourceManager.GetString("BitwardenAutofillServiceOpenSettings", resourceCulture);
return ResourceManager.GetString("BitwardenAutofillServiceOpenAccessibilitySettings", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Open Autofill Settings.
/// </summary>
public static string BitwardenAutofillServiceOpenAutofillSettings {
get {
return ResourceManager.GetString("BitwardenAutofillServiceOpenAutofillSettings", resourceCulture);
}
}

18
src/App/Resources/AppResources.resx
View file

@ -402,7 +402,7 @@
<data name="AppExtension" xml:space="preserve">
<value>App Extension</value>
</data>
<data name="AutofillDescription" xml:space="preserve">
<data name="AutofillAccessibilityDescription" xml:space="preserve">
<value>Use the bitwarden accessibility service to auto-fill your logins across apps and the web.</value>
</data>
<data name="AutofillService" xml:space="preserve">
@ -423,7 +423,7 @@
<data name="BitwardenAutofillService" xml:space="preserve">
<value>bitwarden Auto-fill Service</value>
</data>
<data name="BitwardenAutofillServiceDescription" xml:space="preserve">
<data name="BitwardenAutofillAccessibilityServiceDescription" xml:space="preserve">
<value>Use the bitwarden accessibility service to auto-fill your logins.</value>
</data>
<data name="ChangeEmail" xml:space="preserve">
@ -764,7 +764,7 @@
<data name="BitwardenAutofillServiceNotificationContent" xml:space="preserve">
<value>Tap this notification to auto-fill an item from your vault.</value>
</data>
<data name="BitwardenAutofillServiceOpenSettings" xml:space="preserve">
<data name="BitwardenAutofillServiceOpenAccessibilitySettings" xml:space="preserve">
<value>Open Accessibility Settings</value>
</data>
<data name="BitwardenAutofillServiceStep1" xml:space="preserve">
@ -1209,4 +1209,16 @@
<data name="NoItemsFolder" xml:space="preserve">
<value>There are no items in this folder.</value>
</data>
<data name="AutofillAccessibilityService" xml:space="preserve">
<value>Auto-fill Accessibility Service</value>
</data>
<data name="AutofillServiceDescription" xml:space="preserve">
<value>The bitwarden auto-fill service uses the Android Autofill Framework to assist in filling logins, credit cards, and identity information into other apps on your device.</value>
</data>
<data name="BitwardenAutofillServiceDescription" xml:space="preserve">
<value>Use the bitwarden auto-fill service to fill logins, credit cards, and identity information into other apps.</value>
</data>
<data name="BitwardenAutofillServiceOpenAutofillSettings" xml:space="preserve">
<value>Open Autofill Settings</value>
</data>
</root>