From a98283f3ff2851572a81fa2ab538c04190009958 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 31 May 2019 12:13:14 -0400
Subject: [PATCH] return commands for accounts pages

---
 src/App/Pages/Accounts/EnvironmentPage.xaml        | 12 ++++++++++--
 src/App/Pages/Accounts/EnvironmentPage.xaml.cs     |  8 ++++++++
 src/App/Pages/Accounts/EnvironmentPageViewModel.cs |  3 +++
 src/App/Pages/Accounts/HintPage.xaml               |  4 +++-
 src/App/Pages/Accounts/HintPageViewModel.cs        |  3 +++
 src/App/Pages/Accounts/LockPage.xaml               |  8 ++++++--
 src/App/Pages/Accounts/LockPageViewModel.cs        |  2 ++
 src/App/Pages/Accounts/RegisterPage.xaml           |  5 ++++-
 src/App/Pages/Accounts/RegisterPage.xaml.cs        |  7 +++++++
 src/App/Pages/Accounts/RegisterPageViewModel.cs    |  2 ++
 src/App/Pages/Accounts/TwoFactorPage.xaml          |  8 ++++++--
 src/App/Pages/Accounts/TwoFactorPageViewModel.cs   |  2 ++
 12 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/src/App/Pages/Accounts/EnvironmentPage.xaml b/src/App/Pages/Accounts/EnvironmentPage.xaml
index 164139722..9d8c87ca5 100644
--- a/src/App/Pages/Accounts/EnvironmentPage.xaml
+++ b/src/App/Pages/Accounts/EnvironmentPage.xaml
@@ -31,7 +31,9 @@
                         Text="{Binding BaseUrl}"
                         Keyboard="Url"
                         Placeholder="ex. https://bitwarden.company.com"
-                        StyleClass="box-value" />
+                        StyleClass="box-value"
+                        ReturnType="Go"
+                        ReturnCommand="{Binding SubmitCommand}" />
                 </StackLayout>
                 <Label
                     Text="{u:I18n SelfHostedEnvironmentFooter}"
@@ -47,6 +49,7 @@
                         Text="{u:I18n WebVaultUrl}"
                         StyleClass="box-label" />
                     <Entry
+                        x:Name="_webVaultEntry"
                         Text="{Binding WebVaultUrl}"
                         Keyboard="Url"
                         StyleClass="box-value" />
@@ -56,6 +59,7 @@
                         Text="{u:I18n ApiUrl}"
                         StyleClass="box-label" />
                     <Entry
+                        x:Name="_apiEntry"
                         Text="{Binding ApiUrl}"
                         Keyboard="Url"
                         StyleClass="box-value" />
@@ -65,6 +69,7 @@
                         Text="{u:I18n IdentityUrl}"
                         StyleClass="box-label" />
                     <Entry
+                        x:Name="_identityEntry"
                         Text="{Binding IdentityUrl}"
                         Keyboard="Url"
                         StyleClass="box-value" />
@@ -74,9 +79,12 @@
                         Text="{u:I18n IconsUrl}"
                         StyleClass="box-label" />
                     <Entry
+                        x:Name="_iconsEntry"
                         Text="{Binding IconsUrl}"
                         Keyboard="Url"
-                        StyleClass="box-value" />
+                        StyleClass="box-value"
+                        ReturnType="Go"
+                        ReturnCommand="{Binding SubmitCommand}" />
                 </StackLayout>
                 <Label
                     Text="{u:I18n CustomEnvironmentFooter}"
diff --git a/src/App/Pages/Accounts/EnvironmentPage.xaml.cs b/src/App/Pages/Accounts/EnvironmentPage.xaml.cs
index ca9d0021c..ba49650bb 100644
--- a/src/App/Pages/Accounts/EnvironmentPage.xaml.cs
+++ b/src/App/Pages/Accounts/EnvironmentPage.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
@@ -11,6 +12,13 @@ namespace Bit.App.Pages
             InitializeComponent();
             _vm = BindingContext as EnvironmentPageViewModel;
             _vm.Page = this;
+
+            _webVaultEntry.ReturnType = ReturnType.Next;
+            _webVaultEntry.ReturnCommand = new Command(() => _apiEntry.Focus());
+            _apiEntry.ReturnType = ReturnType.Next;
+            _apiEntry.ReturnCommand = new Command(() => _identityEntry.Focus());
+            _identityEntry.ReturnType = ReturnType.Next;
+            _identityEntry.ReturnCommand = new Command(() => _iconsEntry.Focus());
         }
 
         private async void Submit_Clicked(object sender, EventArgs e)
diff --git a/src/App/Pages/Accounts/EnvironmentPageViewModel.cs b/src/App/Pages/Accounts/EnvironmentPageViewModel.cs
index 611911d79..09eaf7f3a 100644
--- a/src/App/Pages/Accounts/EnvironmentPageViewModel.cs
+++ b/src/App/Pages/Accounts/EnvironmentPageViewModel.cs
@@ -2,6 +2,7 @@
 using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using System.Threading.Tasks;
+using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
@@ -22,8 +23,10 @@ namespace Bit.App.Pages
             IdentityUrl = _environmentService.IdentityUrl;
             IconsUrl = _environmentService.IconsUrl;
             NotificationsUrls = _environmentService.NotificationsUrl;
+            SubmitCommand = new Command(async () => await SubmitAsync());
         }
 
+        public Command SubmitCommand { get; }
         public string BaseUrl { get; set; }
         public string ApiUrl { get; set; }
         public string IdentityUrl { get; set; }
diff --git a/src/App/Pages/Accounts/HintPage.xaml b/src/App/Pages/Accounts/HintPage.xaml
index 1e9aaac1d..e0f4cbe6a 100644
--- a/src/App/Pages/Accounts/HintPage.xaml
+++ b/src/App/Pages/Accounts/HintPage.xaml
@@ -25,7 +25,9 @@
                 <Entry
                     Text="{Binding Email}"
                     Keyboard="Email"
-                    StyleClass="box-value" />
+                    StyleClass="box-value"
+                    ReturnType="Go"
+                    ReturnCommand="{Binding SubmitCommand}" />
             </StackLayout>
             <Label
                 Text="{u:I18n EnterEmailForHint}"
diff --git a/src/App/Pages/Accounts/HintPageViewModel.cs b/src/App/Pages/Accounts/HintPageViewModel.cs
index 6b833d9b6..894017f17 100644
--- a/src/App/Pages/Accounts/HintPageViewModel.cs
+++ b/src/App/Pages/Accounts/HintPageViewModel.cs
@@ -4,6 +4,7 @@ using Bit.Core.Abstractions;
 using Bit.Core.Exceptions;
 using Bit.Core.Utilities;
 using System.Threading.Tasks;
+using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
@@ -18,8 +19,10 @@ namespace Bit.App.Pages
             _apiService = ServiceContainer.Resolve<IApiService>("apiService");
 
             PageTitle = AppResources.PasswordHint;
+            SubmitCommand = new Command(async () => await SubmitAsync());
         }
 
+        public Command SubmitCommand { get; }
         public string Email { get; set; }
 
         public async Task SubmitAsync()
diff --git a/src/App/Pages/Accounts/LockPage.xaml b/src/App/Pages/Accounts/LockPage.xaml
index b9ad4d43d..8824cd012 100644
--- a/src/App/Pages/Accounts/LockPage.xaml
+++ b/src/App/Pages/Accounts/LockPage.xaml
@@ -47,7 +47,9 @@
                         Keyboard="Numeric"
                         IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                         Grid.Row="1"
-                        Grid.Column="0" />
+                        Grid.Column="0"
+                        ReturnType="Go"
+                        ReturnCommand="{Binding SubmitCommand}" />
                     <controls:FaButton
                         StyleClass="box-row-button, box-row-button-platform"
                         Text="{Binding ShowPasswordIcon}"
@@ -76,7 +78,9 @@
                         StyleClass="box-value"
                         IsPassword="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
                         Grid.Row="1"
-                        Grid.Column="0" />
+                        Grid.Column="0"
+                        ReturnType="Go"
+                        ReturnCommand="{Binding SubmitCommand}" />
                     <controls:FaButton
                         StyleClass="box-row-button, box-row-button-platform"
                         Text="{Binding ShowPasswordIcon}"
diff --git a/src/App/Pages/Accounts/LockPageViewModel.cs b/src/App/Pages/Accounts/LockPageViewModel.cs
index c9171595e..beecf3e81 100644
--- a/src/App/Pages/Accounts/LockPageViewModel.cs
+++ b/src/App/Pages/Accounts/LockPageViewModel.cs
@@ -45,6 +45,7 @@ namespace Bit.App.Pages
 
             PageTitle = AppResources.VerifyMasterPassword;
             TogglePasswordCommand = new Command(TogglePassword);
+            SubmitCommand = new Command(async () => await SubmitAsync());
         }
 
         public bool ShowPassword
@@ -87,6 +88,7 @@ namespace Bit.App.Pages
             set => SetProperty(ref _lockedVerifyText, value);
         }
 
+        public Command SubmitCommand { get; }
         public Command TogglePasswordCommand { get; }
         public string ShowPasswordIcon => ShowPassword ? "" : "";
         public string MasterPassword { get; set; }
diff --git a/src/App/Pages/Accounts/RegisterPage.xaml b/src/App/Pages/Accounts/RegisterPage.xaml
index ebfa23f5a..4e869c61d 100644
--- a/src/App/Pages/Accounts/RegisterPage.xaml
+++ b/src/App/Pages/Accounts/RegisterPage.xaml
@@ -104,8 +104,11 @@
                         Text="{u:I18n MasterPasswordHint}"
                         StyleClass="box-label" />
                     <Entry
+                        x:Name="_hint"
                         Text="{Binding Hint}"
-                        StyleClass="box-value" />
+                        StyleClass="box-value"
+                        ReturnType="Go"
+                        ReturnCommand="{Binding SubmitCommand}" />
                 </StackLayout>
                 <Label
                     Text="{u:I18n MasterPasswordHintDescription}"
diff --git a/src/App/Pages/Accounts/RegisterPage.xaml.cs b/src/App/Pages/Accounts/RegisterPage.xaml.cs
index e8ee996e3..192165af4 100644
--- a/src/App/Pages/Accounts/RegisterPage.xaml.cs
+++ b/src/App/Pages/Accounts/RegisterPage.xaml.cs
@@ -14,6 +14,13 @@ namespace Bit.App.Pages
             _vm.Page = this;
             MasterPasswordEntry = _masterPassword;
             ConfirmMasterPasswordEntry = _confirmMasterPassword;
+
+            _email.ReturnType = ReturnType.Next;
+            _email.ReturnCommand = new Command(() => _masterPassword.Focus());
+            _masterPassword.ReturnType = ReturnType.Next;
+            _masterPassword.ReturnCommand = new Command(() => _confirmMasterPassword.Focus());
+            _confirmMasterPassword.ReturnType = ReturnType.Next;
+            _confirmMasterPassword.ReturnCommand = new Command(() => _hint.Focus());
         }
 
         public Entry MasterPasswordEntry { get; set; }
diff --git a/src/App/Pages/Accounts/RegisterPageViewModel.cs b/src/App/Pages/Accounts/RegisterPageViewModel.cs
index ced9122b0..1a6cfd14b 100644
--- a/src/App/Pages/Accounts/RegisterPageViewModel.cs
+++ b/src/App/Pages/Accounts/RegisterPageViewModel.cs
@@ -27,6 +27,7 @@ namespace Bit.App.Pages
             PageTitle = AppResources.Bitwarden;
             TogglePasswordCommand = new Command(TogglePassword);
             ToggleConfirmPasswordCommand = new Command(ToggleConfirmPassword);
+            SubmitCommand = new Command(async () => await SubmitAsync());
         }
 
         public bool ShowPassword
@@ -39,6 +40,7 @@ namespace Bit.App.Pages
                 });
         }
 
+        public Command SubmitCommand { get; }
         public Command TogglePasswordCommand { get; }
         public Command ToggleConfirmPasswordCommand { get; }
         public string ShowPasswordIcon => ShowPassword ? "" : "";
diff --git a/src/App/Pages/Accounts/TwoFactorPage.xaml b/src/App/Pages/Accounts/TwoFactorPage.xaml
index 004eeecba..ee1a59440 100644
--- a/src/App/Pages/Accounts/TwoFactorPage.xaml
+++ b/src/App/Pages/Accounts/TwoFactorPage.xaml
@@ -38,7 +38,9 @@
                             Text="{Binding Token}"
                             x:Name="_totpEntry"
                             Keyboard="Numeric"
-                            StyleClass="box-value" />
+                            StyleClass="box-value"
+                            ReturnType="Go"
+                            ReturnCommand="{Binding SubmitCommand}" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-switch">
                         <Label
@@ -67,7 +69,9 @@
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Entry
                             Text="{Binding Token}"
-                            StyleClass="box-value" />
+                            StyleClass="box-value"
+                            ReturnType="Go"
+                            ReturnCommand="{Binding SubmitCommand}" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-switch">
                         <Label
diff --git a/src/App/Pages/Accounts/TwoFactorPageViewModel.cs b/src/App/Pages/Accounts/TwoFactorPageViewModel.cs
index d187e26a8..177bcbdb8 100644
--- a/src/App/Pages/Accounts/TwoFactorPageViewModel.cs
+++ b/src/App/Pages/Accounts/TwoFactorPageViewModel.cs
@@ -42,6 +42,7 @@ namespace Bit.App.Pages
             _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
 
             PageTitle = AppResources.TwoStepLogin;
+            SubmitCommand = new Command(async () => await SubmitAsync());
         }
 
         public string TotpInstruction
@@ -80,6 +81,7 @@ namespace Bit.App.Pages
                 nameof(TotpMethod),
             });
         }
+        public Command SubmitCommand { get; }
 
         public void Init()
         {