mirror of
https://github.com/bitwarden/mobile
synced 2025-12-15 15:53:44 +00:00
Merge branch 'main' into feature/maui-migration-passkeys
# Conflicts: # src/iOS.Core/Controllers/LoginAddViewController.cs
This commit is contained in:
@@ -14,6 +14,7 @@ using Bit.iOS.Core.Views;
|
||||
using Foundation;
|
||||
using Microsoft.Maui.Controls.Compatibility;
|
||||
using UIKit;
|
||||
using Microsoft.Maui.Platform;
|
||||
|
||||
namespace Bit.iOS.Core.Controllers
|
||||
{
|
||||
@@ -255,7 +256,7 @@ namespace Bit.iOS.Core.Controllers
|
||||
ThemeManager.ApplyResourcesTo(generatorPage);
|
||||
|
||||
var navigationPage = new NavigationPage(generatorPage);
|
||||
var generatorController = navigationPage.CreateViewController();
|
||||
var generatorController = navigationPage.ToUIViewController(MauiContextSingleton.Instance.MauiContext);
|
||||
generatorController.ModalPresentationStyle = UIModalPresentationStyle.FullScreen;
|
||||
PresentViewController(generatorController, true, null);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user