diff --git a/src/App/App.csproj b/src/App/App.csproj
index 210362662..2881282e4 100644
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -113,11 +113,13 @@
+
+
diff --git a/src/App/Pages/Settings/SettingsAboutPage.cs b/src/App/Pages/Settings/SettingsAboutPage.cs
new file mode 100644
index 000000000..c6b6c1245
--- /dev/null
+++ b/src/App/Pages/Settings/SettingsAboutPage.cs
@@ -0,0 +1,24 @@
+using System;
+using Bit.App.Controls;
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
+{
+ public class SettingsAboutPage : ExtendedContentPage
+ {
+ public SettingsAboutPage()
+ {
+ Init();
+ }
+
+ public void Init()
+ {
+ // TODO: version, credits, etc
+
+ var stackLayout = new StackLayout { };
+
+ Title = "About bitwarden";
+ Content = stackLayout;
+ }
+ }
+}
diff --git a/src/App/Pages/Settings/SettingsHelpPage.cs b/src/App/Pages/Settings/SettingsHelpPage.cs
new file mode 100644
index 000000000..151ec9d7c
--- /dev/null
+++ b/src/App/Pages/Settings/SettingsHelpPage.cs
@@ -0,0 +1,24 @@
+using System;
+using Bit.App.Controls;
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
+{
+ public class SettingsHelpPage : ExtendedContentPage
+ {
+ public SettingsHelpPage()
+ {
+ Init();
+ }
+
+ public void Init()
+ {
+ // TODO: hockeyapp feedback, link to website help
+
+ var stackLayout = new StackLayout { };
+
+ Title = "Help and Support";
+ Content = stackLayout;
+ }
+ }
+}
diff --git a/src/App/Pages/Settings/SettingsPage.cs b/src/App/Pages/Settings/SettingsPage.cs
index 0e060fc03..00b23f4f4 100644
--- a/src/App/Pages/Settings/SettingsPage.cs
+++ b/src/App/Pages/Settings/SettingsPage.cs
@@ -40,7 +40,7 @@ namespace Bit.App.Pages
{
FingerprintCell = new ExtendedSwitchCell
{
- Text = "Use Touch ID" + (!_fingerprint.IsAvailable ? " (Unavilable)" : null),
+ Text = "Unlock with Touch ID" + (!_fingerprint.IsAvailable ? " (Unavilable)" : null),
On = _settings.GetValueOrDefault(Constants.SettingFingerprintUnlockOn),
IsEnabled = _fingerprint.IsAvailable
};
@@ -48,7 +48,7 @@ namespace Bit.App.Pages
PinCell = new ExtendedSwitchCell
{
- Text = "Use PIN Code",
+ Text = "Unlock with PIN Code",
On = _settings.GetValueOrDefault(Constants.SettingPinUnlockOn)
};
PinCell.OnChanged += PinCell_Changed;
@@ -101,6 +101,27 @@ namespace Bit.App.Pages
};
logOutCell.Tapped += LogOutCell_Tapped;
+ var aboutCell = new ExtendedTextCell
+ {
+ Text = "About",
+ ShowDisclousure = true
+ };
+ aboutCell.Tapped += AboutCell_Tapped;
+
+ var helpCell = new ExtendedTextCell
+ {
+ Text = "Help and Support",
+ ShowDisclousure = true
+ };
+ helpCell.Tapped += HelpCell_Tapped;
+
+ var rateCell = new ExtendedTextCell
+ {
+ Text = "Rate bitwarden",
+ ShowDisclousure = true
+ };
+ rateCell.Tapped += RateCell_Tapped;
+
var table = new ExtendedTableView
{
EnableScrolling = true,
@@ -112,7 +133,10 @@ namespace Bit.App.Pages
{
LockOptionsCell,
FingerprintCell,
- PinCell,
+ PinCell
+ },
+ new TableSection
+ {
changeMasterPasswordCell,
changeEmailCell
},
@@ -125,6 +149,12 @@ namespace Bit.App.Pages
{
lockCell,
logOutCell
+ },
+ new TableSection("Other")
+ {
+ helpCell,
+ aboutCell,
+ rateCell
}
}
};
@@ -186,6 +216,21 @@ namespace Bit.App.Pages
Navigation.PushAsync(new SettingsSyncPage());
}
+ private void AboutCell_Tapped(object sender, EventArgs e)
+ {
+ Navigation.PushAsync(new SettingsAboutPage());
+ }
+
+ private void RateCell_Tapped(object sender, EventArgs e)
+ {
+ // TODO: link to app stores
+ }
+
+ private void HelpCell_Tapped(object sender, EventArgs e)
+ {
+ Navigation.PushAsync(new SettingsHelpPage());
+ }
+
private void LockCell_Tapped(object sender, EventArgs e)
{
_settings.AddOrUpdateValue(Constants.SettingLocked, true);