From fda37716a84e0b0f9738a63da08216c5cf4f1eb0 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Fri, 2 Aug 2019 16:08:04 -0400 Subject: [PATCH] load popup in app window --- .../desktop/desktop.xcodeproj/project.pbxproj | 4 ++ .../UserInterfaceState.xcuserstate | Bin 25403 -> 30774 bytes .../SafariExtensionViewController.swift | 43 +++++++++++++++++- .../app/desktop/safari/app/popup/index.html | 19 ++++++++ 4 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 src/safari/app/desktop/safari/app/popup/index.html diff --git a/src/safari/app/desktop/desktop.xcodeproj/project.pbxproj b/src/safari/app/desktop/desktop.xcodeproj/project.pbxproj index bc6921d425..e690fc9bf6 100644 --- a/src/safari/app/desktop/desktop.xcodeproj/project.pbxproj +++ b/src/safari/app/desktop/desktop.xcodeproj/project.pbxproj @@ -18,6 +18,7 @@ 27E5E9AE22F3D5FE005EA1D9 /* script.js in Resources */ = {isa = PBXBuildFile; fileRef = 27E5E9AD22F3D5FE005EA1D9 /* script.js */; }; 27E5E9B022F3D5FE005EA1D9 /* ToolbarItemIcon.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 27E5E9AF22F3D5FE005EA1D9 /* ToolbarItemIcon.pdf */; }; 27E5E9B422F3D5FE005EA1D9 /* safari.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 27E5E9A022F3D5FE005EA1D9 /* safari.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + 27E5E9BC22F4B9D5005EA1D9 /* app in Resources */ = {isa = PBXBuildFile; fileRef = 27E5E9BB22F4B9D5005EA1D9 /* app */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -61,6 +62,7 @@ 27E5E9AD22F3D5FE005EA1D9 /* script.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = script.js; sourceTree = ""; }; 27E5E9AF22F3D5FE005EA1D9 /* ToolbarItemIcon.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = ToolbarItemIcon.pdf; sourceTree = ""; }; 27E5E9B122F3D5FE005EA1D9 /* safari.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = safari.entitlements; sourceTree = ""; }; + 27E5E9BB22F4B9D5005EA1D9 /* app */ = {isa = PBXFileReference; lastKnownFileType = folder; path = app; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -125,6 +127,7 @@ 27E5E9A422F3D5FE005EA1D9 /* safari */ = { isa = PBXGroup; children = ( + 27E5E9BB22F4B9D5005EA1D9 /* app */, 27E5E9A522F3D5FE005EA1D9 /* SafariExtensionHandler.swift */, 27E5E9A722F3D5FE005EA1D9 /* SafariExtensionViewController.swift */, 27E5E9A922F3D5FE005EA1D9 /* SafariExtensionViewController.xib */, @@ -231,6 +234,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 27E5E9BC22F4B9D5005EA1D9 /* app in Resources */, 27E5E9B022F3D5FE005EA1D9 /* ToolbarItemIcon.pdf in Resources */, 27E5E9AB22F3D5FE005EA1D9 /* SafariExtensionViewController.xib in Resources */, 27E5E9AE22F3D5FE005EA1D9 /* script.js in Resources */, diff --git a/src/safari/app/desktop/desktop.xcodeproj/project.xcworkspace/xcuserdata/kyle.xcuserdatad/UserInterfaceState.xcuserstate b/src/safari/app/desktop/desktop.xcodeproj/project.xcworkspace/xcuserdata/kyle.xcuserdatad/UserInterfaceState.xcuserstate index be178f54f1909be54b25e5b8747707e7aab6f1ab..51288c00e1859b437fe3db0376e182733bac6b12 100644 GIT binary patch delta 14938 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 ObbbpwUM@TgCjJj^c2LUz delta 11367 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 P_D{j^N4g+TR`LG;YAbD* diff --git a/src/safari/app/desktop/safari/SafariExtensionViewController.swift b/src/safari/app/desktop/safari/SafariExtensionViewController.swift index 0845c53e40..0049ecc71a 100644 --- a/src/safari/app/desktop/safari/SafariExtensionViewController.swift +++ b/src/safari/app/desktop/safari/SafariExtensionViewController.swift @@ -7,13 +7,52 @@ // import SafariServices +import WebKit -class SafariExtensionViewController: SFSafariExtensionViewController { +class SafariExtensionViewController: SFSafariExtensionViewController, WKScriptMessageHandler, WKNavigationDelegate { + + var webView: WKWebView! static let shared: SafariExtensionViewController = { let shared = SafariExtensionViewController() - shared.preferredContentSize = NSSize(width:320, height:240) + shared.preferredContentSize = NSSize(width:375, height:600) return shared }() + + func initWebView() { + let parentHeight = SafariExtensionViewController.shared.preferredContentSize.height + let parentWidth = SafariExtensionViewController.shared.preferredContentSize.width + let webViewConfig = WKWebViewConfiguration() + let bundleURL = Bundle.main.resourceURL!.absoluteURL + let html = bundleURL.appendingPathComponent("app/popup/index.html") + webViewConfig.preferences.setValue(true, forKey: "developerExtrasEnabled") + webViewConfig.userContentController.add(self, name: "webViewOnLoad") + webView = WKWebView(frame: CGRect(x: 0, y: 0, width: parentWidth, height: parentHeight), configuration: webViewConfig) + webView.navigationDelegate = self + webView.allowsLinkPreview = false + webView.loadFileURL(html, allowingReadAccessTo:bundleURL) + webView.alphaValue = 0.0; + self.view.addSubview(webView) + } + + func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) { + NSAnimationContext.runAnimationGroup({_ in + NSAnimationContext.current.duration = 0.35 + webView.animator().alphaValue = 1.0 + }) + } + + override func viewDidLoad() { + super.viewDidLoad() + let backgroundColor = NSColor.init(red: (39/255.0), green: (42/255.0), blue: (46/255.0), alpha: 1.0) + view.setValue(backgroundColor, forKey: "backgroundColor") + initWebView() + } + + func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) { + if message.name == "webViewOnLoad" { + + } + } } diff --git a/src/safari/app/desktop/safari/app/popup/index.html b/src/safari/app/desktop/safari/app/popup/index.html new file mode 100644 index 0000000000..e1d16d45e5 --- /dev/null +++ b/src/safari/app/desktop/safari/app/popup/index.html @@ -0,0 +1,19 @@ + + + + + + Bitwarden + + + + + +
+
+ + + + + +