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

rename features to options

Browse source
This commit is contained in:
Kyle Spearrin 2017-11-29 09:20:45 -05:00
parent 022eba2c05
commit 8b2471c128
5 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/App/App.csproj
View file

@ -175,7 +175,7 @@
<Compile Include="Pages\ScanPage.cs" />
<Compile Include="Pages\Settings\SettingsCreditsPage.cs" />
<Compile Include="Pages\Settings\SettingsHelpPage.cs" />
<Compile Include="Pages\Settings\SettingsFeaturesPage.cs" />
<Compile Include="Pages\Settings\SettingsOptionsPage.cs" />
<Compile Include="Pages\Settings\SettingsPinPage.cs" />
<Compile Include="Pages\Lock\LockPinPage.cs" />
<Compile Include="Pages\MainPage.cs" />

6
src/App/Pages/Settings/SettingsFeaturesPage.cs → src/App/Pages/Settings/SettingsOptionsPage.cs
View file

@ -9,13 +9,13 @@ using Bit.App.Utilities;
namespace Bit.App.Pages
{
public class SettingsFeaturesPage : ExtendedContentPage
public class SettingsOptionsPage : ExtendedContentPage
{
private readonly ISettings _settings;
private readonly IAppSettingsService _appSettings;
private readonly IGoogleAnalyticsService _googleAnalyticsService;
public SettingsFeaturesPage()
public SettingsOptionsPage()
{
_settings = Resolver.Resolve<ISettings>();
_appSettings = Resolver.Resolve<IAppSettingsService>();
@ -231,7 +231,7 @@ namespace Bit.App.Pages
ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Close));
}
Title = AppResources.Features;
Title = AppResources.Options;
Content = scrollView;
}

16
src/App/Pages/Settings/SettingsPage.cs
View file

@ -51,7 +51,7 @@ namespace Bit.App.Pages
private ExtendedTextCell AboutCell { get; set; }
private ExtendedTextCell HelpCell { get; set; }
private ExtendedTextCell RateCell { get; set; }
private ExtendedTextCell FeaturesCell { get; set; }
private ExtendedTextCell OptionsCell { get; set; }
private LongDetailViewCell RateCellLong { get; set; }
private ExtendedTableView Table { get; set; }
@ -143,15 +143,15 @@ namespace Bit.App.Pages
ShowDisclousure = true
};
FeaturesCell = new ExtendedTextCell
OptionsCell = new ExtendedTextCell
{
Text = AppResources.Features,
Text = AppResources.Options,
ShowDisclousure = true
};
var otherSection = new TableSection(AppResources.Other)
{
FeaturesCell,
OptionsCell,
AboutCell,
HelpCell
};
@ -218,7 +218,7 @@ namespace Bit.App.Pages
LogOutCell.Tapped += LogOutCell_Tapped;
AboutCell.Tapped += AboutCell_Tapped;
HelpCell.Tapped += HelpCell_Tapped;
FeaturesCell.Tapped += FeaturesCell_Tapped;
OptionsCell.Tapped += OptionsCell_Tapped;
if(RateCellLong != null)
{
@ -252,7 +252,7 @@ namespace Bit.App.Pages
LogOutCell.Tapped -= LogOutCell_Tapped;
AboutCell.Tapped -= AboutCell_Tapped;
HelpCell.Tapped -= HelpCell_Tapped;
FeaturesCell.Tapped -= FeaturesCell_Tapped;
OptionsCell.Tapped -= OptionsCell_Tapped;
if(RateCellLong != null)
{
@ -431,9 +431,9 @@ namespace Bit.App.Pages
}
}
private void FeaturesCell_Tapped(object sender, EventArgs e)
private void OptionsCell_Tapped(object sender, EventArgs e)
{
Navigation.PushModalAsync(new ExtendedNavigationPage(new SettingsFeaturesPage()));
Navigation.PushModalAsync(new ExtendedNavigationPage(new SettingsOptionsPage()));
}
private void FoldersCell_Tapped(object sender, EventArgs e)

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

@ -1321,15 +1321,6 @@ namespace Bit.App.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Features.
/// </summary>
public static string Features {
get {
return ResourceManager.GetString("Features", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Feature Unavailable.
/// </summary>

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

@ -818,9 +818,6 @@
<data name="DisableGADescription" xml:space="preserve">
<value>We use analytics to better learn how the app is being used so that we can make it better. All data collection is completely anonymous.</value>
</data>
<data name="Features" xml:space="preserve">
<value>Features</value>
</data>
<data name="AutofillPasswordField" xml:space="preserve">
<value>Scan When Password Field Focused</value>
</data>