From 70a1cc2e63d2c49a135bd89cec3ffb1d427d90ee Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Tue, 30 Jun 2026 16:21:47 +0800
Subject: [PATCH] Freeze prep TagLauncher 8.2.9 Pro status UI
---
src/Apptag/PreferencesView.swift | 1359 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 995 insertions(+), 364 deletions(-)
diff --git a/src/Apptag/PreferencesView.swift b/src/Apptag/PreferencesView.swift
index 53d9dee..67f2899 100644
--- a/src/Apptag/PreferencesView.swift
+++ b/src/Apptag/PreferencesView.swift
@@ -1,5 +1,6 @@
import SwiftUI
import AppKit
+import Carbon
// MARK: - Preferences View
@@ -12,6 +13,7 @@
case hotkeys
case tags
case data
+ case pro
case about
var id: String { rawValue }
@@ -24,6 +26,7 @@
case .hotkeys: return "quickSearch.hotkeys"
case .tags: return "settings.tags"
case .data: return "settings.data"
+ case .pro: return "pro.card.badge"
case .about: return "settings.about"
}
}
@@ -32,10 +35,11 @@
switch self {
case .language: return "globe"
case .general: return "gearshape"
- case .theme: return "paintpalette.fill"
+ case .theme: return "paintpalette"
case .hotkeys: return "keyboard"
- case .tags: return "tag.fill"
- case .data: return "externaldrive.fill"
+ case .tags: return "tag"
+ case .data: return "externaldrive"
+ case .pro: return "crown"
case .about: return "info.circle"
}
}
@@ -78,6 +82,7 @@
@State private var isRefreshingLanguage = false
@State private var allApps: [AppInfo] = []
@State private var tagColors: [String: Int] = [:]
+ @State private var tagCustomColors: [String: TagCustomColor] = [:]
@State private var categoryScheme = TagDatabase.CategorySchemeState()
@State private var isApplyingSystemScheme = false
@State private var isResettingToUncategorized = false
@@ -86,6 +91,9 @@
@State private var isDataFilePanelPresented = false
@State private var hotkeyStatusToast: String? = nil
@State private var hotkeyStatusToastToken: UUID? = nil
+ @State private var recordingHotkeyKind: LauncherHotkeyKind? = nil
+ @State private var hotkeyRecorderMonitor: Any? = nil
+ @State private var hotkeySettingsRefreshToken = UUID()
@State private var selectedTab: SettingsTab = .general
@State private var selectedInitialLayoutMode: InitialLayoutMode = .smart
@State private var settingsProPromptFeature: ProFeature? = nil
@@ -107,9 +115,11 @@
let store = TagDatabase.loadWithEnsuredCategoryScheme()
apps = TagEditor.annotate(apps: apps)
let colors = store.tags.mapValues { $0.color }
+ let customColors = store.tags.compactMapValues { $0.customColor }
DispatchQueue.main.async {
allApps = apps
tagColors = colors
+ tagCustomColors = customColors
categoryScheme = store.categoryScheme
}
}
@@ -305,8 +315,87 @@
let status = LauncherHotkeyRegistrationStore.failureCode(for: kind)
.map(String.init) ?? "-"
return tr(key)
- .replacingOccurrences(of: "%shortcut%", with: kind.hotkey.displayString)
+ .replacingOccurrences(of: "%shortcut%", with: LauncherHotkeySettings.effectiveHotkey(for: kind).displayString)
.replacingOccurrences(of: "%status%", with: status)
+ }
+
+ private func startHotkeyRecording(for kind: LauncherHotkeyKind) {
+ guard ProEntitlementPolicy.isUnlocked(.customHotkeys) else {
+ presentSettingsProPrompt(for: .customHotkeys)
+ return
+ }
+ guard let appDelegate = AppDelegate.shared else {
+ handleHotkeyCustomizationResult(.registrationFailed(-1))
+ return
+ }
+ stopHotkeyRecording(showCancelledToast: false)
+ appDelegate.suspendConfiguredHotkeysForRecording()
+ recordingHotkeyKind = kind
+ showHotkeyStatusToast(tr("hotkeys.recording"))
+ hotkeyRecorderMonitor = NSEvent.addLocalMonitorForEvents(matching: .keyDown) { event in
+ DispatchQueue.main.async {
+ self.captureHotkeyEvent(event)
+ }
+ return nil
+ }
+ }
+
+ private func captureHotkeyEvent(_ event: NSEvent) {
+ guard let kind = recordingHotkeyKind else { return }
+ if Int(event.keyCode) == kVK_Escape {
+ stopHotkeyRecording(showCancelledToast: true)
+ return
+ }
+ let candidate = LauncherHotkeySettings.candidate(from: event)
+ let result = AppDelegate.shared?
+ .applyCustomHotkey(candidate, for: kind)
+ ?? .registrationFailed(-1)
+ stopHotkeyRecording(showCancelledToast: false)
+ handleHotkeyCustomizationResult(result)
+ }
+
+ private func restoreDefaultHotkey(for kind: LauncherHotkeyKind) {
+ guard ProEntitlementPolicy.isUnlocked(.customHotkeys) else {
+ presentSettingsProPrompt(for: .customHotkeys)
+ return
+ }
+ let result = AppDelegate.shared?
+ .restoreDefaultHotkey(for: kind)
+ ?? .registrationFailed(-1)
+ handleHotkeyCustomizationResult(result)
+ }
+
+ private func stopHotkeyRecording(showCancelledToast: Bool = false) {
+ let wasRecording = recordingHotkeyKind != nil || hotkeyRecorderMonitor != nil
+ if let hotkeyRecorderMonitor {
+ NSEvent.removeMonitor(hotkeyRecorderMonitor)
+ }
+ hotkeyRecorderMonitor = nil
+ recordingHotkeyKind = nil
+ if wasRecording {
+ AppDelegate.shared?.resumeConfiguredHotkeysAfterRecording()
+ }
+ if showCancelledToast {
+ showHotkeyStatusToast(tr("hotkeys.recordingCancelled"))
+ }
+ }
+
+ private func handleHotkeyCustomizationResult(_ result: LauncherHotkeyCustomizationResult) {
+ if case .locked = result {
+ presentSettingsProPrompt(for: .customHotkeys)
+ return
+ }
+ hotkeySettingsRefreshToken = UUID()
+ showHotkeyStatusToast(hotkeyCustomizationMessage(for: result))
+ }
+
+ private func hotkeyCustomizationMessage(for result: LauncherHotkeyCustomizationResult) -> String {
+ switch result {
+ case .registrationFailed(let status):
+ return tr(result.messageKey).replacingOccurrences(of: "%status%", with: String(status))
+ default:
+ return tr(result.messageKey)
+ }
}
private func showHotkeyStatusToast(_ message: String) {
@@ -577,8 +666,12 @@
ProEntitlementPolicy.effectiveTheme(for: selectedAppGridTheme)
}
+ private var effectiveDisplayMode: String {
+ ProEntitlementPolicy.effectiveDisplayMode(for: displayMode)
+ }
+
private var proStatusPillStyle: ProStatusPillStyle {
- if proEntitlement.isPreviewingTheme {
+ if proEntitlement.isPreviewingProAppearance {
return .preview
}
switch proEntitlement.accessState {
@@ -591,30 +684,383 @@
}
}
- private var proCardTitle: String {
- switch proEntitlement.accessState {
- case .free:
- return tr("pro.card.title.free")
- case .purchased:
- return tr("pro.card.title.unlocked")
- case .legacy:
- return tr("pro.card.title.legacy")
+ private var proAccentColor: Color {
+ Color(red: 0.56, green: 0.35, blue: 0.03)
+ }
+
+ @ViewBuilder
+ private func proHeaderStatusLabel(compact: Bool = false) -> some View {
+ if proEntitlement.accessState == .free && !proEntitlement.isPreviewingProAppearance {
+ Text(tr("settings.proStatus.freeUser"))
+ .font(.system(size: compact ? 12 : 13, weight: .semibold))
+ .foregroundStyle(.secondary)
+ .lineLimit(1)
+ .minimumScaleFactor(0.82)
+ } else {
+ ProStatusPill(
+ text: tr(proEntitlement.compactStatusTextKey),
+ style: proStatusPillStyle,
+ compact: compact
+ )
}
}
- private var proCardSummary: String {
- switch proEntitlement.accessState {
- case .free:
- return tr("pro.card.summary.free")
- case .purchased:
- return tr("pro.card.summary.unlocked")
- case .legacy:
- return tr("pro.card.summary.legacy")
+ private func centeredSettingsScrollContent<Content: View>(
+ width: CGFloat,
+ @ViewBuilder content: @escaping () -> Content
+ ) -> some View {
+ GeometryReader { proxy in
+ ScrollView(.vertical, showsIndicators: true) {
+ VStack(alignment: .center, spacing: 18) {
+ content()
+ }
+ .frame(width: width, alignment: .center)
+ .frame(maxWidth: .infinity, alignment: .center)
+ .frame(minHeight: proxy.size.height, alignment: .center)
+ }
}
+ }
+
+ @ViewBuilder
+ private func proUnlockedBenefitLine(_ textKey: String, bottomPadding: CGFloat = 14) -> some View {
+ if proEntitlement.isUnlocked {
+ HStack(spacing: 12) {
+ ProStatusPill(
+ text: tr(proEntitlement.compactStatusTextKey),
+ style: proStatusPillStyle
+ )
+
+ Text(tr(textKey))
+ .font(.system(size: 13, weight: .medium))
+ .foregroundStyle(.secondary)
+ .lineLimit(2)
+ .fixedSize(horizontal: false, vertical: true)
+
+ Spacer(minLength: 0)
+ }
+ .frame(maxWidth: .infinity, alignment: .leading)
+ .padding(.bottom, bottomPadding)
+ }
+ }
+
+ private func proPurchaseGuidanceLine(
+ _ textKey: String,
+ feature: ProFeature,
+ bottomPadding: CGFloat = 14,
+ compact: Bool = false
+ ) -> some View {
+ HStack(spacing: compact ? 8 : 12) {
+ proHeaderStatusLabel(compact: compact)
+ .layoutPriority(1)
+
+ Text(tr(textKey))
+ .font(.system(size: 13, weight: .medium))
+ .foregroundStyle(.secondary)
+ .lineLimit(2)
+ .fixedSize(horizontal: false, vertical: true)
+ .layoutPriority(2)
+
+ Spacer(minLength: 8)
+
+ if !proEntitlement.isUnlocked {
+ Button(unlockButtonTitle()) {
+ presentSettingsProPrompt(for: feature)
+ }
+ .buttonStyle(.borderedProminent)
+ .controlSize(compact ? .small : .regular)
+ .layoutPriority(3)
+
+ Button(tr("pro.card.restore")) {
+ proEntitlement.restorePurchases()
+ }
+ .buttonStyle(.bordered)
+ .controlSize(compact ? .small : .regular)
+ .layoutPriority(3)
+ }
+ }
+ .padding(.horizontal, compact ? 10 : 16)
+ .padding(.vertical, compact ? 8 : 14)
+ .background(
+ RoundedRectangle(cornerRadius: 10, style: .continuous)
+ .fill(Color(nsColor: .controlBackgroundColor))
+ )
+ .overlay(
+ RoundedRectangle(cornerRadius: 10, style: .continuous)
+ .stroke(Color.secondary.opacity(0.16), lineWidth: 1)
+ )
+ .padding(.bottom, bottomPadding)
+ }
+
+ @ViewBuilder
+ private func proAccessGuidanceLine(
+ freeTextKey: String,
+ unlockedTextKey: String,
+ feature: ProFeature,
+ bottomPadding: CGFloat = 14,
+ compact: Bool = false
+ ) -> some View {
+ if proEntitlement.isUnlocked {
+ proUnlockedBenefitLine(unlockedTextKey, bottomPadding: bottomPadding)
+ } else {
+ proPurchaseGuidanceLine(freeTextKey, feature: feature, bottomPadding: bottomPadding, compact: compact)
+ }
+ }
+
+ private var settingsProHeaderFeature: ProFeature {
+ switch selectedTab {
+ case .hotkeys:
+ return .customHotkeys
+ case .tags:
+ return .customTagColors
+ case .data:
+ return .layoutExport
+ case .theme, .general, .language, .pro, .about:
+ return .premiumThemes
+ }
+ }
+
+ private var settingsProHeaderText: String {
+ if selectedTab == .pro {
+ return tr(proEntitlement.isUnlocked ? "settings.proStatus.proUser" : "settings.proStatus.freeUser")
+ }
+
+ switch selectedTab {
+ case .language, .about:
+ return ""
+ case .general:
+ return tr(proEntitlement.isUnlocked ? "settings.proBenefit.general" : "settings.proGuide.general")
+ case .theme:
+ return themeStatusSummary
+ case .hotkeys:
+ return tr(proEntitlement.isUnlocked ? "settings.proBenefit.hotkeys" : "settings.proGuide.hotkeys")
+ case .tags:
+ return tr(proEntitlement.isUnlocked ? "settings.proBenefit.tags" : "settings.proGuide.tags")
+ case .data:
+ return tr(proEntitlement.isUnlocked ? "settings.proBenefit.data" : "settings.proGuide.data")
+ case .pro:
+ return tr(proEntitlement.isUnlocked ? "settings.proStatus.proUser" : "settings.proStatus.freeUser")
+ }
+ }
+
+ private var shouldShowSettingsFixedProHeader: Bool {
+ true
+ }
+
+ private var shouldCenterUnlockedIdentityHeader: Bool {
+ guard proEntitlement.isUnlocked else { return false }
+ switch selectedTab {
+ case .language, .pro, .about:
+ return true
+ case .general, .theme, .hotkeys, .tags, .data:
+ return false
+ }
+ }
+
+ private var settingsFixedProHeader: some View {
+ HStack {
+ HStack(spacing: 12) {
+ if shouldCenterUnlockedIdentityHeader {
+ Spacer(minLength: 0)
+
+ ProStatusPill(
+ text: tr("pro.status.unlocked"),
+ style: .unlocked,
+ compact: true
+ )
+ .layoutPriority(1)
+
+ Text(tr("settings.proStatus.proUser"))
+ .font(.system(size: 13, weight: .medium))
+ .foregroundStyle(.secondary)
+ .lineLimit(1)
+ .fixedSize(horizontal: false, vertical: true)
+ .layoutPriority(2)
+
+ Spacer(minLength: 0)
+ } else {
+ if selectedTab != .pro {
+ proHeaderStatusLabel(compact: true)
+ .layoutPriority(1)
+ }
+
+ if !settingsProHeaderText.isEmpty {
+ Text(settingsProHeaderText)
+ .font(.system(size: 13, weight: .medium))
+ .foregroundStyle(.secondary)
+ .lineLimit(2)
+ .fixedSize(horizontal: false, vertical: true)
+ .layoutPriority(2)
+ }
+
+ Spacer(minLength: 8)
+
+ if !proEntitlement.isUnlocked {
+ Button(unlockButtonTitle()) {
+ presentSettingsProPrompt(for: settingsProHeaderFeature)
+ }
+ .buttonStyle(.borderedProminent)
+ .controlSize(.small)
+ .layoutPriority(3)
+
+ Button(tr("pro.card.restore")) {
+ proEntitlement.restorePurchases()
+ }
+ .buttonStyle(.bordered)
+ .controlSize(.small)
+ .layoutPriority(3)
+ }
+ }
+ }
+ .padding(.horizontal, 16)
+ .padding(.vertical, 10)
+ .frame(width: dataPanelWidth, alignment: .leading)
+ .frame(minHeight: 44)
+ .background(
+ RoundedRectangle(cornerRadius: 10, style: .continuous)
+ .fill(Color(nsColor: .controlBackgroundColor))
+ )
+ .overlay(
+ RoundedRectangle(cornerRadius: 10, style: .continuous)
+ .stroke(Color.secondary.opacity(0.16), lineWidth: 1)
+ )
+ }
+ .frame(maxWidth: .infinity, alignment: .center)
+ .padding(.top, 12)
+ .padding(.bottom, 10)
+ .background(Color(nsColor: .windowBackgroundColor))
+ }
+
+ private var proTabComparisonFeatures: [ProTabComparisonFeature] {
+ [
+ ProTabComparisonFeature(
+ title: tr("pro.feature.customTagColors"),
+ freeStatusKey: "settings.proStatus.unavailableFeature",
+ proLockedStatusKey: "settings.proStatus.lockedFeature",
+ proUnlockedStatusKey: "settings.proStatus.unlockedFeature",
+ freeStyle: .neutral,
+ proLockedStyle: .neutral,
+ proUnlockedStyle: .neutral
+ ),
+ ProTabComparisonFeature(
+ title: "\(tr("settings.coloredContainer")) / \(tr("settings.coloredGridContainer"))",
+ freeStatusKey: "settings.proStatus.previewFiveMinutes",
+ proLockedStatusKey: "settings.proStatus.lockedFeature",
+ proUnlockedStatusKey: "settings.proStatus.unlockedFeature",
+ freeStyle: .neutral,
+ proLockedStyle: .neutral,
+ proUnlockedStyle: .neutral
+ ),
+ ProTabComparisonFeature(
+ title: tr("pro.feature.themes"),
+ freeStatusKey: "settings.proStatus.previewFiveMinutes",
+ proLockedStatusKey: "settings.proStatus.lockedFeature",
+ proUnlockedStatusKey: "settings.proStatus.unlockedFeature",
+ freeStyle: .neutral,
+ proLockedStyle: .neutral,
+ proUnlockedStyle: .neutral
+ ),
+ ProTabComparisonFeature(
+ title: tr("pro.feature.customHotkeys"),
+ freeStatusKey: "settings.proStatus.unavailableFeature",
+ proLockedStatusKey: "settings.proStatus.lockedFeature",
+ proUnlockedStatusKey: "settings.proStatus.unlockedFeature",
+ freeStyle: .neutral,
+ proLockedStyle: .neutral,
+ proUnlockedStyle: .neutral
+ ),
+ ProTabComparisonFeature(
+ title: tr("settings.proFeature.appNotes"),
+ freeStatusKey: "settings.proStatus.freeNotes",
+ proLockedStatusKey: "settings.proStatus.unlimitedNotes",
+ proUnlockedStatusKey: "settings.proStatus.unlimitedNotes",
+ freeStyle: .neutral,
+ proLockedStyle: .neutral,
+ proUnlockedStyle: .neutral
+ ),
+ ProTabComparisonFeature(
+ title: tr("settings.proFeature.dataBackup"),
+ freeStatusKey: "settings.proStatus.unavailableFeature",
+ proLockedStatusKey: "settings.proStatus.lockedFeature",
+ proUnlockedStatusKey: "settings.proStatus.unlockedFeature",
+ freeStyle: .neutral,
+ proLockedStyle: .neutral,
+ proUnlockedStyle: .neutral
+ )
+ ]
+ }
+
+ private func proTabComparisonTable(width: CGFloat) -> some View {
+ VStack(alignment: .leading, spacing: 8) {
+ VStack(spacing: 8) {
+ HStack(spacing: 10) {
+ Text("")
+ .frame(maxWidth: .infinity, alignment: .leading)
+ Text(tr("settings.proCompare.free"))
+ .font(.system(size: 12, weight: .semibold))
+ .foregroundStyle(.secondary)
+ .frame(width: 118, alignment: .leading)
+ HStack(spacing: 4) {
+ Image(systemName: "crown")
+ .font(.system(size: 12, weight: .semibold))
+ Text(tr("settings.proCompare.pro"))
+ .font(.system(size: 12, weight: .semibold))
+ }
+ .foregroundStyle(proAccentColor)
+ .lineLimit(1)
+ .minimumScaleFactor(0.82)
+ .frame(width: 118, alignment: .leading)
+ }
+
+ ForEach(proTabComparisonFeatures) { feature in
+ let proStatusKey = proEntitlement.isUnlocked ? feature.proUnlockedStatusKey : feature.proLockedStatusKey
+ let proStyle = proEntitlement.isUnlocked ? feature.proUnlockedStyle : feature.proLockedStyle
+
+ HStack(alignment: .top, spacing: 10) {
+ Text(feature.title)
+ .font(.system(size: 12, weight: .medium))
+ .foregroundStyle(proAccentColor)
+ .lineLimit(2)
+ .fixedSize(horizontal: false, vertical: true)
+ .frame(maxWidth: .infinity, alignment: .leading)
+
+ ProStatusPill(
+ text: tr(feature.freeStatusKey),
+ style: feature.freeStyle,
+ compact: true
+ )
+ .frame(width: 118, alignment: .leading)
+
+ ProStatusPill(
+ text: tr(proStatusKey),
+ style: proStyle,
+ compact: true
+ )
+ .frame(width: 118, alignment: .leading)
+ }
+ .padding(.horizontal, 10)
+ .padding(.vertical, 8)
+ .background(
+ RoundedRectangle(cornerRadius: 8, style: .continuous)
+ .fill(Color(nsColor: .windowBackgroundColor).opacity(0.72))
+ )
+ }
+ }
+ }
+ .padding(.horizontal, 16)
+ .padding(.vertical, 14)
+ .frame(width: width, alignment: .leading)
+ .background(
+ RoundedRectangle(cornerRadius: 10, style: .continuous)
+ .fill(Color(nsColor: .controlBackgroundColor))
+ )
+ .overlay(
+ RoundedRectangle(cornerRadius: 10, style: .continuous)
+ .stroke(Color.secondary.opacity(0.16), lineWidth: 1)
+ )
}
private var themeStatusSummary: String {
- if proEntitlement.isPreviewingTheme {
+ if proEntitlement.isPreviewingProAppearance {
if let countdown = themePreviewCountdownText {
return tr("pro.theme.status.previewCountdown")
.replacingOccurrences(of: "%time%", with: countdown)
@@ -640,6 +1086,15 @@
return
}
proEntitlement.startThemePreview(for: theme, tuning: currentThemeTuning(for: theme))
+ }
+
+ private func handleDisplayModeSelection(_ mode: String) {
+ if ProEntitlementPolicy.canUseDisplayMode(mode) {
+ proEntitlement.stopDisplayModePreview()
+ displayMode = mode
+ return
+ }
+ proEntitlement.startDisplayModePreview(for: mode)
}
private var activeColorTuningTheme: AppGridTheme? {
@@ -698,10 +1153,20 @@
if let preview = proEntitlement.themePreviewState?.theme, preview == theme {
return .countdown(text: themePreviewCountdownText ?? "00:00")
}
- if !proEntitlement.isUnlocked && theme.requiresPro {
+ if theme.requiresPro {
return .pill(text: tr("pro.card.badge"), style: .locked)
}
return effectiveAppGridTheme == theme ? .checkmark : .circle
+ }
+
+ private func displayModeOptionAccessory(for mode: String) -> ThemeOptionAccessory {
+ if proEntitlement.displayModePreviewState?.displayMode == mode {
+ return .countdown(text: themePreviewCountdownText ?? "00:00")
+ }
+ if ProEntitlementPolicy.isPremiumDisplayMode(mode) {
+ return .pill(text: tr("pro.card.badge"), style: .locked)
+ }
+ return effectiveDisplayMode == mode ? .checkmark : .circle
}
private func presentSettingsProPrompt(for feature: ProFeature) {
@@ -712,8 +1177,13 @@
}
private var themePreviewCountdownText: String? {
- guard let preview = proEntitlement.themePreviewState else { return nil }
- return Self.formatThemePreviewCountdown(seconds: preview.remainingSeconds(at: themePreviewNow))
+ if let preview = proEntitlement.themePreviewState {
+ return Self.formatThemePreviewCountdown(seconds: preview.remainingSeconds(at: themePreviewNow))
+ }
+ if let preview = proEntitlement.displayModePreviewState {
+ return Self.formatThemePreviewCountdown(seconds: preview.remainingSeconds(at: themePreviewNow))
+ }
+ return nil
}
private static func formatThemePreviewCountdown(seconds: Int) -> String {
@@ -723,9 +1193,13 @@
private func refreshThemePreviewCountdown(now: Date = Date()) {
themePreviewNow = now
- guard let preview = proEntitlement.themePreviewState else { return }
- if preview.remainingSeconds(at: now) <= 0 {
+ if let preview = proEntitlement.themePreviewState,
+ preview.remainingSeconds(at: now) <= 0 {
proEntitlement.stopThemePreview()
+ }
+ if let preview = proEntitlement.displayModePreviewState,
+ preview.remainingSeconds(at: now) <= 0 {
+ proEntitlement.stopDisplayModePreview()
}
}
@@ -737,11 +1211,18 @@
}
private func handleProAccessStateChange(_ newState: ProAccessState) {
- guard newState.isUnlocked else { return }
+ guard newState.isUnlocked else {
+ stopHotkeyRecording(showCancelledToast: false)
+ return
+ }
if let preview = proEntitlement.themePreviewState {
appGridThemeID = preview.theme.rawValue
persistThemeTuning(preview.themeTuning, for: preview.theme)
proEntitlement.stopThemePreview()
+ }
+ if let preview = proEntitlement.displayModePreviewState {
+ displayMode = preview.displayMode
+ proEntitlement.stopDisplayModePreview()
}
if settingsProPromptFeature != nil {
dismissSettingsProPrompt()
@@ -861,12 +1342,20 @@
.font(.system(size: 13, weight: .semibold))
.foregroundStyle(.secondary)
- StaticHotkeyInfoRow(
+ CustomizableHotkeyInfoRow(
title: tr("quickSearch.mainHotkey"),
description: tr("quickSearch.mainHotkeyDesc"),
- displayText: LauncherHotkey.main.displayString,
+ displayText: LauncherHotkeySettings.effectiveHotkey(for: .main).displayString,
statusText: hotkeyStatusText(for: .main),
- statusTone: hotkeyStatusTone(for: .main)
+ statusTone: hotkeyStatusTone(for: .main),
+ customizeTitle: tr("hotkeys.customize"),
+ proBadgeTitle: tr("pro.card.badge"),
+ restoreTitle: tr("hotkeys.restoreDefault"),
+ isRecording: recordingHotkeyKind == .main,
+ isProLocked: !proEntitlement.isUnlocked,
+ canRestore: proEntitlement.isUnlocked && LauncherHotkeySettings.hasCustomHotkey(for: .main),
+ onCustomize: { startHotkeyRecording(for: .main) },
+ onRestore: { restoreDefaultHotkey(for: .main) }
)
StaticHotkeyInfoRow(
@@ -877,12 +1366,20 @@
statusTone: .neutral
)
- StaticHotkeyInfoRow(
+ CustomizableHotkeyInfoRow(
title: tr("quickSearch.globalHotkey"),
description: tr("quickSearch.globalHotkeyDesc"),
- displayText: LauncherHotkey.quickSearch.displayString,
+ displayText: LauncherHotkeySettings.effectiveHotkey(for: .quickSearch).displayString,
statusText: hotkeyStatusText(for: .quickSearch),
- statusTone: hotkeyStatusTone(for: .quickSearch)
+ statusTone: hotkeyStatusTone(for: .quickSearch),
+ customizeTitle: tr("hotkeys.customize"),
+ proBadgeTitle: tr("pro.card.badge"),
+ restoreTitle: tr("hotkeys.restoreDefault"),
+ isRecording: recordingHotkeyKind == .quickSearch,
+ isProLocked: !proEntitlement.isUnlocked,
+ canRestore: proEntitlement.isUnlocked && LauncherHotkeySettings.hasCustomHotkey(for: .quickSearch),
+ onCustomize: { startHotkeyRecording(for: .quickSearch) },
+ onRestore: { restoreDefaultHotkey(for: .quickSearch) }
)
StaticHotkeyInfoRow(
@@ -893,23 +1390,24 @@
statusTone: .neutral
)
}
+ .id(hotkeySettingsRefreshToken)
}
+ @ViewBuilder
private var themeProStatusRow: some View {
- HStack(spacing: 12) {
- ProStatusPill(
- text: tr(proEntitlement.compactStatusTextKey),
- style: proStatusPillStyle
- )
+ if proEntitlement.isUnlocked {
+ proUnlockedBenefitLine("pro.theme.status.unlocked", bottomPadding: 0)
+ } else {
+ HStack(spacing: 12) {
+ proHeaderStatusLabel()
- Text(themeStatusSummary)
- .font(.system(size: 13, weight: .medium))
- .foregroundStyle(.secondary)
- .fixedSize(horizontal: false, vertical: true)
+ Text(themeStatusSummary)
+ .font(.system(size: 13, weight: .medium))
+ .foregroundStyle(.secondary)
+ .fixedSize(horizontal: false, vertical: true)
- Spacer(minLength: 0)
+ Spacer(minLength: 0)
- if !proEntitlement.isUnlocked {
Button(unlockButtonTitle()) {
presentSettingsProPrompt(for: .premiumThemes)
}
@@ -920,77 +1418,21 @@
}
.buttonStyle(.bordered)
}
+ .padding(.horizontal, 16)
+ .padding(.vertical, 14)
+ .background(
+ RoundedRectangle(cornerRadius: 10, style: .continuous)
+ .fill(Color(nsColor: .controlBackgroundColor))
+ )
+ .overlay(
+ RoundedRectangle(cornerRadius: 10, style: .continuous)
+ .stroke(Color.secondary.opacity(0.16), lineWidth: 1)
+ )
}
- .padding(.horizontal, 16)
- .padding(.vertical, 14)
- .background(
- RoundedRectangle(cornerRadius: 10, style: .continuous)
- .fill(Color(nsColor: .controlBackgroundColor))
- )
- .overlay(
- RoundedRectangle(cornerRadius: 10, style: .continuous)
- .stroke(Color.secondary.opacity(0.16), lineWidth: 1)
- )
- }
-
- private var proStatusCard: some View {
- HStack(alignment: .top, spacing: 18) {
- VStack(alignment: .leading, spacing: 10) {
- HStack(spacing: 10) {
- Text(proCardTitle)
- .font(.system(size: 20, weight: .bold))
- ProStatusPill(
- text: tr(proEntitlement.compactStatusTextKey),
- style: proStatusPillStyle
- )
- }
-
- Text(proCardSummary)
- .font(.system(size: 13, weight: .medium))
- .foregroundStyle(.secondary)
- .lineSpacing(2)
- .fixedSize(horizontal: false, vertical: true)
-
- }
-
- Spacer(minLength: 16)
-
- VStack(alignment: .trailing, spacing: 10) {
- if !proEntitlement.isUnlocked {
- Button(unlockButtonTitle()) {
- proEntitlement.purchasePro()
- }
- .buttonStyle(.borderedProminent)
- }
-
- Button(tr("pro.card.restore")) {
- proEntitlement.restorePurchases()
- }
- .buttonStyle(.bordered)
-
- if let statusKey = proEntitlement.operationState.statusMessageKey {
- Text(tr(statusKey))
- .font(.caption)
- .foregroundStyle(.secondary)
- .multilineTextAlignment(.trailing)
- }
- }
- }
- .padding(.horizontal, 20)
- .padding(.vertical, 18)
- .frame(width: dataPanelWidth, alignment: .leading)
- .background(
- RoundedRectangle(cornerRadius: 12, style: .continuous)
- .fill(Color(nsColor: .controlBackgroundColor))
- )
- .overlay(
- RoundedRectangle(cornerRadius: 12, style: .continuous)
- .stroke(Color.secondary.opacity(0.18), lineWidth: 1)
- )
}
private var settingsTabBar: some View {
- HStack(spacing: 8) {
+ HStack(spacing: 6) {
ForEach(SettingsTab.allCases) { tab in
settingsTabButton(tab)
}
@@ -1007,17 +1449,17 @@
} label: {
VStack(spacing: 5) {
Image(systemName: tab.systemImage)
- .font(.system(size: 25, weight: .regular))
+ .font(.system(size: 24, weight: .regular))
.symbolRenderingMode(.hierarchical)
- .frame(width: 32, height: 32)
+ .frame(width: 30, height: 30)
Text(tr(tab.titleKey))
- .font(.system(size: 13, weight: .semibold))
+ .font(.system(size: 12, weight: .semibold))
.lineLimit(2)
.multilineTextAlignment(.center)
.minimumScaleFactor(0.8)
}
.foregroundStyle(isSelected ? Color.accentColor : Color.secondary)
- .frame(width: 108, height: 74)
+ .frame(width: 94, height: 72)
.background(
RoundedRectangle(cornerRadius: 8, style: .continuous)
.fill(isSelected ? Color.accentColor.opacity(0.10) : Color.clear)
@@ -1038,18 +1480,14 @@
VStack(spacing: 0) {
settingsTabBar
Divider()
+ if shouldShowSettingsFixedProHeader {
+ settingsFixedProHeader
+ }
Group {
switch selectedTab {
case .language:
// Tab 1: Language
- VStack(alignment: .leading, spacing: 10) {
- Text(tr("settings.language"))
- .font(.headline)
- Text(tr("settings.languageDesc"))
- .font(.caption)
- .foregroundStyle(.secondary)
-
- ScrollView {
+ centeredSettingsScrollContent(width: settingsContentWidth) {
LazyVGrid(columns: languageColumns, alignment: .leading, spacing: 6) {
Button {
selectedLanguage = L10n.automaticCode
@@ -1099,11 +1537,7 @@
}
}
.padding(.vertical, 4)
- }
- .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
}
- .frame(maxWidth: settingsContentWidth, alignment: .leading)
- .padding()
case .general:
// Tab 2: General
@@ -1142,9 +1576,10 @@
DisplayModeOptionButton(
mode: "flat",
title: tr("settings.flat"),
- isSelected: displayMode == "flat"
+ isSelected: effectiveDisplayMode == "flat",
+ accessory: displayModeOptionAccessory(for: "flat")
) {
- displayMode = "flat"
+ handleDisplayModeSelection("flat")
}
LazyVGrid(columns: displayModeColumns, alignment: .leading, spacing: 8) {
@@ -1152,9 +1587,10 @@
DisplayModeOptionButton(
mode: option.id,
title: option.title,
- isSelected: displayMode == option.id
+ isSelected: effectiveDisplayMode == option.id,
+ accessory: displayModeOptionAccessory(for: option.id)
) {
- displayMode = option.id
+ handleDisplayModeSelection(option.id)
}
}
}
@@ -1202,8 +1638,6 @@
case .theme:
ScrollView(.vertical, showsIndicators: true) {
VStack(alignment: .leading, spacing: 18) {
- themeProStatusRow
-
LazyVGrid(columns: themeColumns, alignment: .leading, spacing: 12) {
ForEach(AppGridTheme.settingsDisplayOrder) { theme in
ThemeOptionButton(
@@ -1242,7 +1676,10 @@
VStack(spacing: 0) {
TagEditorView(
tagColors: $tagColors,
+ tagCustomColors: $tagCustomColors,
excludedTagNames: ["Mac自带", defaultGroupName],
+ isCustomColorUnlocked: proEntitlement.isUnlocked,
+ onLockedCustomColor: { presentSettingsProPrompt(for: .customTagColors) },
onRefresh: { scanApps() }
)
}
@@ -1250,226 +1687,214 @@
case .data:
// Tab 5: Data
- VStack(spacing: 0) {
- Spacer(minLength: 36)
+ ScrollView(.vertical, showsIndicators: true) {
+ VStack(spacing: 18) {
+ VStack(alignment: .center, spacing: 24) {
+ dataSection(minHeight: 124) {
+ HStack(alignment: .center, spacing: 12) {
+ dataSectionTitle(tr("settings.initialLayout"))
- VStack(alignment: .center, spacing: 24) {
- dataSection(minHeight: 124) {
- HStack(alignment: .center, spacing: 12) {
- dataSectionTitle(tr("settings.initialLayout"))
+ HStack(spacing: 22) {
+ initialLayoutOption(
+ tr("settings.initialLayoutUncategorized"),
+ mode: .uncategorized
+ )
+ initialLayoutOption(
+ tr("settings.initialLayoutSmart"),
+ mode: .smart
+ )
+ }
+ .frame(maxWidth: .infinity, alignment: .leading)
+ .layoutPriority(1)
- HStack(spacing: 22) {
- initialLayoutOption(
- tr("settings.initialLayoutUncategorized"),
- mode: .uncategorized
+ dataActionButton(
+ tr("settings.applyScheme"),
+ prominent: true,
+ enabled: !isApplyingSystemScheme && !isResettingToUncategorized,
+ action: applySelectedInitialLayout
)
- initialLayoutOption(
- tr("settings.initialLayoutSmart"),
- mode: .smart
- )
+ .frame(width: dataActionWidth, alignment: .trailing)
+ .layoutPriority(2)
}
+ }
+
+ dataSection(minHeight: 190) {
+ HStack(alignment: .top, spacing: 12) {
+ dataSectionTitle(tr("settings.customLayout"))
+ .padding(.top, 4)
+
+ VStack(alignment: .leading, spacing: 10) {
+ HStack(alignment: .firstTextBaseline, spacing: 8) {
+ Text(tr("settings.previousScheme"))
+ .font(.system(size: 13, weight: .semibold))
+ .foregroundStyle(.secondary)
+ .lineLimit(1)
+ .minimumScaleFactor(0.82)
+ Text(previousCategorySchemeName)
+ .font(.system(size: 13, weight: .medium))
+ .foregroundStyle(canRestorePreviousScheme ? .primary : .tertiary)
+ .lineLimit(1)
+ .truncationMode(.middle)
+ .frame(maxWidth: .infinity, alignment: .leading)
+ }
+
+ HStack(alignment: .firstTextBaseline, spacing: 8) {
+ Text(tr("settings.currentScheme"))
+ .font(.system(size: 13, weight: .semibold))
+ .foregroundStyle(.secondary)
+ .lineLimit(1)
+ .minimumScaleFactor(0.82)
+ Text(currentCategorySchemeName)
+ .font(.system(size: 13, weight: .medium))
+ .foregroundStyle(.primary)
+ .lineLimit(1)
+ .truncationMode(.middle)
+ .frame(maxWidth: .infinity, alignment: .leading)
+ }
+
+ Divider().opacity(0.35)
+ .padding(.top, 2)
+
+ VStack(alignment: .center, spacing: 8) {
+ HStack(spacing: 12) {
+ Button {
+ exportTags()
+ } label: {
+ HStack(spacing: 8) {
+ Text(tr("settings.export"))
+ ProStatusPill(text: tr("pro.card.badge"), style: .locked, compact: true)
+ }
+ }
+ .buttonStyle(.bordered)
+ .disabled(isDataFilePanelPresented)
+ Button {
+ importTags()
+ } label: {
+ HStack(spacing: 8) {
+ Text(tr("settings.import"))
+ ProStatusPill(text: tr("pro.card.badge"), style: .locked, compact: true)
+ }
+ }
+ .buttonStyle(.bordered)
+ .disabled(isDataFilePanelPresented)
+ }
+ Text(tr("settings.backupDesc"))
+ .font(.caption)
+ .foregroundStyle(.secondary)
+ .multilineTextAlignment(.center)
+ .fixedSize(horizontal: false, vertical: true)
+ .frame(maxWidth: dataPanelWidth - dataLabelWidth - dataActionWidth - 92, alignment: .center)
+ }
+ .frame(maxWidth: .infinity, alignment: .center)
+ }
.frame(maxWidth: .infinity, alignment: .leading)
.layoutPriority(1)
- dataActionButton(
- tr("settings.applyScheme"),
- prominent: true,
- enabled: !isApplyingSystemScheme && !isResettingToUncategorized,
- action: applySelectedInitialLayout
- )
- .frame(width: dataActionWidth, alignment: .trailing)
- .layoutPriority(2)
- }
- }
-
- dataSection(minHeight: 190) {
- HStack(alignment: .top, spacing: 12) {
- dataSectionTitle(tr("settings.customLayout"))
- .padding(.top, 4)
-
- VStack(alignment: .leading, spacing: 10) {
- HStack(alignment: .firstTextBaseline, spacing: 8) {
- Text(tr("settings.previousScheme"))
- .font(.system(size: 13, weight: .semibold))
- .foregroundStyle(.secondary)
- .lineLimit(1)
- .minimumScaleFactor(0.82)
- Text(previousCategorySchemeName)
- .font(.system(size: 13, weight: .medium))
- .foregroundStyle(canRestorePreviousScheme ? .primary : .tertiary)
- .lineLimit(1)
- .truncationMode(.middle)
- .frame(maxWidth: .infinity, alignment: .leading)
- }
-
- HStack(alignment: .firstTextBaseline, spacing: 8) {
- Text(tr("settings.currentScheme"))
- .font(.system(size: 13, weight: .semibold))
- .foregroundStyle(.secondary)
- .lineLimit(1)
- .minimumScaleFactor(0.82)
- Text(currentCategorySchemeName)
- .font(.system(size: 13, weight: .medium))
- .foregroundStyle(.primary)
- .lineLimit(1)
- .truncationMode(.middle)
- .frame(maxWidth: .infinity, alignment: .leading)
- }
-
- Divider().opacity(0.35)
- .padding(.top, 2)
-
- VStack(alignment: .center, spacing: 8) {
- HStack(spacing: 12) {
- Button {
- exportTags()
- } label: {
- HStack(spacing: 8) {
- Text(tr("settings.export"))
- if !proEntitlement.isUnlocked {
- ProStatusPill(text: tr("pro.card.badge"), style: .locked, compact: true)
- }
- }
- }
- .buttonStyle(.bordered)
- .disabled(isDataFilePanelPresented)
- Button {
- importTags()
- } label: {
- HStack(spacing: 8) {
- Text(tr("settings.import"))
- if !proEntitlement.isUnlocked {
- ProStatusPill(text: tr("pro.card.badge"), style: .locked, compact: true)
- }
- }
- }
- .buttonStyle(.bordered)
- .disabled(isDataFilePanelPresented)
- }
- Text(tr("settings.backupDesc"))
- .font(.caption)
- .foregroundStyle(.secondary)
- .multilineTextAlignment(.center)
- .fixedSize(horizontal: false, vertical: true)
- .frame(maxWidth: dataPanelWidth - dataLabelWidth - dataActionWidth - 92, alignment: .center)
- }
- .frame(maxWidth: .infinity, alignment: .center)
+ dataActionButton(
+ tr("settings.restorePreviousScheme"),
+ prominent: false,
+ enabled: canRestorePreviousScheme,
+ action: restorePreviousCategoryScheme
+ )
+ .frame(width: dataActionWidth, alignment: .trailing)
+ .layoutPriority(2)
}
- .frame(maxWidth: .infinity, alignment: .leading)
- .layoutPriority(1)
-
- dataActionButton(
- tr("settings.restorePreviousScheme"),
- prominent: false,
- enabled: canRestorePreviousScheme,
- action: restorePreviousCategoryScheme
- )
- .frame(width: dataActionWidth, alignment: .trailing)
- .layoutPriority(2)
}
}
- }
- .frame(width: dataPanelWidth, alignment: .center)
+ .frame(width: dataPanelWidth, alignment: .center)
- Spacer(minLength: 30)
+ HStack(alignment: .center, spacing: 14) {
+ Text(tr("settings.bubbleDisplayScope"))
+ .font(.system(size: 13, weight: .medium))
+ .frame(width: 190, alignment: .trailing)
- HStack(alignment: .center, spacing: 14) {
- Text(tr("settings.bubbleDisplayScope"))
- .font(.system(size: 13, weight: .medium))
- .frame(width: 190, alignment: .trailing)
-
- HStack(spacing: 20) {
- bubbleScopeOption(
- tr("settings.bubbleAllApps"),
- isSelected: !showUncommonAppBubbles
- ) {
- showUncommonAppBubbles = false
+ HStack(spacing: 20) {
+ bubbleScopeOption(
+ tr("settings.bubbleAllApps"),
+ isSelected: !showUncommonAppBubbles
+ ) {
+ showUncommonAppBubbles = false
+ }
+ bubbleScopeOption(
+ tr("settings.bubbleUncommonOnly"),
+ isSelected: showUncommonAppBubbles
+ ) {
+ showUncommonAppBubbles = true
+ }
}
- bubbleScopeOption(
- tr("settings.bubbleUncommonOnly"),
- isSelected: showUncommonAppBubbles
- ) {
- showUncommonAppBubbles = true
- }
+ .frame(width: 300, alignment: .leading)
}
- .frame(width: 300, alignment: .leading)
+ .frame(width: 520, alignment: .center)
}
- .frame(width: 520, alignment: .center)
-
- Spacer(minLength: 18)
+ .frame(maxWidth: dataPanelWidth, alignment: .center)
+ .padding()
}
- .padding()
.onAppear { refreshDataState() }
- case .about:
- // Tab 6: About
- VStack(spacing: 0) {
- Spacer(minLength: 44)
-
- VStack(alignment: .center, spacing: 24) {
- proStatusCard
-
- HStack(alignment: .center, spacing: 24) {
- if let icon = NSImage(named: NSImage.applicationIconName) {
- Image(nsImage: icon)
- .resizable()
- .frame(width: 112, height: 112)
- }
- VStack(alignment: .leading, spacing: 4) {
- Text("TagLauncher")
- .font(.title2)
- .fontWeight(.semibold)
- Text(tr("app.description"))
- .font(.body)
- .foregroundStyle(.secondary)
- Text("\(tr("app.version")) \(appVersion) (\(tr("app.build")) \(buildVersion))")
- .font(.callout)
- .foregroundStyle(.tertiary)
-
- Divider()
- .padding(.vertical, 4)
-
- HStack(spacing: 8) {
- Button {
- NSWorkspace.shared.open(helpPDFURL)
- } label: {
- Label(tr("help.openPDF"), systemImage: "questionmark.circle")
- }
- .buttonStyle(.borderedProminent)
- .controlSize(.regular)
-
- Button {
- NSPasteboard.general.clearContents()
- NSPasteboard.general.setString(helpPDFURL.absoluteString, forType: .string)
- } label: {
- Image(systemName: "link")
- }
- .buttonStyle(.bordered)
- .controlSize(.regular)
- .help(tr("help.copyLink"))
- }
-
- Text(tr("help.currentLanguage"))
- .font(.caption)
- .foregroundStyle(.secondary)
- .padding(.bottom, 2)
-
- Text("万物之中，希望最美")
- .font(.caption)
- .foregroundStyle(.secondary)
- Text("永桔@shanghai3168@gmail.com")
- .font(.caption)
- .foregroundStyle(.secondary)
- }
- }
- .frame(width: dataPanelWidth, alignment: .leading)
- }
- .frame(width: dataPanelWidth, alignment: .center)
-
- Spacer(minLength: 30)
- Spacer(minLength: 18)
+ case .pro:
+ // Tab 6: Pro
+ centeredSettingsScrollContent(width: dataPanelWidth) {
+ proTabComparisonTable(width: dataPanelWidth)
}
- .padding()
+
+ case .about:
+ // Tab 7: About
+ centeredSettingsScrollContent(width: dataPanelWidth) {
+ HStack(alignment: .center, spacing: 24) {
+ if let icon = NSImage(named: NSImage.applicationIconName) {
+ Image(nsImage: icon)
+ .resizable()
+ .frame(width: 112, height: 112)
+ }
+ VStack(alignment: .leading, spacing: 4) {
+ Text("TagLauncher")
+ .font(.title2)
+ .fontWeight(.semibold)
+ Text(tr("app.description"))
+ .font(.body)
+ .foregroundStyle(.secondary)
+ Text("\(tr("app.version")) \(appVersion) (\(tr("app.build")) \(buildVersion))")
+ .font(.callout)
+ .foregroundStyle(.tertiary)
+
+ Divider()
+ .padding(.vertical, 4)
+
+ HStack(spacing: 8) {
+ Button {
+ NSWorkspace.shared.open(helpPDFURL)
+ } label: {
+ Label(tr("help.openPDF"), systemImage: "questionmark.circle")
+ }
+ .buttonStyle(.borderedProminent)
+ .controlSize(.regular)
+
+ Button {
+ NSPasteboard.general.clearContents()
+ NSPasteboard.general.setString(helpPDFURL.absoluteString, forType: .string)
+ } label: {
+ Image(systemName: "link")
+ }
+ .buttonStyle(.bordered)
+ .controlSize(.regular)
+ .help(tr("help.copyLink"))
+ }
+
+ Text(tr("help.currentLanguage"))
+ .font(.caption)
+ .foregroundStyle(.secondary)
+ .padding(.bottom, 2)
+
+ Text("万物之中，希望最美")
+ .font(.caption)
+ .foregroundStyle(.secondary)
+ Text("永桔@shanghai3168@gmail.com")
+ .font(.caption)
+ .foregroundStyle(.secondary)
+ }
+ .frame(maxWidth: 520, alignment: .leading)
+ }
+ }
}
}
.frame(maxWidth: .infinity, maxHeight: .infinity)
@@ -1492,6 +1917,11 @@
}
.onChange(of: proEntitlement.accessState) { _, newState in
handleProAccessStateChange(newState)
+ }
+ .onChange(of: selectedTab) { _, newTab in
+ if newTab != .hotkeys {
+ stopHotkeyRecording(showCancelledToast: false)
+ }
}
if isRefreshingLanguage {
@@ -1590,10 +2020,14 @@
showPendingHotkeyWarningIfNeeded()
refreshThemePreviewCountdown()
}
+ .onDisappear {
+ stopHotkeyRecording()
+ }
.onReceive(themePreviewCountdownTimer) { now in
refreshThemePreviewCountdown(now: now)
}
.onReceive(NotificationCenter.default.publisher(for: .tagLauncherHotkeyRegistrationChanged)) { _ in
+ hotkeySettingsRefreshToken = UUID()
showPendingHotkeyWarningIfNeeded()
}
.onReceive(NotificationCenter.default.publisher(for: .tagLauncherPreferencesTabRequested)) { notification in
@@ -1609,6 +2043,17 @@
}
}
}
+}
+
+private struct ProTabComparisonFeature: Identifiable {
+ var id: String { title }
+ let title: String
+ let freeStatusKey: String
+ let proLockedStatusKey: String
+ let proUnlockedStatusKey: String
+ let freeStyle: ProStatusPillStyle
+ let proLockedStyle: ProStatusPillStyle
+ let proUnlockedStyle: ProStatusPillStyle
}
private enum HotkeyStatusTone {
@@ -1637,32 +2082,27 @@
let statusTone: HotkeyStatusTone
var body: some View {
- VStack(alignment: .leading, spacing: 12) {
- HStack(alignment: .top, spacing: 12) {
- VStack(alignment: .leading, spacing: 3) {
- Text(title)
- .font(.system(size: 13, weight: .semibold))
- Text(description)
- .font(.caption)
- .foregroundStyle(.secondary)
- .fixedSize(horizontal: false, vertical: true)
- }
- .frame(maxWidth: .infinity, alignment: .leading)
-
- VStack(alignment: .leading, spacing: 4) {
- Text(displayText)
- .font(.system(size: 15, weight: .semibold))
- .lineLimit(1)
- .minimumScaleFactor(0.85)
- Text(statusText)
- .font(.system(size: 11, weight: .semibold))
- .foregroundStyle(statusTone.foreground)
- .padding(.horizontal, 8)
- .padding(.vertical, 3)
- .background(Capsule().fill(statusTone.background))
- }
- .frame(width: 180, alignment: .leading)
+ HStack(alignment: .center, spacing: 18) {
+ VStack(alignment: .leading, spacing: 3) {
+ Text(title)
+ .font(.system(size: 13, weight: .semibold))
+ Text(description)
+ .font(.caption)
+ .foregroundStyle(.secondary)
+ .fixedSize(horizontal: false, vertical: true)
}
+ .frame(maxWidth: .infinity, alignment: .leading)
+
+ HStack(alignment: .center, spacing: 12) {
+ Text(displayText)
+ .font(.system(size: 15, weight: .semibold))
+ .lineLimit(1)
+ .minimumScaleFactor(0.85)
+ .frame(width: 156, alignment: .leading)
+
+ HotkeyStatusPill(text: statusText, tone: statusTone)
+ }
+ .frame(width: 310, alignment: .leading)
}
.padding(12)
.background(
@@ -1673,6 +2113,159 @@
RoundedRectangle(cornerRadius: 8, style: .continuous)
.stroke(Color.secondary.opacity(0.14), lineWidth: 1)
)
+ }
+}
+
+private struct CustomizableHotkeyInfoRow: View {
+ let title: String
+ let description: String
+ let displayText: String
+ let statusText: String
+ let statusTone: HotkeyStatusTone
+ let customizeTitle: String
+ let proBadgeTitle: String
+ let restoreTitle: String
+ let isRecording: Bool
+ let isProLocked: Bool
+ let canRestore: Bool
+ let onCustomize: () -> Void
+ let onRestore: () -> Void
+
+ var body: some View {
+ HStack(alignment: .center, spacing: 18) {
+ VStack(alignment: .leading, spacing: 3) {
+ Text(title)
+ .font(.system(size: 13, weight: .semibold))
+ Text(description)
+ .font(.caption)
+ .foregroundStyle(.secondary)
+ .fixedSize(horizontal: false, vertical: true)
+ }
+ .frame(maxWidth: .infinity, alignment: .leading)
+
+ HStack(alignment: .center, spacing: 12) {
+ VStack(alignment: .leading, spacing: 6) {
+ Text(isRecording ? "…" : displayText)
+ .font(.system(size: 15, weight: .semibold))
+ .lineLimit(1)
+ .minimumScaleFactor(0.85)
+
+ HStack(spacing: 6) {
+ HotkeyStatusPill(text: statusText, tone: statusTone)
+
+ if isRecording {
+ Text(tr("hotkeys.recordingInline"))
+ .font(.system(size: 11, weight: .semibold))
+ .foregroundStyle(.blue)
+ }
+
+ if !isProLocked {
+ ProStatusPill(text: proBadgeTitle, style: .locked, compact: true)
+ }
+ }
+ }
+ .frame(width: 156, alignment: .leading)
+
+ HotkeyPrimaryActionButton(
+ title: customizeTitle,
+ proBadgeTitle: proBadgeTitle,
+ isProLocked: isProLocked,
+ action: onCustomize
+ )
+
+ if canRestore {
+ HotkeySecondaryActionButton(
+ title: restoreTitle,
+ action: onRestore
+ )
+ }
+ }
+ .frame(width: 310, alignment: .leading)
+ }
+ .padding(12)
+ .background(
+ RoundedRectangle(cornerRadius: 8, style: .continuous)
+ .fill(Color(nsColor: .controlBackgroundColor))
+ )
+ .overlay(
+ RoundedRectangle(cornerRadius: 8, style: .continuous)
+ .stroke(Color.secondary.opacity(0.14), lineWidth: 1)
+ )
+ }
+}
+
+private struct HotkeyStatusPill: View {
+ let text: String
+ let tone: HotkeyStatusTone
+
+ var body: some View {
+ Text(text)
+ .font(.system(size: 11, weight: .semibold))
+ .foregroundStyle(tone.foreground)
+ .lineLimit(1)
+ .padding(.horizontal, 8)
+ .padding(.vertical, 3)
+ .background(Capsule().fill(tone.background))
+ }
+}
+
+private struct HotkeyPrimaryActionButton: View {
+ let title: String
+ let proBadgeTitle: String
+ let isProLocked: Bool
+ let action: () -> Void
+
+ var body: some View {
+ if isProLocked {
+ Button(action: action) {
+ HStack(spacing: 8) {
+ Text(title)
+ .lineLimit(1)
+ .minimumScaleFactor(0.82)
+
+ ProStatusPill(text: proBadgeTitle, style: .locked, compact: true)
+ }
+ }
+ .buttonStyle(.bordered)
+ .contentShape(RoundedRectangle(cornerRadius: 8, style: .continuous))
+ } else {
+ Button(action: action) {
+ Text(title)
+ .font(.system(size: 11, weight: .semibold))
+ .foregroundStyle(Color.white)
+ .lineLimit(1)
+ .padding(.horizontal, 12)
+ .padding(.vertical, 6)
+ .background(
+ Capsule(style: .continuous)
+ .fill(Color.accentColor)
+ )
+ }
+ .buttonStyle(.plain)
+ .contentShape(Capsule(style: .continuous))
+ }
+ }
+}
+
+private struct HotkeySecondaryActionButton: View {
+ let title: String
+ let action: () -> Void
+
+ var body: some View {
+ Button(action: action) {
+ Text(title)
+ .font(.system(size: 11, weight: .semibold))
+ .foregroundStyle(.secondary)
+ .lineLimit(1)
+ .padding(.horizontal, 12)
+ .padding(.vertical, 6)
+ .background(
+ Capsule(style: .continuous)
+ .fill(Color.secondary.opacity(0.12))
+ )
+ }
+ .buttonStyle(.plain)
+ .contentShape(Capsule(style: .continuous))
}
}
@@ -1886,22 +2479,27 @@
let mode: String
let title: String
let isSelected: Bool
+ let accessory: ThemeOptionAccessory
let action: () -> Void
var body: some View {
Button(action: action) {
- HStack(spacing: 7) {
+ HStack(spacing: 8) {
DisplayModeGlyph(mode: mode, isSelected: isSelected)
.frame(width: 24, height: 18)
Text(title)
.font(.system(size: 13, weight: .semibold))
- .multilineTextAlignment(.center)
+ .multilineTextAlignment(.leading)
.lineLimit(2)
.minimumScaleFactor(0.82)
.foregroundStyle(isSelected ? Color.white : Color.primary)
- .frame(maxWidth: .infinity)
+ .frame(maxWidth: .infinity, alignment: .leading)
+ .layoutPriority(1)
+
+ accessoryView
+ .frame(width: 64, alignment: .trailing)
}
- .frame(maxWidth: .infinity, minHeight: 34)
+ .frame(maxWidth: .infinity, minHeight: 38)
.padding(.horizontal, 9)
.padding(.vertical, 2)
.background(
@@ -1917,6 +2515,39 @@
.buttonStyle(.plain)
.accessibilityLabel(title)
}
+
+ @ViewBuilder
+ private var accessoryView: some View {
+ switch accessory {
+ case .checkmark:
+ Image(systemName: "checkmark.circle.fill")
+ .font(.system(size: 16, weight: .semibold))
+ .foregroundStyle(isSelected ? Color.white : Color.accentColor)
+ case .circle:
+ Image(systemName: "circle")
+ .font(.system(size: 16, weight: .semibold))
+ .foregroundStyle(isSelected ? Color.white.opacity(0.74) : Color.secondary.opacity(0.42))
+ .opacity(0.001)
+ case .countdown(let text):
+ Text(text)
+ .font(.system(size: 10, weight: .semibold, design: .monospaced))
+ .foregroundStyle(Color(red: 0.30, green: 0.22, blue: 0.08))
+ .lineLimit(1)
+ .frame(minWidth: 42)
+ .padding(.horizontal, 8)
+ .padding(.vertical, 4)
+ .background(
+ Capsule(style: .continuous)
+ .fill(Color.orange.opacity(0.14))
+ )
+ .overlay(
+ Capsule(style: .continuous)
+ .stroke(Color.orange.opacity(0.28), lineWidth: 1)
+ )
+ case .pill(let text, let style):
+ ProStatusPill(text: text, style: style, compact: true)
+ }
+ }
}
private struct DisplayModeGlyph: View {
--
Gitblit v1.9.3