mirror of
https://github.com/bitwarden/android.git
synced 2024-10-31 15:15:34 +03:00
Move remaining primary buttons in login flow (#1470)
* Fix show/hide logic on Continue button * Fix bug in 2FA method selection modal * Move Log In button in SSO flow * Fix linting
This commit is contained in:
parent
93e2c0df7c
commit
9ec4050e4d
2 changed files with 11 additions and 3 deletions
|
@ -14,7 +14,6 @@
|
|||
|
||||
<ContentPage.ToolbarItems>
|
||||
<ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
|
||||
<ToolbarItem Text="{u:I18n LogIn}" Clicked="LogIn_Clicked" />
|
||||
</ContentPage.ToolbarItems>
|
||||
|
||||
<ScrollView>
|
||||
|
@ -36,6 +35,10 @@
|
|||
ReturnCommand="{Binding LogInCommand}" />
|
||||
</StackLayout>
|
||||
</StackLayout>
|
||||
<StackLayout Padding="10, 0">
|
||||
<Button Text="{u:I18n LogIn}"
|
||||
Clicked="LogIn_Clicked"></Button>
|
||||
</StackLayout>
|
||||
</StackLayout>
|
||||
</ScrollView>
|
||||
|
||||
|
|
|
@ -33,6 +33,7 @@ namespace Bit.App.Pages
|
|||
private string _webVaultUrl = "https://vault.bitwarden.com";
|
||||
private bool _authingWithSso = false;
|
||||
private bool _enableContinue = false;
|
||||
private bool _showContinue = true;
|
||||
|
||||
public TwoFactorPageViewModel()
|
||||
{
|
||||
|
@ -74,7 +75,11 @@ namespace Bit.App.Pages
|
|||
|
||||
public bool ShowTryAgain => YubikeyMethod && Device.RuntimePlatform == Device.iOS;
|
||||
|
||||
public bool ShowContinue { get; set; }
|
||||
public bool ShowContinue
|
||||
{
|
||||
get => _showContinue;
|
||||
set => SetProperty(ref _showContinue, value);
|
||||
}
|
||||
|
||||
public bool EnableContinue
|
||||
{
|
||||
|
@ -247,7 +252,7 @@ namespace Bit.App.Pages
|
|||
{
|
||||
_platformUtilsService.LaunchUri("https://help.bitwarden.com/article/lost-two-step-device/");
|
||||
}
|
||||
else if (method != AppResources.Cancel)
|
||||
else if (method != AppResources.Cancel && method != null)
|
||||
{
|
||||
var selected = supportedProviders.FirstOrDefault(p => p.Name == method)?.Type;
|
||||
if (selected == SelectedProviderType)
|
||||
|
|
Loading…
Reference in a new issue