pawelorzech/MacTorn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add preferred browser support for links

Browse source
This commit is contained in:
Paweł Orzech 2026-02-04 12:52:12 +01:00
parent 3e214a0b19
commit 0b5b156182
13 changed files with 98 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
MacTorn/MacTorn/Utilities/BrowserManager.swift Normal file
View file

@ -0,0 +1,62 @@
import AppKit
enum PreferredBrowser: String, CaseIterable, Identifiable {
case system = "System Default"
case safari = "Safari"
case chrome = "Google Chrome"
case firefox = "Firefox"
case edge = "Microsoft Edge"
case brave = "Brave"
var id: String { rawValue }
var bundleIdentifier: String? {
switch self {
case .system:
return nil
case .safari:
return "com.apple.Safari"
case .chrome:
return "com.google.Chrome"
case .firefox:
return "org.mozilla.firefox"
case .edge:
return "com.microsoft.edgemac"
case .brave:
return "com.brave.Browser"
}
}
init(storedValue: String?) {
guard let storedValue,
let value = PreferredBrowser(rawValue: storedValue) else {
self = .system
return
}
self = value
}
}
final class BrowserManager {
static let shared = BrowserManager()
private init() {}
func open(_ url: URL) {
guard let scheme = url.scheme,
["http", "https"].contains(scheme) else {
NSWorkspace.shared.open(url)
return
}
let preference = PreferredBrowser(storedValue: UserDefaults.standard.string(forKey: "preferredBrowser"))
guard let bundleIdentifier = preference.bundleIdentifier,
let appURL = NSWorkspace.shared.urlForApplication(withBundleIdentifier: bundleIdentifier) else {
NSWorkspace.shared.open(url)
return
}
let configuration = NSWorkspace.OpenConfiguration()
NSWorkspace.shared.open([url], withApplicationAt: appURL, configuration: configuration, completionHandler: nil)
}
}

2
MacTorn/MacTorn/Utilities/NotificationManager.swift
View file

@ -127,7 +127,7 @@ class NotificationManager: NSObject, UNUserNotificationCenterDelegate {
) {
let categoryIdentifier = response.notification.request.content.categoryIdentifier
if let type = NotificationType(rawValue: categoryIdentifier) {
NSWorkspace.shared.open(type.url)
BrowserManager.shared.open(type.url)
}
completionHandler()
}

2
MacTorn/MacTorn/Utilities/ShortcutsManager.swift
View file

@ -41,6 +41,6 @@ class ShortcutsManager: ObservableObject {
func openURL(_ urlString: String) {
guard let url = URL(string: urlString) else { return }
NSWorkspace.shared.open(url)
BrowserManager.shared.open(url)
}
}

4
MacTorn/MacTorn/ViewModels/AppState.swift
View file

@ -770,7 +770,7 @@ class AppState: ObservableObject {
showFeedbackPrompt = false
saveFeedbackState()
if let url = URL(string: "https://www.torn.com/forums.php#/p=threads&f=67&t=16532308") {
NSWorkspace.shared.open(url)
BrowserManager.shared.open(url)
}
}
@ -779,7 +779,7 @@ class AppState: ObservableObject {
showFeedbackPrompt = false
saveFeedbackState()
if let url = URL(string: "mailto:pawel@orzech.lol?subject=MacTorn%20Feedback") {
NSWorkspace.shared.open(url)
BrowserManager.shared.open(url)
}
}

4
MacTorn/MacTorn/Views/AttacksView.swift
View file

@ -58,7 +58,7 @@ struct AttacksView: View {
Button {
if let opponentId = attack.opponentId(forUserId: userId),
let url = URL(string: "https://www.torn.com/profiles.php?XID=\(opponentId)") {
NSWorkspace.shared.open(url)
BrowserManager.shared.open(url)
}
} label: {
HStack(spacing: 6) {
@ -128,7 +128,7 @@ struct AttacksView: View {
private func openURL(_ urlString: String) {
if let url = URL(string: urlString) {
NSWorkspace.shared.open(url)
BrowserManager.shared.open(url)
}
}
}

6
MacTorn/MacTorn/Views/CreditsView.swift
View file

@ -238,21 +238,21 @@ struct CreditsView: View {
private func openTornProfile(_ tornID: Int) {
let urlString = "https://www.torn.com/profiles.php?XID=\(tornID)"
if let url = URL(string: urlString) {
NSWorkspace.shared.open(url)
BrowserManager.shared.open(url)
}
}
private func openFaction(_ factionID: Int) {
let urlString = "https://www.torn.com/factions.php?step=profile&ID=\(factionID)"
if let url = URL(string: urlString) {
NSWorkspace.shared.open(url)
BrowserManager.shared.open(url)
}
}
private func openCompany(_ ownerID: Int) {
let urlString = "https://www.torn.com/joblist.php#/p=corpinfo&userID=\(ownerID)"
if let url = URL(string: urlString) {
NSWorkspace.shared.open(url)
BrowserManager.shared.open(url)
}
}
}

2
MacTorn/MacTorn/Views/FactionView.swift
View file

@ -132,7 +132,7 @@ struct FactionView: View {
private func openURL(_ urlString: String) {
if let url = URL(string: urlString) {
NSWorkspace.shared.open(url)
BrowserManager.shared.open(url)
}
}
}

2
MacTorn/MacTorn/Views/MoneyView.swift
View file

@ -106,7 +106,7 @@ struct MoneyView: View {
private func openURL(_ urlString: String) {
if let url = URL(string: urlString) {
NSWorkspace.shared.open(url)
BrowserManager.shared.open(url)
}
}
}

2
MacTorn/MacTorn/Views/PropertiesView.swift
View file

@ -52,7 +52,7 @@ struct PropertiesView: View {
private func openURL(_ urlString: String) {
if let url = URL(string: urlString) {
NSWorkspace.shared.open(url)
BrowserManager.shared.open(url)
}
}
}

19
MacTorn/MacTorn/Views/SettingsView.swift
View file

@ -4,6 +4,7 @@ struct SettingsView: View {
@EnvironmentObject var appState: AppState
@AppStorage("appearanceMode") private var appearanceMode: String = AppearanceMode.system.rawValue
@AppStorage("reduceTransparency") private var reduceTransparency: Bool = false
@AppStorage("preferredBrowser") private var preferredBrowser: String = PreferredBrowser.system.rawValue
@State private var inputKey: String = ""
@State private var showCredits: Bool = false
@ -106,6 +107,20 @@ struct SettingsView: View {
.labelsHidden()
}
// Preferred Browser
HStack {
Image(systemName: "globe")
.foregroundColor(.secondary)
.frame(width: 20)
Picker("Preferred Browser", selection: $preferredBrowser) {
ForEach(PreferredBrowser.allCases) { browser in
Text(browser.rawValue).tag(browser.rawValue)
}
}
.pickerStyle(.menu)
}
// Reduce Transparency (Accessibility)
HStack {
Image(systemName: "eye")
@ -164,7 +179,7 @@ struct SettingsView: View {
Button("Download Update") {
if let url = URL(string: update.htmlUrl) {
NSWorkspace.shared.open(url)
BrowserManager.shared.open(url)
}
}
.buttonStyle(.borderedProminent)
@ -268,7 +283,7 @@ struct SettingsView: View {
private func openTornProfile() {
let url = "https://www.torn.com/profiles.php?XID=\(developerID)"
if let url = URL(string: url) {
NSWorkspace.shared.open(url)
BrowserManager.shared.open(url)
}
}
}

2
MacTorn/MacTorn/Views/StatusView.swift
View file

@ -99,7 +99,7 @@ struct StatusView: View {
private var messagesBadge: some View {
Button {
if let url = URL(string: "https://www.torn.com/messages.php") {
NSWorkspace.shared.open(url)
BrowserManager.shared.open(url)
}
} label: {
HStack {

10
MacTorn/MacTorn/Views/TravelView.swift
View file

@ -149,7 +149,7 @@ struct TravelView: View {
Button {
if let url = URL(string: "https://www.torn.com/travelagency.php") {
NSWorkspace.shared.open(url)
BrowserManager.shared.open(url)
}
} label: {
HStack {
@ -204,7 +204,7 @@ struct TravelView: View {
// Show only return button when abroad
Button {
if let url = URL(string: "https://www.torn.com/travelagency.php") {
NSWorkspace.shared.open(url)
BrowserManager.shared.open(url)
}
} label: {
HStack {
@ -234,7 +234,7 @@ struct TravelView: View {
private func destinationButton(_ destination: TornDestination) -> some View {
Button {
NSWorkspace.shared.open(destination.travelAgencyURL)
BrowserManager.shared.open(destination.travelAgencyURL)
} label: {
VStack(spacing: 4) {
HStack(spacing: 4) {
@ -304,7 +304,7 @@ struct TravelView: View {
HStack(spacing: 8) {
Button {
if let url = URL(string: "https://www.torn.com/travelagency.php") {
NSWorkspace.shared.open(url)
BrowserManager.shared.open(url)
}
} label: {
HStack {
@ -321,7 +321,7 @@ struct TravelView: View {
Button {
if let url = URL(string: "https://www.torn.com/page.php?sid=ItemMarket") {
NSWorkspace.shared.open(url)
BrowserManager.shared.open(url)
}
} label: {
HStack {

2
MacTorn/MacTorn/Views/WatchlistView.swift
View file

@ -126,7 +126,7 @@ struct WatchlistView: View {
private func openURL(_ urlString: String) {
if let url = URL(string: urlString) {
NSWorkspace.shared.open(url)
BrowserManager.shared.open(url)
}
}
}