Skip to content

Add Safari URL preview to picker #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
cdevroe wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add Safari URL preview to picker #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions Switcheroo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
FE936EA32CE4966F006B2CE7 /* ProfilePickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE936EA22CE4966F006B2CE7 /* ProfilePickerView.swift */; };
FE936EA52CE4971F006B2CE7 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE936EA42CE4971F006B2CE7 /* SettingsView.swift */; };
FED302AF2D2FA8A700D756FF /* FloatingPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = FED302AE2D2FA8A700D756FF /* FloatingPanel.swift */; };
FEEAADB72D2FEFC200DD0F91 /* KeyDownListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = FEEAADB62D2FEFC200DD0F91 /* KeyDownListener.swift */; };
FEEAADB72D2FEFC200DD0F91 /* KeyDownListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = FEEAADB62D2FEFC200DD0F91 /* KeyDownListener.swift */; };
6271D2FA89AE08A550B2AE81 /* WebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A679F61CCD614A51463E3BA /* WebView.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -27,7 +28,8 @@
FE936EA22CE4966F006B2CE7 /* ProfilePickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfilePickerView.swift; sourceTree = "<group>"; };
FE936EA42CE4971F006B2CE7 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
FED302AE2D2FA8A700D756FF /* FloatingPanel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FloatingPanel.swift; sourceTree = "<group>"; };
FEEAADB62D2FEFC200DD0F91 /* KeyDownListener.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyDownListener.swift; sourceTree = "<group>"; };
FEEAADB62D2FEFC200DD0F91 /* KeyDownListener.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyDownListener.swift; sourceTree = "<group>"; };
4A679F61CCD614A51463E3BA /* WebView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebView.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -67,8 +69,9 @@
FE936EA22CE4966F006B2CE7 /* ProfilePickerView.swift */,
FE936EA42CE4971F006B2CE7 /* SettingsView.swift */,
FED302AE2D2FA8A700D756FF /* FloatingPanel.swift */,
FEEAADB62D2FEFC200DD0F91 /* KeyDownListener.swift */,
FE1A8B272B98F32F0007963E /* Assets.xcassets */,
FEEAADB62D2FEFC200DD0F91 /* KeyDownListener.swift */,
4A679F61CCD614A51463E3BA /* WebView.swift */,
FE1A8B272B98F32F0007963E /* Assets.xcassets */,
FE1A8B2C2B98F32F0007963E /* Switcheroo.entitlements */,
);
path = Switcheroo;
Expand Down Expand Up @@ -144,8 +147,9 @@
buildActionMask = 2147483647;
files = (
FE936EA52CE4971F006B2CE7 /* SettingsView.swift in Sources */,
FEEAADB72D2FEFC200DD0F91 /* KeyDownListener.swift in Sources */,
FE936EA32CE4966F006B2CE7 /* ProfilePickerView.swift in Sources */,
FEEAADB72D2FEFC200DD0F91 /* KeyDownListener.swift in Sources */,
6271D2FA89AE08A550B2AE81 /* WebView.swift in Sources */,
FE936EA32CE4966F006B2CE7 /* ProfilePickerView.swift in Sources */,
FED302AF2D2FA8A700D756FF /* FloatingPanel.swift in Sources */,
FE936EA12CE493E1006B2CE7 /* AppDelegate.swift in Sources */,
FE1A8B242B98F32E0007963E /* SwitcherooApp.swift in Sources */,
Expand Down
38 changes: 22 additions & 16 deletions Switcheroo/ProfilePickerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//

import SwiftUI
import WebKit


struct ProfilePickerView: View {
Expand All @@ -16,24 +17,29 @@ struct ProfilePickerView: View {
@State private var selectedIndex = 0

var body: some View {
VStack(spacing: 0) {
ForEach(Array(profiles.sorted(by: <).enumerated()), id: \.element.key) { index, profile in
button(with: profile, index: index)
}
}
.padding(20)
.background(.ultraThinMaterial)
.cornerRadius(30)
.background(
KeyDownListener(
selectedIndex: $selectedIndex,
profiles: profiles.sorted(by: <),
url: url,
opener: { url, identifier in
openURL(url, inWindowWithIdentifier: identifier)
HStack(spacing: 0) {
WebView(url: url)
.frame(width: 300, height: 250)

VStack(spacing: 0) {
ForEach(Array(profiles.sorted(by: <).enumerated()), id: \.element.key) { index, profile in
button(with: profile, index: index)
}
}
.padding(20)
.background(.ultraThinMaterial)
.cornerRadius(30)
.background(
KeyDownListener(
selectedIndex: $selectedIndex,
profiles: profiles.sorted(by: <),
url: url,
opener: { url, identifier in
openURL(url, inWindowWithIdentifier: identifier)
}
)
)
)
}
}

private func button(with profile: Dictionary<String, String>.Element, index: Int) -> some View {
Expand Down
20 changes: 20 additions & 0 deletions Switcheroo/WebView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import SwiftUI
import WebKit

struct WebView: NSViewRepresentable {
let url: URL

func makeNSView(context: Context) -> WKWebView {
let webView = WKWebView()
webView.customUserAgent = "SwitcherooPreview"
webView.setValue(false, forKey: "drawsBackground")
webView.load(URLRequest(url: url))
return webView
}

func updateNSView(_ nsView: WKWebView, context: Context) {
if nsView.url != url {
nsView.load(URLRequest(url: url))
}
}
}