Skip to content

armgit / peel

Public Imported from GitHub
0

Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.

Draw the Terminal and Tweaks pages from their state at once

Țugui Dragoș67f128d988ed
diff --git a/Peel/Model/TerminalLibrary.swift b/Peel/Model/TerminalLibrary.swift
index 12486f73..d421334a 100644
--- a/Peel/Model/TerminalLibrary.swift
+++ b/Peel/Model/TerminalLibrary.swift
@@ -26,12 +26,14 @@ final class TerminalLibrary {
private(set) var shellSessions: ShellSessions?
private(set) var options: Set<TerminalOption>?
private(set) var isManaged = false
+ private(set) var showsWindowSwitch = false
private(set) var wasRefused = false
var waitingForTerminal: Action?
var terminalDidNotQuit = false
init() {
ledger = TerminalThemeLedger(stored: UserDefaults.standard.dictionary(forKey: Self.ledgerKey) ?? [:])
+ refresh()
}
func refresh() {
@@ -43,6 +45,7 @@ final class TerminalLibrary {
shellSessions = ShellSessions.inTerminal(settings)
options = ledger.options(in: settings)
isManaged = settings.isManaged
+ showsWindowSwitch = TerminalWindows.switchMatters()
}
func perform(_ action: Action) {
diff --git a/Peel/Model/TweakLibrary.swift b/Peel/Model/TweakLibrary.swift
index 75684081..271b63a5 100644
--- a/Peel/Model/TweakLibrary.swift
+++ b/Peel/Model/TweakLibrary.swift
@@ -38,6 +38,7 @@ final class TweakLibrary {
let isThisSession = UserDefaults.standard.integer(forKey: Self.sessionKey) == Self.loginSession
waitingForLogOut = isThisSession ? Set(UserDefaults.standard.stringArray(forKey: Self.waitingKey) ?? []) : []
ledger.adoptStoredValuesAsWritten(in: store)
+ refresh()
}
func isWaitingForLogOut(_ group: Tweak.Group) -> Bool {
diff --git a/Peel/Views/Terminal/TerminalPage.swift b/Peel/Views/Terminal/TerminalPage.swift
index 344e9c35..bdda301f 100644
--- a/Peel/Views/Terminal/TerminalPage.swift
+++ b/Peel/Views/Terminal/TerminalPage.swift
@@ -10,7 +10,6 @@ struct TerminalPage: View {
@Environment(GitLibrary.self) private var git
@Environment(SSHLibrary.self) private var ssh
@Environment(TerminalToolLibrary.self) private var tools
- @State private var showsWindowSwitch = false
static let tabTitles: [LocalizedStringResource] = ["Themes", "Terminal", "Shell", "Git", "SSH", "Tools"]
static let tabBarWidth = TabBar.width(of: tabTitles.map { String(localized: $0) })
@@ -29,7 +28,7 @@ struct TerminalPage: View {
.formStyle(.grouped)
}
Tab("Terminal", systemImage: "apple.terminal") {
- TerminalSettingsForm(showsWindowSwitch: showsWindowSwitch)
+ TerminalSettingsForm()
}
Tab("Shell", systemImage: "chevron.left.forwardslash.chevron.right") {
ShellTab()
@@ -59,13 +58,13 @@ struct TerminalPage: View {
}
.onReceive(
NSWorkspace.shared.notificationCenter.publisher(for: NSWorkspace.didLaunchApplicationNotification)
- ) { _ in
- terminal.refresh()
+ ) { notification in
+ if Self.isTerminal(notification) { terminal.refresh() }
}
.onReceive(
NSWorkspace.shared.notificationCenter.publisher(for: NSWorkspace.didTerminateApplicationNotification)
- ) { _ in
- terminal.refresh()
+ ) { notification in
+ if Self.isTerminal(notification) { terminal.refresh() }
}
.alert("Quit Terminal first?", isPresented: isWaitingForTerminal, presenting: terminal.waitingForTerminal) { action in
Button("Quit Terminal") {
@@ -85,7 +84,6 @@ struct TerminalPage: View {
private func refresh() async {
terminal.refresh()
tweaks.refresh()
- showsWindowSwitch = TerminalWindows.switchMatters()
async let shellRead: Void = shell.refresh()
async let gitRead: Void = git.refresh()
async let sshRead: Void = ssh.refresh()
@@ -93,6 +91,11 @@ struct TerminalPage: View {
_ = await (shellRead, gitRead, sshRead, toolsRead)
}
+ private static func isTerminal(_ notification: Notification) -> Bool {
+ let app = notification.userInfo?[NSWorkspace.applicationUserInfoKey] as? NSRunningApplication
+ return app?.bundleIdentifier == TerminalSettings.identifier
+ }
+
private var isWaitingForTerminal: Binding<Bool> {
Binding(
get: { terminal.waitingForTerminal != nil },
@@ -195,7 +198,6 @@ private struct TerminalThemeGrid: View {
private struct TerminalSettingsForm: View {
@Environment(TerminalLibrary.self) private var terminal
- let showsWindowSwitch: Bool
var body: some View {
Form {
@@ -207,7 +209,7 @@ private struct TerminalSettingsForm: View {
if let sessions = terminal.shellSessions {
ShellSessionsRow(sessions: sessions)
}
- if showsWindowSwitch {
+ if terminal.showsWindowSwitch {
TweakRow(tweak: TweakCatalog.terminalWindows)
}
}