mirror of
https://github.com/bitwarden/mobile
synced 2025-12-17 08:43:21 +00:00
[EC-371] Fix iOS extensions login more menu (#2016)
* EC-371 fix iOS extensions login more menu and HintPage to display correctly on extensions * EC-371 fix merge
This commit is contained in:
committed by
GitHub
parent
570b56364a
commit
3ef5b576ac
@@ -339,7 +339,7 @@ namespace Bit.iOS.Core.Controllers
|
||||
var loginPage = new LoginSsoPage();
|
||||
var app = new App.App(new AppOptions { IosExtension = true });
|
||||
ThemeManager.SetTheme(app.Resources);
|
||||
ThemeManager.ApplyResourcesToPage(loginPage);
|
||||
ThemeManager.ApplyResourcesTo(loginPage);
|
||||
if (loginPage.BindingContext is LoginSsoPageViewModel vm)
|
||||
{
|
||||
vm.SsoAuthSuccessAction = () => DoContinue();
|
||||
|
||||
@@ -328,7 +328,7 @@ namespace Bit.iOS.Core.Controllers
|
||||
var loginPage = new LoginSsoPage();
|
||||
var app = new App.App(new AppOptions { IosExtension = true });
|
||||
ThemeManager.SetTheme(app.Resources);
|
||||
ThemeManager.ApplyResourcesToPage(loginPage);
|
||||
ThemeManager.ApplyResourcesTo(loginPage);
|
||||
if (loginPage.BindingContext is LoginSsoPageViewModel vm)
|
||||
{
|
||||
vm.SsoAuthSuccessAction = () => DoContinue();
|
||||
|
||||
@@ -83,12 +83,11 @@ namespace Bit.iOS.Core.Services
|
||||
{
|
||||
HideLoadingAsync().GetAwaiter().GetResult();
|
||||
}
|
||||
|
||||
var vc = GetPresentedViewController();
|
||||
if (vc is null)
|
||||
{
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
}
|
||||
|
||||
var result = new TaskCompletionSource<int>();
|
||||
|
||||
@@ -360,6 +359,7 @@ namespace Bit.iOS.Core.Services
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var result = new TaskCompletionSource<string>();
|
||||
var sheet = UIAlertController.Create(title, null, UIAlertControllerStyle.ActionSheet);
|
||||
if (UIDevice.CurrentDevice.UserInterfaceIdiom == UIUserInterfaceIdiom.Pad)
|
||||
|
||||
Reference in New Issue
Block a user