Skip to content
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

Jump to bottom

Support multiple websites #74

Merged
merged 4 commits into from
Mar 27, 2021
Merged

Support multiple websites #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1bf4aac
Support multiple websites
sindresorhus Mar 20, 2021
59d21c1
Fix typo
sindresorhus Mar 24, 2021
a44d0ae
macOS 10.15 fixes
sindresorhus Mar 25, 2021
063fe3b
Improve row size
sindresorhus Mar 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 28 additions & 8 deletions Plash.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/* Begin PBXBuildFile section */
E30FD88923C4515200C716E9 /* SSWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E30FD88823C4515200C716E9 /* SSWebView.swift */; };
E32421342384E9D700D28A91 /* App.swift in Sources */ = {isa = PBXBuildFile; fileRef = E32421332384E9D700D28A91 /* App.swift */; };
E32421362384E9D700D28A91 /* OpenURLView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E32421352384E9D700D28A91 /* OpenURLView.swift */; };
E32421362384E9D700D28A91 /* AddWebsiteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E32421352384E9D700D28A91 /* AddWebsiteView.swift */; };
E32421382384E9D900D28A91 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E32421372384E9D900D28A91 /* Assets.xcassets */; };
E324213B2384E9D900D28A91 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E324213A2384E9D900D28A91 /* Preview Assets.xcassets */; };
E324213E2384E9D900D28A91 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E324213C2384E9D900D28A91 /* Main.storyboard */; };
Expand All @@ -19,13 +19,18 @@
E324215A2384FBE500D28A91 /* WebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E32421592384FBE500D28A91 /* WebViewController.swift */; };
E3294F7E255783A800D4172F /* Defaults in Frameworks */ = {isa = PBXBuildFile; productRef = E3294F7D255783A800D4172F /* Defaults */; };
E333EB1B2385244E005FCE44 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E333EB1A2385244E005FCE44 /* SettingsView.swift */; };
E354442626061C9100CA060F /* Migration.swift in Sources */ = {isa = PBXBuildFile; fileRef = E354442526061C9100CA060F /* Migration.swift */; };
E354442C26062D2A00CA060F /* WebsitesWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E354442B26062D2A00CA060F /* WebsitesWindowController.swift */; };
E354442F26062D6300CA060F /* WebsitesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E354442E26062D6300CA060F /* WebsitesView.swift */; };
E354443426064D8300CA060F /* AppState.swift in Sources */ = {isa = PBXBuildFile; fileRef = E354443326064D8300CA060F /* AppState.swift */; };
E354443C2607505100CA060F /* WebsitesController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E354443B2607505100CA060F /* WebsitesController.swift */; };
E3805F5B2466ED5600489E6C /* KeyboardShortcuts in Frameworks */ = {isa = PBXBuildFile; productRef = E3805F5A2466ED5600489E6C /* KeyboardShortcuts */; };
E384F28024C3B37E002FD21B /* Events.swift in Sources */ = {isa = PBXBuildFile; fileRef = E384F27F24C3B37E002FD21B /* Events.swift */; };
E384F28224C3B3CD002FD21B /* Menus.swift in Sources */ = {isa = PBXBuildFile; fileRef = E384F28124C3B3CD002FD21B /* Menus.swift */; };
E3959394247B986A0064CABE /* AppCenterCrashes in Frameworks */ = {isa = PBXBuildFile; productRef = E3959393247B986A0064CABE /* AppCenterCrashes */; };
E3C4E281251540F7007A6078 /* LaunchAtLogin in Frameworks */ = {isa = PBXBuildFile; productRef = E3C4E280251540F7007A6078 /* LaunchAtLogin */; };
E3EC5A86250D7A0C00ABE1A1 /* WelcomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3EC5A85250D7A0C00ABE1A1 /* WelcomeView.swift */; };
E3F11BEC2386824D005EFD26 /* OpenURLWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3F11BEB2386824D005EFD26 /* OpenURLWindowController.swift */; };
E3F11BEC2386824D005EFD26 /* AddWebsiteWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3F11BEB2386824D005EFD26 /* AddWebsiteWindowController.swift */; };
E3F11BEE2386828C005EFD26 /* SettingsWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3F11BED2386828C005EFD26 /* SettingsWindowController.swift */; };
E3FA21AD23C74E6B00059E43 /* InternetAccessPolicy.json in Resources */ = {isa = PBXBuildFile; fileRef = E3FA21AC23C74E6B00059E43 /* InternetAccessPolicy.json */; };
/* End PBXBuildFile section */
Expand All @@ -34,7 +39,7 @@
E30FD88823C4515200C716E9 /* SSWebView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = SSWebView.swift; sourceTree = "<group>"; usesTabs = 1; };
E32421302384E9D700D28A91 /* Plash.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Plash.app; sourceTree = BUILT_PRODUCTS_DIR; };
E32421332384E9D700D28A91 /* App.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = App.swift; sourceTree = "<group>"; usesTabs = 1; };
E32421352384E9D700D28A91 /* OpenURLView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = OpenURLView.swift; sourceTree = "<group>"; usesTabs = 1; };
E32421352384E9D700D28A91 /* AddWebsiteView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = AddWebsiteView.swift; sourceTree = "<group>"; usesTabs = 1; };
E32421372384E9D900D28A91 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
E324213A2384E9D900D28A91 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
E324213D2384E9D900D28A91 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
Expand All @@ -45,10 +50,15 @@
E32421572384F0E600D28A91 /* Utilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = Utilities.swift; sourceTree = "<group>"; usesTabs = 1; };
E32421592384FBE500D28A91 /* WebViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = WebViewController.swift; sourceTree = "<group>"; usesTabs = 1; };
E333EB1A2385244E005FCE44 /* SettingsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = SettingsView.swift; sourceTree = "<group>"; usesTabs = 1; };
E354442526061C9100CA060F /* Migration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Migration.swift; sourceTree = "<group>"; };
E354442B26062D2A00CA060F /* WebsitesWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebsitesWindowController.swift; sourceTree = "<group>"; };
E354442E26062D6300CA060F /* WebsitesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebsitesView.swift; sourceTree = "<group>"; };
E354443326064D8300CA060F /* AppState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppState.swift; sourceTree = "<group>"; };
E354443B2607505100CA060F /* WebsitesController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebsitesController.swift; sourceTree = "<group>"; };
E384F27F24C3B37E002FD21B /* Events.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Events.swift; sourceTree = "<group>"; };
E384F28124C3B3CD002FD21B /* Menus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Menus.swift; sourceTree = "<group>"; };
E3EC5A85250D7A0C00ABE1A1 /* WelcomeView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = WelcomeView.swift; sourceTree = "<group>"; usesTabs = 1; };
E3F11BEB2386824D005EFD26 /* OpenURLWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = OpenURLWindowController.swift; sourceTree = "<group>"; usesTabs = 1; };
E3F11BEB2386824D005EFD26 /* AddWebsiteWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = AddWebsiteWindowController.swift; sourceTree = "<group>"; usesTabs = 1; };
E3F11BED2386828C005EFD26 /* SettingsWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = SettingsWindowController.swift; sourceTree = "<group>"; usesTabs = 1; };
E3FA21AC23C74E6B00059E43 /* InternetAccessPolicy.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; lineEnding = 0; path = InternetAccessPolicy.json; sourceTree = "<group>"; usesTabs = 1; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -90,17 +100,22 @@
isa = PBXGroup;
children = (
E32421332384E9D700D28A91 /* App.swift */,
E354443326064D8300CA060F /* AppState.swift */,
E32421552384F09D00D28A91 /* Constants.swift */,
E384F27F24C3B37E002FD21B /* Events.swift */,
E384F28124C3B3CD002FD21B /* Menus.swift */,
E354443B2607505100CA060F /* WebsitesController.swift */,
E32421462384EB4E00D28A91 /* DesktopWindow.swift */,
E30FD88823C4515200C716E9 /* SSWebView.swift */,
E32421592384FBE500D28A91 /* WebViewController.swift */,
E3F11BEB2386824D005EFD26 /* OpenURLWindowController.swift */,
E32421352384E9D700D28A91 /* OpenURLView.swift */,
E3F11BEB2386824D005EFD26 /* AddWebsiteWindowController.swift */,
E32421352384E9D700D28A91 /* AddWebsiteView.swift */,
E354442B26062D2A00CA060F /* WebsitesWindowController.swift */,
E354442E26062D6300CA060F /* WebsitesView.swift */,
E3F11BED2386828C005EFD26 /* SettingsWindowController.swift */,
E333EB1A2385244E005FCE44 /* SettingsView.swift */,
E3EC5A85250D7A0C00ABE1A1 /* WelcomeView.swift */,
E354442526061C9100CA060F /* Migration.swift */,
E32421572384F0E600D28A91 /* Utilities.swift */,
E32421372384E9D900D28A91 /* Assets.xcassets */,
E3EF205F24C0D1A100A5F802 /* Other */,
Expand Down Expand Up @@ -255,18 +270,23 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
E32421362384E9D700D28A91 /* OpenURLView.swift in Sources */,
E32421362384E9D700D28A91 /* AddWebsiteView.swift in Sources */,
E384F28024C3B37E002FD21B /* Events.swift in Sources */,
E384F28224C3B3CD002FD21B /* Menus.swift in Sources */,
E3F11BEC2386824D005EFD26 /* OpenURLWindowController.swift in Sources */,
E3F11BEC2386824D005EFD26 /* AddWebsiteWindowController.swift in Sources */,
E324215A2384FBE500D28A91 /* WebViewController.swift in Sources */,
E32421342384E9D700D28A91 /* App.swift in Sources */,
E354443426064D8300CA060F /* AppState.swift in Sources */,
E32421472384EB4E00D28A91 /* DesktopWindow.swift in Sources */,
E32421582384F0E600D28A91 /* Utilities.swift in Sources */,
E3F11BEE2386828C005EFD26 /* SettingsWindowController.swift in Sources */,
E30FD88923C4515200C716E9 /* SSWebView.swift in Sources */,
E32421562384F09D00D28A91 /* Constants.swift in Sources */,
E354442C26062D2A00CA060F /* WebsitesWindowController.swift in Sources */,
E333EB1B2385244E005FCE44 /* SettingsView.swift in Sources */,
E354442F26062D6300CA060F /* WebsitesView.swift in Sources */,
E354443C2607505100CA060F /* WebsitesController.swift in Sources */,
E354442626061C9100CA060F /* Migration.swift in Sources */,
E3EC5A86250D7A0C00ABE1A1 /* WelcomeView.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
217 changes: 217 additions & 0 deletions Plash/AddWebsiteView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,217 @@
import SwiftUI
import Defaults

// TODO: Would be nice to preview the website while adding it. Then the user could try out the various settings.

struct AddWebsiteView: View {
@Environment(\.presentationMode) private var presentationMode
@State private var urlString = ""
@State private var invertColors = false
@State private var css = ""

private var normalizedUrlString: String {
URL(humanString: urlString)?.absoluteString ?? urlString
}

private var firstLaunchView: some View {
HStack {
HStack(spacing: 3) {
Text("You could, for example,")
Button("show the time.") {
urlString = "https://time.pablopunk.com/?seconds&fg=white&bg=transparent"
}
.buttonStyle(LinkButtonStyle())
}
Spacer()
Button("More ideas") {
"https://github.com/sindresorhus/Plash/issues/1".openUrl()
}
.buttonStyle(LinkButtonStyle())
}
.box()
}

private let isEditing: Bool
private let showsCancelButtons: Bool
private let website: Website?
private let completionHandler: () -> Void

init(
isEditing: Bool,
showsCancelButtons: Bool,
website: Website?,
completionHandler: @escaping () -> Void
) {
self.isEditing = isEditing
self.showsCancelButtons = showsCancelButtons
self.website = website
self.completionHandler = completionHandler

if
isEditing,
let website = website
{
self._urlString = .init(wrappedValue: website.url.absoluteString.removingPercentEncoding ?? website.url.absoluteString)
self._invertColors = .init(wrappedValue: website.invertColors)
self._css = .init(wrappedValue: website.css)
}
}

var body: some View {
VStack(alignment: .leading) {
if SSApp.isFirstLaunch {
firstLaunchView
}
VStack(alignment: .leading) {
HStack {
TextField(
"sindresorhus.com",
// `removingNewlines` is a workaround for a SwiftUI bug where it doesn't respect the line limit when pasting in multiple lines.
// TODO: Report to Apple. Still an issue on macOS 12.
text: $urlString.setMap(\.removingNewlines)
)
.lineLimit(1)
.padding(.vertical)
Button("Local Website…") {
chooseLocalWebsite {
guard let url = $0 else {
return
}

urlString = url.absoluteString
}
}
}
Divider()
.padding(.vertical)
// TODO: When targeting macOS 11, put all of this in a unexpanded `DisclosureGroup`.
Toggle(
"Invert website colors",
isOn: $invertColors
)
.help2("This creates a fake dark mode.")
VStack(alignment: .leading) {
Text("Custom CSS:")
ScrollableTextView(
text: $css,
font: .monospacedSystemFont(ofSize: 11, weight: .regular)
)
.frame(height: 50)
}
.padding(.top, 10)
}
.padding()
// TODO: Use `.toolbar()` when targeting macOS 11.
// TODO: Use `Button` when targeting macOS 11.
VStack {
Divider()
HStack {
if showsCancelButtons {
NativeButton("Cancel", keyEquivalent: .escape) {
presentationMode.wrappedValue.dismiss()
}
}
Spacer()
NativeButton(isEditing ? "Save" : "Add", keyEquivalent: .return) {
defaultAction()
}
.disabled(!URL.isValid(string: normalizedUrlString))
}
.padding()
.offset(y: -9) // TODO: No idea why this is needed.
}
}
.frame(width: 500)
}

private func defaultAction() {
guard let url = URL(string: normalizedUrlString) else {
return
}

// TODO: Find a way to DRY up this logic.
if isEditing {
if let website = website {
let newWebsite = Website(
id: website.id,
isCurrent: website.isCurrent,
url: url,
invertColors: invertColors,
css: css
)

WebsitesController.shared.all = WebsitesController.shared.all.replacingAll(website, with: newWebsite)
} else {
assertionFailure()
}
} else {
let newWebsite = Website(
id: UUID(),
isCurrent: true,
url: url,
invertColors: invertColors,
css: css
)

WebsitesController.shared.add(newWebsite)
}

presentationMode.wrappedValue.dismiss()
completionHandler()
}

private func chooseLocalWebsite(_ completionHandler: @escaping (URL?) -> Void) {
let panel = NSOpenPanel()
panel.canChooseFiles = false
panel.canChooseDirectories = true
panel.canCreateDirectories = false
panel.title = "Choose Local Website"
panel.message = "Choose a directory with a “index.html” file."
panel.prompt = "Choose"

// Ensure it's above the window when in "Browsing Mode".
panel.level = .modalPanel

if
isEditing,
let url = website?.url,
url.isFileURL
{
panel.directoryURL = url
}

// TODO: Make it a sheet instead.
panel.begin {
guard
$0 == .OK,
let url = panel.url
else {
completionHandler(nil)
return
}

guard url.appendingPathComponent("index.html", isDirectory: false).exists else {
NSAlert.showModal(title: "Please choose a directory that contains a “index.html” file.")
chooseLocalWebsite(completionHandler)
return
}

do {
try SecurityScopedBookmarkManager.saveBookmark(for: url)
} catch {
// TODO: Show the error in SwiftUI.
NSApp.presentError(error)
completionHandler(nil)
return
}

completionHandler(url)
}
}
}

struct AddWebsiteView_Previews: PreviewProvider {
static var previews: some View {
AddWebsiteView(isEditing: false, showsCancelButtons: false, website: nil) {}
}
}
7 changes: 3 additions & 4 deletions Plash/OpenURLWindowController.swift → Plash/AddWebsiteWindowController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
import SwiftUI
import Defaults

final class OpenURLWindowController: SingletonWindowController {
final class AddWebsiteWindowController: SingletonWindowController {
private convenience init() {
let window = SwiftUIWindowForMenuBarApp()
self.init(window: window)

let view = OpenURLView { url in
let view = AddWebsiteView(isEditing: false, showsCancelButtons: false, website: nil) {
window.close()
Defaults[.url] = url
}

window.title = "Open URL"
window.title = "Add Website"
window.shouldCloseOnEscapePress = true
window.styleMask = [
.titled,
Expand Down