remove my vault as default page options

This commit is contained in:
Kyle Spearrin 2017-12-20 00:11:15 -05:00
parent b6a4efa7ba
commit a4a93f0999
11 changed files with 7 additions and 87 deletions

View file

@ -250,7 +250,7 @@ namespace Bit.Android
var options = new AppOptions var options = new AppOptions
{ {
Uri = Intent.GetStringExtra("uri") ?? Intent.GetStringExtra("autofillFrameworkUri"), Uri = Intent.GetStringExtra("uri") ?? Intent.GetStringExtra("autofillFrameworkUri"),
MyVault = Intent.GetBooleanExtra("myVaultTile", false), MyVaultTile = Intent.GetBooleanExtra("myVaultTile", false),
FromAutofillFramework = Intent.GetBooleanExtra("autofillFramework", false) FromAutofillFramework = Intent.GetBooleanExtra("autofillFramework", false)
}; };

View file

@ -4,7 +4,6 @@ namespace Bit.App.Abstractions
{ {
public interface IAppSettingsService public interface IAppSettingsService
{ {
bool DefaultPageVault { get; set; }
bool Locked { get; set; } bool Locked { get; set; }
DateTime LastActivity { get; set; } DateTime LastActivity { get; set; }
DateTime LastCacheClear { get; set; } DateTime LastCacheClear { get; set; }

View file

@ -78,7 +78,7 @@ namespace Bit.App
} }
else else
{ {
MainPage = new MainPage(myVault: _options.MyVault); MainPage = new MainPage();
} }
} }
else else

View file

@ -13,7 +13,6 @@
public const string SettingDisableTotpCopy = "setting:disableAutoCopyTotp"; public const string SettingDisableTotpCopy = "setting:disableAutoCopyTotp";
public const string AutofillPersistNotification = "setting:persistNotification"; public const string AutofillPersistNotification = "setting:persistNotification";
public const string AutofillPasswordField = "setting:autofillPasswordField"; public const string AutofillPasswordField = "setting:autofillPasswordField";
public const string SettingDefaultPageVault = "setting:defaultPageVault";
public const string PasswordGeneratorLength = "pwGenerator:length"; public const string PasswordGeneratorLength = "pwGenerator:length";
public const string PasswordGeneratorUppercase = "pwGenerator:uppercase"; public const string PasswordGeneratorUppercase = "pwGenerator:uppercase";

View file

@ -4,7 +4,7 @@ namespace Bit.App.Models
{ {
public class AppOptions public class AppOptions
{ {
public bool MyVault { get; set; } public bool MyVaultTile { get; set; }
public bool FromAutofillFramework { get; set; } public bool FromAutofillFramework { get; set; }
public CipherType? FillType { get; set; } public CipherType? FillType { get; set; }
public string Uri { get; set; } public string Uri { get; set; }

View file

@ -8,7 +8,7 @@ namespace Bit.App.Pages
{ {
public class MainPage : ExtendedTabbedPage public class MainPage : ExtendedTabbedPage
{ {
public MainPage(bool myVault = false) public MainPage()
{ {
TintColor = Color.FromHex("3c8dbc"); TintColor = Color.FromHex("3c8dbc");
@ -24,10 +24,7 @@ namespace Bit.App.Pages
Children.Add(toolsNavigation); Children.Add(toolsNavigation);
Children.Add(settingsNavigation); Children.Add(settingsNavigation);
if(myVault || Resolver.Resolve<IAppSettingsService>().DefaultPageVault) SelectedItem = vaultNavigation;
{
SelectedItem = vaultNavigation;
}
} }
} }
} }

View file

@ -25,8 +25,6 @@ namespace Bit.App.Pages
} }
private StackLayout StackLayout { get; set; } private StackLayout StackLayout { get; set; }
private ExtendedSwitchCell DefaultPageVaultCell { get; set; }
private Label DefaultPageVaultLabel { get; set; }
private ExtendedSwitchCell CopyTotpCell { get; set; } private ExtendedSwitchCell CopyTotpCell { get; set; }
private Label CopyTotpLabel { get; set; } private Label CopyTotpLabel { get; set; }
private ExtendedSwitchCell AnalyticsCell { get; set; } private ExtendedSwitchCell AnalyticsCell { get; set; }
@ -42,30 +40,13 @@ namespace Bit.App.Pages
private void Init() private void Init()
{ {
DefaultPageVaultCell = new ExtendedSwitchCell
{
Text = AppResources.DefaultPageVault,
On = _appSettings.DefaultPageVault
};
var defaultPageVaultTable = new FormTableView(true)
{
Root = new TableRoot
{
new TableSection(Helpers.GetEmptyTableSectionTitle())
{
DefaultPageVaultCell
}
}
};
WebsiteIconsCell = new ExtendedSwitchCell WebsiteIconsCell = new ExtendedSwitchCell
{ {
Text = AppResources.DisableWebsiteIcons, Text = AppResources.DisableWebsiteIcons,
On = _appSettings.DisableWebsiteIcons On = _appSettings.DisableWebsiteIcons
}; };
var websiteIconsTable = new FormTableView var websiteIconsTable = new FormTableView(true)
{ {
Root = new TableRoot Root = new TableRoot
{ {
@ -110,11 +91,6 @@ namespace Bit.App.Pages
} }
}; };
DefaultPageVaultLabel = new FormTableLabel(this)
{
Text = AppResources.DefaultPageVaultDescription
};
CopyTotpLabel = new FormTableLabel(this) CopyTotpLabel = new FormTableLabel(this)
{ {
Text = AppResources.DisableAutoTotpCopyDescription Text = AppResources.DisableAutoTotpCopyDescription
@ -134,7 +110,6 @@ namespace Bit.App.Pages
{ {
Children = Children =
{ {
defaultPageVaultTable, DefaultPageVaultLabel,
websiteIconsTable, WebsiteIconsLabel, websiteIconsTable, WebsiteIconsLabel,
totpTable, CopyTotpLabel, totpTable, CopyTotpLabel,
analyticsTable, AnalyticsLabel analyticsTable, AnalyticsLabel
@ -239,7 +214,6 @@ namespace Bit.App.Pages
{ {
base.OnAppearing(); base.OnAppearing();
DefaultPageVaultCell.OnChanged += DefaultPageVaultCell_Changed;
AnalyticsCell.OnChanged += AnalyticsCell_Changed; AnalyticsCell.OnChanged += AnalyticsCell_Changed;
WebsiteIconsCell.OnChanged += WebsiteIconsCell_Changed; WebsiteIconsCell.OnChanged += WebsiteIconsCell_Changed;
CopyTotpCell.OnChanged += CopyTotpCell_OnChanged; CopyTotpCell.OnChanged += CopyTotpCell_OnChanged;
@ -257,7 +231,6 @@ namespace Bit.App.Pages
{ {
base.OnDisappearing(); base.OnDisappearing();
DefaultPageVaultCell.OnChanged -= DefaultPageVaultCell_Changed;
AnalyticsCell.OnChanged -= AnalyticsCell_Changed; AnalyticsCell.OnChanged -= AnalyticsCell_Changed;
WebsiteIconsCell.OnChanged -= WebsiteIconsCell_Changed; WebsiteIconsCell.OnChanged -= WebsiteIconsCell_Changed;
CopyTotpCell.OnChanged -= CopyTotpCell_OnChanged; CopyTotpCell.OnChanged -= CopyTotpCell_OnChanged;
@ -273,7 +246,6 @@ namespace Bit.App.Pages
private void Layout_LayoutChanged(object sender, EventArgs e) private void Layout_LayoutChanged(object sender, EventArgs e)
{ {
DefaultPageVaultLabel.WidthRequest = StackLayout.Bounds.Width - DefaultPageVaultLabel.Bounds.Left * 2;
AnalyticsLabel.WidthRequest = StackLayout.Bounds.Width - AnalyticsLabel.Bounds.Left * 2; AnalyticsLabel.WidthRequest = StackLayout.Bounds.Width - AnalyticsLabel.Bounds.Left * 2;
WebsiteIconsLabel.WidthRequest = StackLayout.Bounds.Width - WebsiteIconsLabel.Bounds.Left * 2; WebsiteIconsLabel.WidthRequest = StackLayout.Bounds.Width - WebsiteIconsLabel.Bounds.Left * 2;
CopyTotpLabel.WidthRequest = StackLayout.Bounds.Width - CopyTotpLabel.Bounds.Left * 2; CopyTotpLabel.WidthRequest = StackLayout.Bounds.Width - CopyTotpLabel.Bounds.Left * 2;
@ -295,17 +267,6 @@ namespace Bit.App.Pages
} }
} }
private void DefaultPageVaultCell_Changed(object sender, ToggledEventArgs e)
{
var cell = sender as ExtendedSwitchCell;
if(cell == null)
{
return;
}
_appSettings.DefaultPageVault = cell.On;
}
private void WebsiteIconsCell_Changed(object sender, ToggledEventArgs e) private void WebsiteIconsCell_Changed(object sender, ToggledEventArgs e)
{ {
var cell = sender as ExtendedSwitchCell; var cell = sender as ExtendedSwitchCell;

View file

@ -311,7 +311,7 @@ namespace Bit.App.Pages
{ {
if(_fromAutofillFramework) if(_fromAutofillFramework)
{ {
Application.Current.MainPage = new MainPage(true); Application.Current.MainPage = new MainPage();
return true; return true;
} }

View file

@ -915,24 +915,6 @@ namespace Bit.App.Resources {
} }
} }
/// <summary>
/// Looks up a localized string similar to Default To &quot;My Vault&quot;.
/// </summary>
public static string DefaultPageVault {
get {
return ResourceManager.GetString("DefaultPageVault", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Default to the &quot;My Vault&quot; page instead of &quot;Favorites&quot; whenever I open the app..
/// </summary>
public static string DefaultPageVaultDescription {
get {
return ResourceManager.GetString("DefaultPageVaultDescription", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Delete. /// Looks up a localized string similar to Delete.
/// </summary> /// </summary>

View file

@ -1194,12 +1194,6 @@
<data name="Collections" xml:space="preserve"> <data name="Collections" xml:space="preserve">
<value>Collections</value> <value>Collections</value>
</data> </data>
<data name="DefaultPageVault" xml:space="preserve">
<value>Default To "My Vault"</value>
</data>
<data name="DefaultPageVaultDescription" xml:space="preserve">
<value>Default to the "My Vault" page instead of "Favorites" whenever I open the app.</value>
</data>
<data name="NoItemsCollection" xml:space="preserve"> <data name="NoItemsCollection" xml:space="preserve">
<value>There are no items in this collection.</value> <value>There are no items in this collection.</value>
</data> </data>

View file

@ -14,18 +14,6 @@ namespace Bit.App.Services
_settings = settings; _settings = settings;
} }
public bool DefaultPageVault
{
get
{
return _settings.GetValueOrDefault(Constants.SettingDefaultPageVault, false);
}
set
{
_settings.AddOrUpdateValue(Constants.SettingDefaultPageVault, value);
}
}
public bool Locked public bool Locked
{ {
get get