bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2025-12-12 14:23:26 +00:00
Code Issues Releases Wiki Activity

[EC-371] Fix iOS extensions login more menu (#2016)

Browse Source 
* EC-371 fix iOS extensions login more menu and HintPage to display correctly on extensions

* EC-371 fix merge
This commit is contained in:
Federico Maccaroni
2022-08-08 11:28:48 -03:00
committed by GitHub
parent 570b56364a
commit 3ef5b576ac
13 changed files with 101 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/iOS.ShareExtension/LoadingViewController.cs
View File

@@ -38,6 +38,7 @@ namespace Bit.iOS.ShareExtension
Lazy<UIStoryboard> _storyboard = new Lazy<UIStoryboard>(() => UIStoryboard.FromName(STORYBOARD_NAME, null));
private readonly Lazy<AppOptions> _appOptions = new Lazy<AppOptions>(() => new AppOptions { IosExtension = true });
private App.App _app = null;
private UIViewController _currentModalController;
private bool _presentingOnNavigationPage;
@@ -279,10 +280,10 @@ namespace Bit.iOS.ShareExtension
{
if (_app is null)
{
var app = new App.App(new AppOptions { IosExtension = true });
var app = new App.App(_appOptions.Value);
ThemeManager.SetTheme(app.Resources);
}
ThemeManager.ApplyResourcesToPage(page);
ThemeManager.ApplyResourcesTo(page);
return _app;
}
@@ -307,7 +308,7 @@ namespace Bit.iOS.ShareExtension
{
var environmentPage = new EnvironmentPage();
SetupAppAndApplyResources(environmentPage);
ThemeManager.ApplyResourcesToPage(environmentPage);
ThemeManager.ApplyResourcesTo(environmentPage);
if (environmentPage.BindingContext is EnvironmentPageViewModel vm)
{
vm.SubmitSuccessAction = () => DismissAndLaunch(() => LaunchHomePage());
@@ -331,7 +332,7 @@ namespace Bit.iOS.ShareExtension
private void LaunchLoginFlow(string email = null)
{
var loginPage = new LoginPage(email);
var loginPage = new LoginPage(email, _appOptions.Value);
SetupAppAndApplyResources(loginPage);
if (loginPage.BindingContext is LoginPageViewModel vm)
{