From 50738fb7403a28502012e89174e0531242c79b2c Mon Sep 17 00:00:00 2001 From: Mingshen Sun Date: Wed, 30 Dec 2020 22:46:17 -0800 Subject: [PATCH] Add navigation controller to the AutoFilll view --- .../Base.lproj/MainInterface.storyboard | 135 +++++++++--------- .../CredentialProviderViewController.swift | 1 + .../Base.lproj/MainInterface.storyboard | 94 ++++++------ 3 files changed, 118 insertions(+), 112 deletions(-) diff --git a/passAutoFillExtension/Base.lproj/MainInterface.storyboard b/passAutoFillExtension/Base.lproj/MainInterface.storyboard index 1bca928..248263c 100644 --- a/passAutoFillExtension/Base.lproj/MainInterface.storyboard +++ b/passAutoFillExtension/Base.lproj/MainInterface.storyboard @@ -1,15 +1,14 @@ - - - - + + - + + - + @@ -17,72 +16,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + - - - - - - - - - + + + + - + + + + + + + @@ -90,6 +75,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/passAutoFillExtension/Controllers/CredentialProviderViewController.swift b/passAutoFillExtension/Controllers/CredentialProviderViewController.swift index 6e87170..cc3a5af 100644 --- a/passAutoFillExtension/Controllers/CredentialProviderViewController.swift +++ b/passAutoFillExtension/Controllers/CredentialProviderViewController.swift @@ -85,6 +85,7 @@ class CredentialProviderViewController: ASCredentialProviderViewController, UITa @IBAction private func cancel(_: AnyObject?) { extensionContext.cancelRequest(withError: NSError(domain: ASExtensionErrorDomain, code: ASExtensionError.userCanceled.rawValue)) + self.dismiss(animated: true) } override func viewWillAppear(_ animated: Bool) { diff --git a/passExtension/Base.lproj/MainInterface.storyboard b/passExtension/Base.lproj/MainInterface.storyboard index 0661983..67684cd 100644 --- a/passExtension/Base.lproj/MainInterface.storyboard +++ b/passExtension/Base.lproj/MainInterface.storyboard @@ -1,9 +1,10 @@ - + - + + @@ -19,52 +20,48 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + - - - - + + + + @@ -81,7 +78,7 @@ - + @@ -102,4 +99,9 @@ + + + + +