Phase 9: Einrichtung, Autostart, Notarisierung — und die Mixer-Optik
Die Einrichtung beim ersten Start erklärt jede der vier Sachen einzeln und fragt jede einzeln an. Vier Systemdialoge hintereinander wären der übliche Weg und der falsche: wer nicht weiß wofür, klickt viermal „Nicht erlauben", und danach fragt macOS nie wieder. Sie kommt beim ersten Start immer, auch wenn zufällig schon alles erlaubt ist — sie erklärt auch den Helfer und den Autostart. Beim Autostart ist `requiresApproval` der Zustand, der weh tut. Wer das Anmeldeobjekt in den Systemeinstellungen abgeschaltet hat, kann in Onyx auf den Schalter drücken, so oft er will. Als „aus" angezeigt führt das in eine Schleife, also steht dort jetzt, wo es weitergeht. Der Mixer verliert den Schalter je Programm. Zehn Mini-Schalter untereinander sind das, was den Eindruck macht; am Regler zu ziehen ist ohnehin die Entscheidung, dieses Programm zu regeln, und der große Ausschalter stellt alles zurück. Der Regler ist selbst gezeichnet — der Systemregler bringt sein eigenes Erscheinungsbild mit und kann nicht zeigen, worauf es hier ankommt: den Pegel und die Grenze bei 100 %. Der Pegel wird im selben Durchlauf gemessen, in dem verstärkt wird, und über `Atomic` weitergereicht. Eine gewöhnliche Eigenschaft wäre ein Wettlauf, eine Sperre im Audiothread der klassische Weg zu Aussetzern. Dabei fällt das `Date()` aus dem Echtzeitpfad, das dort nie hingehört hat. Zwei Funde beim Bauen des Release-Wegs, beide hätten erst nach dem Hochladen zur Ablehnung geführt: der Helfer wurde ohne sicheren Zeitstempel signiert, und das Adapter-Framework ad-hoc. Beides gilt jetzt nur noch im Debug. Scripts/release.sh prüft Zertifikat und Notarisierungsprofil vorweg, statt nach zehn Minuten Bauen zu scheitern. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Scarriffle
55
Onyx/LaunchAtLogin.swift
Normal file
55
Onyx/LaunchAtLogin.swift
Normal file
@@ -0,0 +1,55 @@
|
||||
import Foundation
|
||||
import ServiceManagement
|
||||
import Observation
|
||||
import OnyxCore
|
||||
import OSLog
|
||||
|
||||
private let log = Logger(subsystem: "com.scarriffleservices.onyx", category: "Login")
|
||||
|
||||
/// Ob Onyx beim Anmelden mitstartet.
|
||||
///
|
||||
/// Über `SMAppService.mainApp` und nicht über den alten Weg mit einem
|
||||
/// versteckten Helferprogramm: macOS trägt die App dann selbst in die
|
||||
/// Systemeinstellungen ein, und der Nutzer sieht dort einen Eintrag, den er
|
||||
/// versteht. Der Preis ist, dass er ihn dort auch abschalten kann — und dann
|
||||
/// hilft kein `register()` mehr, sondern nur der Weg zurück dorthin.
|
||||
@MainActor
|
||||
@Observable
|
||||
final class LaunchAtLogin {
|
||||
|
||||
private(set) var state: LoginItemState = .notRegistered
|
||||
|
||||
init() {
|
||||
refresh()
|
||||
}
|
||||
|
||||
func refresh() {
|
||||
state = LoginItemState(statusRawValue: SMAppService.mainApp.status.rawValue)
|
||||
}
|
||||
|
||||
var isEnabled: Bool { state.isEnabled }
|
||||
var needsSystemSettings: Bool { state.needsSystemSettings }
|
||||
|
||||
/// - Returns: ob es geklappt hat. Bei `false` steht der Grund in `state`.
|
||||
@discardableResult
|
||||
func set(_ enabled: Bool) -> Bool {
|
||||
do {
|
||||
if enabled {
|
||||
try SMAppService.mainApp.register()
|
||||
} else {
|
||||
try SMAppService.mainApp.unregister()
|
||||
}
|
||||
refresh()
|
||||
log.notice("Anmeldeobjekt \(enabled ? "eingetragen" : "entfernt", privacy: .public), Zustand \(String(describing: self.state), privacy: .public)")
|
||||
return isEnabled == enabled
|
||||
} catch {
|
||||
log.error("Anmeldeobjekt: \(error.localizedDescription, privacy: .public)")
|
||||
refresh()
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
func openSystemSettings() {
|
||||
SMAppService.openSystemSettingsLoginItems()
|
||||
}
|
||||
}
|
||||
@@ -532,6 +532,230 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"onboarding.allow": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Erlauben"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Allow"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"onboarding.audio": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Systemton"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "System audio"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"onboarding.audio.why": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Nötig für die Lautstärke einzelner Programme. Onyx leitet den Ton der geregelten Programme um — und nur deren."
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Needed for per-app volume. Onyx routes the audio of the apps you control, and only those."
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"onboarding.calendar": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Kalender"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Calendar"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"onboarding.calendar.why": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Zeigt deine Termine im Panel. Nur lesend — Onyx ändert nie einen Kalender."
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Shows your appointments in the panel. Read-only — Onyx never changes a calendar."
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"onboarding.done": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Fertig"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Done"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"onboarding.helper": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Lüftersteuerung"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Fan control"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"onboarding.helper.why": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Installiert einen kleinen privilegierten Dienst. Er setzt nur Lüfterdrehzahlen und fällt auf Automatik zurück, wenn Onyx schweigt."
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Installs a small privileged service. It only sets fan speeds and falls back to automatic if Onyx goes silent."
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"onboarding.launchAtLogin": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Onyx beim Anmelden starten"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Start Onyx at login"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"onboarding.location": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Standort"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Location"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"onboarding.location.why": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Wetter für deinen Aufenthaltsort. Alternativ lässt sich je Widget ein fester Ort einstellen."
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Weather for where you are. You can also set a fixed place per widget instead."
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"onboarding.openSettings": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Systemeinstellungen öffnen"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Open System Settings"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"onboarding.subtitle": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Onyx braucht vier Dinge vom System. Jedes für etwas anderes, und keines davon ist Pflicht — erlaube, was du nutzen möchtest."
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Onyx needs four things from the system. Each one is for something different, and none of them is required — grant what you want to use."
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"onboarding.title": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Willkommen bei Onyx"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Welcome to Onyx"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"settings.display.all": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
@@ -663,6 +887,54 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"settings.general": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Allgemein"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "General"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"settings.launchAtLogin": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Beim Anmelden starten"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Start at login"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"settings.launchAtLogin.blocked": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Anmeldeobjekte wurden für Onyx in den Systemeinstellungen abgeschaltet."
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Login items were turned off for Onyx in System Settings."
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"settings.menubar.bars": {
|
||||
"extractionState": "stale",
|
||||
"localizations": {
|
||||
@@ -764,6 +1036,22 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"settings.onboarding.show": {
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Einrichtung erneut zeigen"
|
||||
}
|
||||
},
|
||||
"en": {
|
||||
"stringUnit": {
|
||||
"state": "translated",
|
||||
"value": "Show setup again"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"settings.permissions.calendar": {
|
||||
"extractionState": "stale",
|
||||
"localizations": {
|
||||
@@ -899,7 +1187,12 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"settings.shelf.count %@": {
|
||||
"comment": "A label showing the number of items in the shelf. The argument is the number of items in the shelf.",
|
||||
"isCommentAutoGenerated": true
|
||||
},
|
||||
"settings.shelf.count %lld": {
|
||||
"extractionState": "stale",
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
@@ -915,7 +1208,12 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"settings.shelf.days %@": {
|
||||
"comment": "A label that lets the user select how many days to wait before automatically removing items from the shelf. The argument is the number of days.",
|
||||
"isCommentAutoGenerated": true
|
||||
},
|
||||
"settings.shelf.days %lld": {
|
||||
"extractionState": "stale",
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
@@ -948,6 +1246,7 @@
|
||||
}
|
||||
},
|
||||
"settings.shelf.reveal": {
|
||||
"extractionState": "stale",
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
@@ -964,6 +1263,7 @@
|
||||
}
|
||||
},
|
||||
"settings.shelf.title": {
|
||||
"extractionState": "stale",
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
@@ -1116,6 +1416,7 @@
|
||||
}
|
||||
},
|
||||
"settings.tab.sources": {
|
||||
"extractionState": "stale",
|
||||
"localizations": {
|
||||
"de": {
|
||||
"stringUnit": {
|
||||
|
||||
206
Onyx/OnboardingView.swift
Normal file
206
Onyx/OnboardingView.swift
Normal file
@@ -0,0 +1,206 @@
|
||||
import SwiftUI
|
||||
import AppKit
|
||||
import CalendarProvider
|
||||
import WeatherProvider
|
||||
import AudioProvider
|
||||
|
||||
/// Der erste Start.
|
||||
///
|
||||
/// Onyx braucht vier Dinge vom System, und jedes für etwas anderes. Sie alle
|
||||
/// beim Start hintereinander abzufragen wäre der übliche Weg und der falsche:
|
||||
/// wer vier Dialoge sieht, ohne zu wissen wofür, klickt viermal „Nicht
|
||||
/// erlauben" — und macOS fragt danach nie wieder. Deshalb steht hier zu jedem
|
||||
/// Punkt, wofür er gut ist, und jeder wird einzeln und auf Klick angefragt.
|
||||
///
|
||||
/// Nichts davon ist Pflicht. Ohne Kalenderzugriff fehlt ein Widget, nicht die
|
||||
/// App.
|
||||
struct OnboardingView: View {
|
||||
|
||||
let calendarModel: CalendarModel
|
||||
let weatherModel: WeatherModel
|
||||
let mixer: AudioMixer
|
||||
let fanControl: FanControl
|
||||
let launchAtLogin: LaunchAtLogin
|
||||
let onFinish: () -> Void
|
||||
|
||||
@State private var calendarGranted = false
|
||||
|
||||
var body: some View {
|
||||
VStack(alignment: .leading, spacing: 0) {
|
||||
header
|
||||
|
||||
Divider()
|
||||
|
||||
ScrollView {
|
||||
VStack(alignment: .leading, spacing: 0) {
|
||||
OnboardingRow(
|
||||
symbol: "calendar",
|
||||
title: "onboarding.calendar",
|
||||
detail: "onboarding.calendar.why",
|
||||
state: calendarState) {
|
||||
calendarGranted = await calendarModel.requestAccessNow()
|
||||
} openSettings: {
|
||||
open("Privacy_Calendars")
|
||||
}
|
||||
|
||||
OnboardingRow(
|
||||
symbol: "location",
|
||||
title: "onboarding.location",
|
||||
detail: "onboarding.location.why",
|
||||
state: locationState) {
|
||||
weatherModel.requestLocationAuthorization()
|
||||
} openSettings: {
|
||||
open("Privacy_LocationServices")
|
||||
}
|
||||
|
||||
OnboardingRow(
|
||||
symbol: "slider.horizontal.3",
|
||||
title: "onboarding.audio",
|
||||
detail: "onboarding.audio.why",
|
||||
state: mixer.isEnabled ? .granted : .undetermined) {
|
||||
mixer.enable()
|
||||
} openSettings: {
|
||||
open("Privacy_Microphone")
|
||||
}
|
||||
|
||||
OnboardingRow(
|
||||
symbol: "fan",
|
||||
title: "onboarding.helper",
|
||||
detail: "onboarding.helper.why",
|
||||
state: helperState) {
|
||||
fanControl.install()
|
||||
} openSettings: {
|
||||
fanControl.openApprovalSettings()
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, 22)
|
||||
.padding(.vertical, 6)
|
||||
}
|
||||
|
||||
Divider()
|
||||
footer
|
||||
}
|
||||
.frame(width: 520, height: 520)
|
||||
.task {
|
||||
calendarGranted = calendarModel.hasAccess
|
||||
fanControl.refreshInstallState()
|
||||
launchAtLogin.refresh()
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Kopf und Fuß
|
||||
|
||||
private var header: some View {
|
||||
HStack(spacing: 14) {
|
||||
Image(nsImage: NSApp.applicationIconImage)
|
||||
.resizable().frame(width: 52, height: 52)
|
||||
VStack(alignment: .leading, spacing: 3) {
|
||||
Text("onboarding.title").font(.title2).fontWeight(.semibold)
|
||||
Text("onboarding.subtitle")
|
||||
.font(.callout).foregroundStyle(.secondary)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
}
|
||||
Spacer(minLength: 0)
|
||||
}
|
||||
.padding(22)
|
||||
}
|
||||
|
||||
private var footer: some View {
|
||||
HStack {
|
||||
Toggle(isOn: Binding(
|
||||
get: { launchAtLogin.isEnabled },
|
||||
set: { _ = launchAtLogin.set($0) })) {
|
||||
Text("onboarding.launchAtLogin")
|
||||
}
|
||||
.toggleStyle(.checkbox)
|
||||
.disabled(launchAtLogin.needsSystemSettings)
|
||||
|
||||
if launchAtLogin.needsSystemSettings {
|
||||
Button("onboarding.openSettings") { launchAtLogin.openSystemSettings() }
|
||||
.buttonStyle(.link)
|
||||
}
|
||||
|
||||
Spacer()
|
||||
Button("onboarding.done", action: onFinish)
|
||||
.keyboardShortcut(.defaultAction)
|
||||
}
|
||||
.padding(22)
|
||||
}
|
||||
|
||||
// MARK: - Zustände
|
||||
|
||||
private var calendarState: OnboardingRow.State {
|
||||
if calendarGranted { return .granted }
|
||||
return calendarModel.authorization == .denied ? .denied : .undetermined
|
||||
}
|
||||
|
||||
private var locationState: OnboardingRow.State {
|
||||
switch weatherModel.locationAuthorization {
|
||||
case .granted: .granted
|
||||
case .denied: .denied
|
||||
case .undetermined: .undetermined
|
||||
}
|
||||
}
|
||||
|
||||
private var helperState: OnboardingRow.State {
|
||||
switch fanControl.installState {
|
||||
case .installed: .granted
|
||||
// Nicht `.denied`: hier hilft tatsächlich der Gang in die
|
||||
// Systemeinstellungen, und der Knopf soll das auch sagen.
|
||||
case .requiresApproval: .denied
|
||||
case .notInstalled, .failed: .undetermined
|
||||
}
|
||||
}
|
||||
|
||||
private func open(_ pane: String) {
|
||||
guard let url = URL(
|
||||
string: "x-apple.systempreferences:com.apple.preference.security?\(pane)")
|
||||
else { return }
|
||||
NSWorkspace.shared.open(url)
|
||||
}
|
||||
}
|
||||
|
||||
/// Ein Punkt im Onboarding: wofür, wie es steht, und was von hier weiterführt.
|
||||
private struct OnboardingRow: View {
|
||||
enum State { case granted, denied, undetermined }
|
||||
|
||||
let symbol: String
|
||||
let title: LocalizedStringKey
|
||||
let detail: LocalizedStringKey
|
||||
let state: State
|
||||
let request: () async -> Void
|
||||
let openSettings: () -> Void
|
||||
|
||||
var body: some View {
|
||||
HStack(alignment: .top, spacing: 14) {
|
||||
Image(systemName: symbol)
|
||||
.font(.system(size: 15))
|
||||
.foregroundStyle(state == .granted ? .green : .secondary)
|
||||
.frame(width: 22, height: 22)
|
||||
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text(title).fontWeight(.medium)
|
||||
Text(detail)
|
||||
.font(.callout).foregroundStyle(.secondary)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
}
|
||||
|
||||
Spacer(minLength: 8)
|
||||
|
||||
switch state {
|
||||
case .granted:
|
||||
Image(systemName: "checkmark.circle.fill")
|
||||
.foregroundStyle(.green)
|
||||
.font(.system(size: 16))
|
||||
case .undetermined:
|
||||
Button("onboarding.allow") { Task { await request() } }
|
||||
case .denied:
|
||||
// Nach einer Ablehnung fragt macOS nie wieder — ein
|
||||
// Erlauben-Knopf wäre hier eine Lüge.
|
||||
Button("onboarding.openSettings", action: openSettings)
|
||||
}
|
||||
}
|
||||
.padding(.vertical, 12)
|
||||
.overlay(alignment: .bottom) { Divider() }
|
||||
}
|
||||
}
|
||||
77
Onyx/OnboardingWindowController.swift
Normal file
77
Onyx/OnboardingWindowController.swift
Normal file
@@ -0,0 +1,77 @@
|
||||
import AppKit
|
||||
import SwiftUI
|
||||
import CalendarProvider
|
||||
import WeatherProvider
|
||||
import AudioProvider
|
||||
|
||||
/// Zeigt das Onboarding — einmal, beim ersten Start.
|
||||
///
|
||||
/// Als eigenes Fenster und nicht im Panel: TCC blendet Berechtigungsdialoge
|
||||
/// stillschweigend aus, wenn keine App im Vordergrund steht, und eine
|
||||
/// `.accessory`-App mit ausgefahrenem Panel steht nicht im Vordergrund. Genau
|
||||
/// daran ist die Kalenderberechtigung schon einmal gescheitert.
|
||||
@MainActor
|
||||
final class OnboardingWindowController: NSObject, NSWindowDelegate {
|
||||
|
||||
private static let doneKey = "onboarding.completed"
|
||||
|
||||
private var window: NSWindow?
|
||||
private let defaults: UserDefaults
|
||||
|
||||
init(defaults: UserDefaults = .standard) {
|
||||
self.defaults = defaults
|
||||
}
|
||||
|
||||
var isDone: Bool { defaults.bool(forKey: Self.doneKey) }
|
||||
|
||||
func showIfNeeded(calendarModel: CalendarModel, weatherModel: WeatherModel,
|
||||
mixer: AudioMixer, fanControl: FanControl,
|
||||
launchAtLogin: LaunchAtLogin) {
|
||||
guard !isDone else { return }
|
||||
show(calendarModel: calendarModel, weatherModel: weatherModel, mixer: mixer,
|
||||
fanControl: fanControl, launchAtLogin: launchAtLogin)
|
||||
}
|
||||
|
||||
func show(calendarModel: CalendarModel, weatherModel: WeatherModel,
|
||||
mixer: AudioMixer, fanControl: FanControl, launchAtLogin: LaunchAtLogin) {
|
||||
// Solange dieses Fenster steht, gehört Onyx in den Dock und in den
|
||||
// Vordergrund — sonst erscheinen die Systemdialoge gar nicht.
|
||||
NSApp.setActivationPolicy(.regular)
|
||||
|
||||
if window == nil {
|
||||
let hosting = NSHostingController(
|
||||
rootView: OnboardingView(
|
||||
calendarModel: calendarModel, weatherModel: weatherModel,
|
||||
mixer: mixer, fanControl: fanControl, launchAtLogin: launchAtLogin,
|
||||
onFinish: { [weak self] in self?.finish() }))
|
||||
|
||||
let window = NSWindow(contentViewController: hosting)
|
||||
window.title = "Onyx"
|
||||
window.styleMask = [.titled, .closable]
|
||||
window.isReleasedWhenClosed = false
|
||||
window.delegate = self
|
||||
window.center()
|
||||
self.window = window
|
||||
}
|
||||
|
||||
NSApp.activate(ignoringOtherApps: true)
|
||||
window?.makeKeyAndOrderFront(nil)
|
||||
}
|
||||
|
||||
/// Auch das Schließen über den roten Knopf gilt als erledigt. Ein Fenster,
|
||||
/// das beim nächsten Start wiederkommt, weil man es weggeklickt hat, ist
|
||||
/// eine Zumutung.
|
||||
private func finish() {
|
||||
defaults.set(true, forKey: Self.doneKey)
|
||||
window?.close()
|
||||
}
|
||||
|
||||
func windowWillClose(_ notification: Notification) {
|
||||
defaults.set(true, forKey: Self.doneKey)
|
||||
// Zurück in den Hintergrund — es sei denn, ein anderes Fenster steht
|
||||
// noch offen.
|
||||
if !NSApp.windows.contains(where: { $0 !== window && $0.isVisible }) {
|
||||
NSApp.setActivationPolicy(.accessory)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -12,6 +12,9 @@ import MetricsProvider
|
||||
import NetworkProvider
|
||||
import AudioProvider
|
||||
import ShelfProvider
|
||||
import OSLog
|
||||
|
||||
private let log = Logger(subsystem: "com.scarriffleservices.onyx", category: "App")
|
||||
|
||||
@main
|
||||
struct OnyxApp: App {
|
||||
@@ -44,6 +47,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
|
||||
private let settingsWindow = SettingsWindowController()
|
||||
private let fanControl = FanControl()
|
||||
private let audioMixer = AudioMixer()
|
||||
private let launchAtLogin = LaunchAtLogin()
|
||||
private let onboarding = OnboardingWindowController()
|
||||
|
||||
func applicationDidFinishLaunching(_ notification: Notification) {
|
||||
NSApp.setActivationPolicy(.accessory)
|
||||
@@ -113,12 +118,25 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
|
||||
/// dort freischalten könnte. Genau dieser Zustand ist beim Testen
|
||||
/// aufgetreten.
|
||||
private func requestPermissions() {
|
||||
guard let calendarModel else { return }
|
||||
guard let calendarModel, let weatherModel else { return }
|
||||
log.notice("Start: Einrichtung erledigt = \(self.onboarding.isDone, privacy: .public)")
|
||||
// Immer einmal laden: mit Berechtigung kommen Termine, ohne sie zeigt
|
||||
// das Widget den Berechtigungshinweis statt einer leeren Liste.
|
||||
calendarModel.refresh()
|
||||
// Fenster öffnen, solange irgendeine Berechtigung noch aussteht.
|
||||
let needsLocation = weatherModel?.locationIsUndetermined ?? false
|
||||
|
||||
// Die Einrichtung kommt beim ersten Start immer — auch wenn zufällig
|
||||
// schon alles erlaubt ist. Sie erklärt nicht nur Berechtigungen,
|
||||
// sondern auch den Helfer und den Autostart, und sie ist der einzige
|
||||
// Moment, in dem jemand erfährt, was Onyx eigentlich alles kann.
|
||||
guard onboarding.isDone else {
|
||||
onboarding.show(calendarModel: calendarModel, weatherModel: weatherModel,
|
||||
mixer: audioMixer, fanControl: fanControl,
|
||||
launchAtLogin: launchAtLogin)
|
||||
return
|
||||
}
|
||||
|
||||
// Danach nur noch, wenn wirklich etwas fehlt.
|
||||
let needsLocation = weatherModel.locationIsUndetermined
|
||||
guard !calendarModel.hasAccess || needsLocation else { return }
|
||||
|
||||
// Nicht im Hintergrund anfragen.
|
||||
@@ -131,12 +149,20 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
|
||||
// `NSApp.activate` davor hilft nicht: Aktivierung wirkt asynchron und
|
||||
// ist beim Aufruf noch nicht durch.
|
||||
//
|
||||
// Deshalb der ehrliche Weg: beim ersten Start das Einstellungsfenster
|
||||
// öffnen. Dort ist ein echtes Fenster im Vordergrund, der Dialog
|
||||
// erscheint zuverlässig — und der Nutzer weiß, warum gefragt wird.
|
||||
// Deshalb der ehrliche Weg: ein echtes Fenster im Vordergrund. Die
|
||||
// Einrichtung lief schon einmal, hier fehlt nur noch etwas — dann
|
||||
// genügt der Berechtigungsbereich der Einstellungen.
|
||||
showSettings(tab: .permissions)
|
||||
}
|
||||
|
||||
/// Die Einrichtung noch einmal zeigen — aus den Einstellungen heraus.
|
||||
private func showOnboarding() {
|
||||
guard let calendarModel, let weatherModel else { return }
|
||||
onboarding.show(calendarModel: calendarModel, weatherModel: weatherModel,
|
||||
mixer: audioMixer, fanControl: fanControl,
|
||||
launchAtLogin: launchAtLogin)
|
||||
}
|
||||
|
||||
func applicationWillTerminate(_ notification: Notification) {
|
||||
coordinator?.stop()
|
||||
menuBar?.stop()
|
||||
@@ -279,7 +305,10 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
|
||||
guard let model, let calendarModel, let weatherModel else { return }
|
||||
settingsWindow.show(model: model, calendarModel: calendarModel,
|
||||
weatherModel: weatherModel, metricsModel: metricsModel,
|
||||
shelfStore: shelfStore, fanControl: fanControl, tab: tab)
|
||||
shelfStore: shelfStore, fanControl: fanControl,
|
||||
launchAtLogin: launchAtLogin,
|
||||
showOnboarding: { [weak self] in self?.showOnboarding() },
|
||||
tab: tab)
|
||||
}
|
||||
|
||||
@objc private func quit() { NSApp.terminate(nil) }
|
||||
|
||||
@@ -20,6 +20,8 @@ struct SettingsView: View {
|
||||
let metricsModel: MetricsModel?
|
||||
let shelfStore: ShelfStore?
|
||||
let fanControl: FanControl
|
||||
let launchAtLogin: LaunchAtLogin
|
||||
let showOnboarding: () -> Void
|
||||
@Binding var selectedTab: SettingsTab
|
||||
|
||||
var body: some View {
|
||||
@@ -39,7 +41,8 @@ struct SettingsView: View {
|
||||
FanSettingsView(control: fanControl)
|
||||
.tabItem { Label("settings.tab.fans", systemImage: "fan") }
|
||||
.tag(SettingsTab.fans)
|
||||
PermissionSettings(calendarModel: calendarModel, weatherModel: weatherModel)
|
||||
PermissionSettings(calendarModel: calendarModel, weatherModel: weatherModel,
|
||||
launchAtLogin: launchAtLogin, showOnboarding: showOnboarding)
|
||||
.tabItem { Label("settings.tab.permissions", systemImage: "hand.raised") }
|
||||
.tag(SettingsTab.permissions)
|
||||
}
|
||||
@@ -58,6 +61,8 @@ struct SettingsView: View {
|
||||
private struct PermissionSettings: View {
|
||||
let calendarModel: CalendarModel
|
||||
let weatherModel: WeatherModel
|
||||
let launchAtLogin: LaunchAtLogin
|
||||
let showOnboarding: () -> Void
|
||||
@State private var calendarGranted = false
|
||||
|
||||
private var locationState: PermissionRow.State {
|
||||
@@ -70,6 +75,36 @@ private struct PermissionSettings: View {
|
||||
|
||||
var body: some View {
|
||||
Form {
|
||||
Section("settings.general") {
|
||||
Toggle(isOn: Binding(
|
||||
get: { launchAtLogin.isEnabled },
|
||||
set: { _ = launchAtLogin.set($0) })) {
|
||||
Text("settings.launchAtLogin")
|
||||
}
|
||||
.disabled(launchAtLogin.needsSystemSettings)
|
||||
|
||||
// Der Zustand, der sonst in eine Schleife führt: der Schalter
|
||||
// steht auf aus, Drücken bewirkt nichts, weil das System den
|
||||
// Eintrag blockiert. Also steht hier, wo es weitergeht.
|
||||
if launchAtLogin.needsSystemSettings {
|
||||
HStack {
|
||||
Text("settings.launchAtLogin.blocked")
|
||||
.font(.callout).foregroundStyle(.secondary)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
Spacer()
|
||||
Button("settings.permissions.openSystem") {
|
||||
launchAtLogin.openSystemSettings()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
HStack {
|
||||
Spacer()
|
||||
Button("settings.onboarding.show", action: showOnboarding)
|
||||
.buttonStyle(.borderless)
|
||||
}
|
||||
}
|
||||
|
||||
Section {
|
||||
PermissionRow(
|
||||
title: "settings.permissions.calendar",
|
||||
@@ -96,6 +131,7 @@ private struct PermissionSettings: View {
|
||||
.formStyle(.grouped)
|
||||
.padding()
|
||||
.task {
|
||||
launchAtLogin.refresh()
|
||||
calendarGranted = calendarModel.hasAccess
|
||||
guard !calendarGranted, calendarModel.authorization == .undetermined else { return }
|
||||
// Kurz warten, bis das Fenster wirklich vorne steht: TCC zeigt den
|
||||
|
||||
@@ -28,6 +28,7 @@ final class SettingsWindowController: NSObject, NSWindowDelegate {
|
||||
|
||||
func show(model: AppModel, calendarModel: CalendarModel, weatherModel: WeatherModel,
|
||||
metricsModel: MetricsModel?, shelfStore: ShelfStore?, fanControl: FanControl,
|
||||
launchAtLogin: LaunchAtLogin, showOnboarding: @escaping () -> Void,
|
||||
tab: SettingsTab = .widgets) {
|
||||
selectedTab = tab
|
||||
keepsDockIcon = model.showsDockIcon
|
||||
@@ -48,6 +49,8 @@ final class SettingsWindowController: NSObject, NSWindowDelegate {
|
||||
metricsModel: metricsModel,
|
||||
shelfStore: shelfStore,
|
||||
fanControl: fanControl,
|
||||
launchAtLogin: launchAtLogin,
|
||||
showOnboarding: showOnboarding,
|
||||
selectedTab: Binding(
|
||||
get: { [weak self] in self?.selectedTab ?? .widgets },
|
||||
set: { [weak self] in self?.selectedTab = $0 })))
|
||||
|
||||
Reference in New Issue
Block a user