Skip to content

Free, open-source macOS cleaner. CleanMyMac alternative with zero telemetry. Native SwiftUI, scheduled auto-cleaning, Xcode/Homebrew/system cache cleanup. MIT licensed.

feat: CleanMyMac-grade UI + animation overhaul (v2.8.0, build 15)

moamencda8791dd3ca
diff --git a/PureMac/Services/Haptics.swift b/PureMac/Services/Haptics.swift
index f229695..7a5c3f2 100644
--- a/PureMac/Services/Haptics.swift
+++ b/PureMac/Services/Haptics.swift
@@ -25,6 +25,32 @@ enum Haptics {
perform(.generic)
}
+ /// Defaults key for the user-facing "Play sound effects" toggle
+ /// (Settings → General). Defaults to on.
+ static let soundEffectsKey = "PureMac.SoundEffects"
+
+ private static var soundEnabled: Bool {
+ UserDefaults.standard.object(forKey: soundEffectsKey) as? Bool ?? true
+ }
+
+ /// Completion beat: haptic + the system "Glass" chime in one call so the
+ /// two always land together. The sound intentionally still plays under
+ /// Reduce Motion — there it stands in for the suppressed confetti.
+ static func successWithSound() {
+ success()
+ if soundEnabled {
+ NSSound(named: "Glass")?.play()
+ }
+ }
+
+ /// Failure beat: haptic + the system "Basso" thud.
+ static func errorWithSound() {
+ generic()
+ if soundEnabled {
+ NSSound(named: "Basso")?.play()
+ }
+ }
+
private static func perform(_ pattern: NSHapticFeedbackManager.FeedbackPattern) {
NSHapticFeedbackManager.defaultPerformer.perform(pattern, performanceTime: .now)
}
diff --git a/PureMac/Services/ScanEngine.swift b/PureMac/Services/ScanEngine.swift
index 81d2249..5c74cc9 100644
--- a/PureMac/Services/ScanEngine.swift
+++ b/PureMac/Services/ScanEngine.swift
@@ -4,6 +4,22 @@ actor ScanEngine {
private let fileManager = FileManager.default
private let home = FileManager.default.homeDirectoryForCurrentUser.path
+ /// Live path reporter for the dashboard's scanning ticker. Throttled so
+ /// a directory with thousands of entries doesn't flood the main actor.
+ private var onPath: (@Sendable (String) -> Void)?
+ private var lastReport = Date.distantPast
+
+ /// `path` is an autoclosure so the String is only materialized after the
+ /// throttle gate passes — a deep home-directory walk enumerates hundreds
+ /// of thousands of entries and only ~12/sec are ever displayed.
+ private func report(_ path: @autoclosure () -> String) {
+ guard let onPath else { return }
+ let now = Date()
+ guard now.timeIntervalSince(lastReport) > 0.08 else { return }
+ lastReport = now
+ onPath(path())
+ }
+
private struct CleanupTarget {
let name: String
let path: String
@@ -20,7 +36,12 @@ actor ScanEngine {
// MARK: - Public API
- func scanCategory(_ category: CleaningCategory) async -> CategoryResult {
+ func scanCategory(
+ _ category: CleaningCategory,
+ onPath: (@Sendable (String) -> Void)? = nil
+ ) async -> CategoryResult {
+ self.onPath = onPath
+ defer { self.onPath = nil }
switch category {
case .smartScan:
return CategoryResult(category: category, items: [], totalSize: 0)
@@ -253,6 +274,7 @@ actor ScanEngine {
// checkouts) would never see anything past entry 5k — the
// scattered 100+ MB files were always past that bound.
for case let fileURL as URL in enumerator {
+ report(fileURL.path)
guard let resourceValues = try? fileURL.resourceValues(forKeys: [.fileSizeKey, .contentModificationDateKey, .isRegularFileKey]),
let isFile = resourceValues.isRegularFile, isFile,
let fileSize = resourceValues.fileSize
@@ -686,6 +708,7 @@ actor ScanEngine {
let contents = try fileManager.contentsOfDirectory(atPath: path)
for item in contents {
let fullPath = (path as NSString).appendingPathComponent(item)
+ report(fullPath)
if excludedPaths.contains(normalizePath(fullPath)) {
continue
}
@@ -740,6 +763,7 @@ actor ScanEngine {
isSelected: Bool = true,
minimumSize: Int64 = 1024
) -> CleanableItem? {
+ report(path)
var isDirectory: ObjCBool = false
guard fileManager.fileExists(atPath: path, isDirectory: &isDirectory),
fileManager.isReadableFile(atPath: path) else { return nil }
@@ -803,6 +827,7 @@ actor ScanEngine {
count += 1
if count > 10000 { break } // Safety limit for very large directories
+ report(fileURL.path)
guard let values = try? fileURL.resourceValues(forKeys: [.fileSizeKey, .isRegularFileKey]),
let isFile = values.isRegularFile, isFile,
let size = values.fileSize else { continue }
diff --git a/PureMac/ViewModels/AppState.swift b/PureMac/ViewModels/AppState.swift
index 3c90b85..b1725fd 100644
--- a/PureMac/ViewModels/AppState.swift
+++ b/PureMac/ViewModels/AppState.swift
@@ -46,6 +46,9 @@ final class AppState: ObservableObject {
@Published var scanProgress: Double = 0
@Published var cleanProgress: Double = 0
@Published var currentScanCategory: String = ""
+ /// Last filesystem path the scan engine touched — feeds the dashboard's
+ /// live ticker. Throttled at the engine side (~10Hz).
+ @Published var currentScanPath: String = ""
@Published var showCleanConfirmation = false
@Published var lastCleanedDate: Date?
@Published var selectedCleanupItems: Set<UUID> = []
@@ -351,7 +354,16 @@ final class AppState: ObservableObject {
private func applyRemovedAppFiles(_ urls: [URL]) {
guard !urls.isEmpty else { return }
- discoveredFiles.removeAll { urls.contains($0) }
+ // Animate the row sweep-out (AppFilesView attaches the per-row
+ // transitions). NSWorkspace is the Reduce Motion check available
+ // outside a View's Environment.
+ if NSWorkspace.shared.accessibilityDisplayShouldReduceMotion {
+ discoveredFiles.removeAll { urls.contains($0) }
+ } else {
+ withAnimation(.spring(response: 0.35, dampingFraction: 0.8)) {
+ discoveredFiles.removeAll { urls.contains($0) }
+ }
+ }
selectedFiles.subtract(urls)
Logger.shared.log("Removed \(urls.count) file\(urls.count == 1 ? "" : "s")", level: .info)
}
@@ -751,12 +763,17 @@ final class AppState: ObservableObject {
currentScanCategory = category.rawValue
scanState = .scanning(progress: progress, currentCategory: category.rawValue)
- let result = await scanEngine.scanCategory(category)
+ let result = await scanEngine.scanCategory(category) { [weak self] path in
+ Task { @MainActor [weak self] in
+ self?.currentScanPath = path
+ }
+ }
categoryResults[category] = result
totalJunkSize += result.totalSize
}
scanProgress = 1.0
+ currentScanPath = ""
scanState = .completed
loadDiskInfo()
}
@@ -771,11 +788,16 @@ final class AppState: ObservableObject {
Task {
scanProgress = 0.5
clearSelectionState(for: category)
- let result = await scanEngine.scanCategory(category)
+ let result = await scanEngine.scanCategory(category) { [weak self] path in
+ Task { @MainActor [weak self] in
+ self?.currentScanPath = path
+ }
+ }
categoryResults[category] = result
totalJunkSize = categoryResults.values.reduce(0) { $0 + $1.totalSize }
scanProgress = 1.0
+ currentScanPath = ""
scanState = .completed
}
}
@@ -811,7 +833,7 @@ final class AppState: ObservableObject {
totalFreedSpace = result.freedSpace
lastCleanedDate = Date()
- if result.itemsCleaned > 0 { Haptics.success() }
+ if result.itemsCleaned > 0 { Haptics.successWithSound() }
let survivors = itemsToClean.filter { !result.cleanedPaths.contains($0.path) }
diff --git a/PureMac/Views/Apps/AppFilesView.swift b/PureMac/Views/Apps/AppFilesView.swift
index 5900def..9e17752 100644
--- a/PureMac/Views/Apps/AppFilesView.swift
+++ b/PureMac/Views/Apps/AppFilesView.swift
@@ -1,98 +1,112 @@
import SwiftUI
+/// View-side grouping of discovered leftovers into CleanMyMac-style buckets.
+/// Purely presentational — AppState's flat `discoveredFiles` stays the source
+/// of truth so the removal/selection logic is untouched.
+enum LeftoverGroup: String, CaseIterable, Identifiable {
+ case application = "Application"
+ case caches = "Caches"
+ case appSupport = "Application Support"
+ case preferences = "Preferences"
+ case logs = "Logs"
+ case containers = "Containers"
+ case launchAgents = "Launch Agents"
+ case other = "Other Files"
+
+ var id: String { rawValue }
+
+ var icon: String {
+ switch self {
+ case .application: return "app.fill"
+ case .caches: return "internaldrive.fill"
+ case .appSupport: return "shippingbox.fill"
+ case .preferences: return "gearshape.fill"
+ case .logs: return "doc.text.fill"
+ case .containers: return "cube.box.fill"
+ case .launchAgents: return "bolt.fill"
+ case .other: return "doc.fill"
+ }
+ }
+
+ var tint: Color {
+ switch self {
+ case .application: return Tint.blue
+ case .caches: return Tint.orange
+ case .appSupport: return Tint.purple
+ case .preferences: return Tint.cyan
+ case .logs: return Tint.yellow
+ case .containers: return Tint.pink
+ case .launchAgents: return Tint.red
+ case .other: return Tint.green
+ }
+ }
+
+ static func categorize(_ url: URL) -> LeftoverGroup {
+ let path = url.path
+ if path.hasSuffix(".app") { return .application }
+ if path.contains("/Caches/") { return .caches }
+ if path.contains("/Application Support/") { return .appSupport }
+ if path.contains("/Preferences/") { return .preferences }
+ if path.contains("/Logs/") || path.contains("/DiagnosticReports/") { return .logs }
+ if path.contains("/Containers/") || path.contains("/Group Containers/") { return .containers }
+ if path.contains("/LaunchAgents/") || path.contains("/LaunchDaemons/") { return .launchAgents }
+ return .other
+ }
+}
+
struct AppFilesView: View {
@EnvironmentObject var appState: AppState
let app: InstalledApp
+ @State private var collapsedGroups: Set<LeftoverGroup> = []
+ @State private var iconHovering = false
+ /// One-pass size cache so group headers and the selected-size counter
+ /// don't re-stat the disk on every render.
+ @State private var sizeCache: [URL: Int64] = [:]
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
+
private var totalSelectedSize: Int64 {
appState.selectedFiles.reduce(Int64(0)) { total, url in
- total + (fileSize(url) ?? 0)
+ total + (cachedSize(url) ?? 0)
+ }
+ }
+
+ /// Discovered files bucketed for display, preserving the sorted order
+ /// inside each bucket. Only non-empty groups are shown.
+ private var groupedFiles: [(group: LeftoverGroup, urls: [URL])] {
+ let buckets = Dictionary(grouping: appState.discoveredFiles, by: LeftoverGroup.categorize)
+ return LeftoverGroup.allCases.compactMap { group in
+ guard let urls = buckets[group], !urls.isEmpty else { return nil }
+ return (group, urls)
}
}
var body: some View {
VStack(spacing: 0) {
- // App header
- HStack(spacing: 12) {
- Image(nsImage: app.icon)
- .resizable()
- .frame(width: 48, height: 48)
-
- VStack(alignment: .leading, spacing: 2) {
- Text(app.appName)
- .font(.title3.bold())
- Text(app.bundleIdentifier)
- .font(.caption)
- .foregroundStyle(.secondary)
- }
-
- Spacer()
-
- if !appState.discoveredFiles.isEmpty {
- VStack(alignment: .trailing, spacing: 2) {
- Text(filesCountText(count: appState.discoveredFiles.count))
- .font(.callout)
- .foregroundStyle(.secondary)
- Text(ByteCountFormatter.string(fromByteCount: totalSelectedSize, countStyle: .file))
- .font(.callout.bold())
- }
- }
- }
- .padding()
+ header
Divider()
// Content
if appState.isScanningAppFiles {
- VStack(spacing: 12) {
- Spacer()
- ProgressView(LocalizedStringKey("Scanning for related files..."))
- Text(checkingLocationsText(count: appState.currentAppFileSearchLocationCount))
- .font(.caption)
- .foregroundStyle(.secondary)
- Spacer()
- }
- .frame(maxWidth: .infinity, maxHeight: .infinity)
+ scanningState
} else if appState.discoveredFiles.isEmpty {
EmptyStateView(
"No Related Files",
systemImage: "checkmark.circle",
description: LocalizedStringKey(
String(format: String(localized: "No additional files found for %@."), app.appName)
- )
+ ),
+ tint: Tint.green
)
} else {
- List(appState.discoveredFiles, id: \.self) { fileURL in
- FileRow(
- fileURL: fileURL,
- isSelected: fileSelectionBinding(for: fileURL),
- fileSize: fileSize(fileURL),
- onRemove: { removeSingleFile(fileURL) }
- )
- }
-
- // Bottom action bar
- HStack {
- Button("Select All") {
- appState.selectedFiles = Set(appState.discoveredFiles)
- }
- Button("Deselect All") {
- appState.selectedFiles.removeAll()
- }
-
- Spacer()
+ fileGroupsList
- if !appState.selectedFiles.isEmpty {
- Button(removeFilesLabel, role: .destructive) {
- appState.removeSelectedFiles()
- }
- .buttonStyle(.borderedProminent)
- .tint(.red)
- }
- }
- .padding()
+ actionBar
}
}
+ .onAppear { rebuildSizeCache() }
+ .onChange(of: appState.discoveredFiles) { _ in rebuildSizeCache() }
.onChange(of: appState.removalNeedsFullDiskAccess) { needs in
// FDA-fixable removals jump straight into the rich sheet, the
// same flow cleanup uses. The user grants permission once and we
@@ -128,6 +142,193 @@ struct AppFilesView: View {
}
}
+ // MARK: - Header
+
+ private var header: some View {
+ HStack(spacing: 12) {
+ Image(nsImage: app.icon)
+ .resizable()
+ .frame(width: 48, height: 48)
+ .scaleEffect(iconHovering && !reduceMotion ? 1.06 : 1)
+ .animation(reduceMotion ? nil : MotionTokens.snappy, value: iconHovering)
+ .onHover { iconHovering = $0 }
+
+ VStack(alignment: .leading, spacing: 2) {
+ Text(app.appName)
+ .font(.title3.bold())
+ Text(app.bundleIdentifier)
+ .font(.caption)
+ .foregroundStyle(.secondary)
+ }
+
+ Spacer()
+
+ if !appState.discoveredFiles.isEmpty {
+ VStack(alignment: .trailing, spacing: 2) {
+ Text(filesCountText(count: appState.discoveredFiles.count))
+ .font(.callout)
+ .foregroundStyle(.secondary)
+ .monospacedDigit()
+ .contentTransition(.numericText())
+ CountUpBytes(bytes: totalSelectedSize)
+ .font(.callout.bold())
+ }
+ .animation(reduceMotion ? nil : .spring(response: 0.4, dampingFraction: 0.9),
+ value: appState.discoveredFiles.count)
+ }
+ }
+ .padding()
+ }
+
+ // MARK: - Scanning state
+
+ private var scanningState: some View {
+ VStack(spacing: 14) {
+ Spacer()
+ if reduceMotion {
+ ProgressView(LocalizedStringKey("Scanning for related files..."))
+ } else {
+ SearchPulse()
+ Text("Scanning for related files...")
+ .font(.system(size: 13, weight: .medium))
+ }
+ Text(checkingLocationsText(count: appState.currentAppFileSearchLocationCount))
+ .font(.caption)
+ .foregroundStyle(.secondary)
+ .monospacedDigit()
+ .contentTransition(.numericText())
+ Spacer()
+ }
+ .frame(maxWidth: .infinity, maxHeight: .infinity)
+ }
+
+ // MARK: - Grouped list
+
+ private var fileGroupsList: some View {
+ List {
+ ForEach(groupedFiles, id: \.group) { entry in
+ DisclosureGroup(isExpanded: groupExpansionBinding(entry.group)) {
+ // No .staggered() inside the lazy List — a delayed reveal
+ // would blank rows as they scroll in. The removal
+ // transition still sweeps deleted rows out.
+ ForEach(entry.urls, id: \.self) { fileURL in
+ FileRow(
+ fileURL: fileURL,
+ isSelected: fileSelectionBinding(for: fileURL),
+ fileSize: cachedSize(fileURL),
+ onRemove: { removeSingleFile(fileURL) }
+ )
+ .transition(
+ reduceMotion
+ ? .opacity
+ : .asymmetric(
+ insertion: .opacity,
+ removal: .move(edge: .leading).combined(with: .opacity)
+ )
+ )
+ }
+ } label: {
+ groupHeader(entry.group, urls: entry.urls)
+ }
+ }
+ }
+ .id(app.id)
+ }
+
+ private func groupHeader(_ group: LeftoverGroup, urls: [URL]) -> some View {
+ let groupSize = urls.reduce(Int64(0)) { $0 + (cachedSize($1) ?? 0) }
+ let allSelected = urls.allSatisfy { appState.selectedFiles.contains($0) }
+
+ return HStack(spacing: 10) {
+ Toggle(isOn: Binding(
+ get: { allSelected },
+ set: { selected in
+ if selected {
+ appState.selectedFiles.formUnion(urls)
+ } else {
+ appState.selectedFiles.subtract(urls)
+ }
+ }
+ )) {
+ EmptyView()
+ }
+ .toggleStyle(AnimatedCheckboxStyle())
+ .labelsHidden()
+
+ IconTile(systemName: group.icon, tint: group.tint, size: 22, corner: 6)
+ Text(LocalizedStringKey(group.rawValue))
+ .font(.system(size: 12.5, weight: .semibold))
+ Text("\(urls.count)")
+ .font(.system(size: 11, weight: .semibold))
+ .monospacedDigit()
+ .foregroundStyle(.secondary)
+ .padding(.horizontal, 6)
+ .padding(.vertical, 1)
+ .background(Capsule().fill(Color.primary.opacity(0.06)))
+ Spacer()
+ Text(ByteCountFormatter.string(fromByteCount: groupSize, countStyle: .file))
+ .font(.system(size: 12, weight: .semibold))
+ .monospacedDigit()
+ .foregroundStyle(.secondary)
+ }
+ .padding(.vertical, 2)
+ }
+
+ private func groupExpansionBinding(_ group: LeftoverGroup) -> Binding<Bool> {
+ Binding(
+ get: { !collapsedGroups.contains(group) },
+ set: { expanded in
+ let change = {
+ if expanded {
+ collapsedGroups.remove(group)
+ } else {
+ collapsedGroups.insert(group)
+ }
+ }
+ if reduceMotion {
+ change()
+ } else {
+ withAnimation(.spring(response: 0.4, dampingFraction: 0.85)) { change() }
+ }
+ }
+ )
+ }
+
+ // MARK: - Action bar
+
+ private var actionBar: some View {
+ HStack {
+ Button("Select All") {
+ appState.selectedFiles = Set(appState.discoveredFiles)
+ }
+ Button("Deselect All") {
+ appState.selectedFiles.removeAll()
+ }
+
+ Spacer()
+
+ if !appState.selectedFiles.isEmpty {
+ Button(role: .destructive) {
+ appState.removeSelectedFiles()
+ } label: {
+ Text(removeFilesLabel)
+ }
+ .buttonStyle(GlowProminentButtonStyle(tint: Tint.red, gradient: TintGradient.destructive))
+ .transition(
+ reduceMotion
+ ? .opacity
+ : .move(edge: .trailing).combined(with: .opacity)
+ )
+ }
+ }
+ .animation(reduceMotion ? nil : .spring(response: 0.35, dampingFraction: 0.8),
+ value: appState.selectedFiles.isEmpty)
+ .padding()
+ .background(.bar)
+ }
+
+ // MARK: - Helpers
+
private func filesCountText(count: Int) -> String {
String(format: String(localized: "%lld files"), Int64(count))
}
@@ -157,6 +358,19 @@ struct AppFilesView: View {
)
}
+ private func cachedSize(_ url: URL) -> Int64? {
+ if let cached = sizeCache[url] { return cached }
+ return fileSize(url)
+ }
+
+ private func rebuildSizeCache() {
+ var cache: [URL: Int64] = [:]
+ for url in appState.discoveredFiles {
+ cache[url] = fileSize(url) ?? 0
+ }
+ sizeCache = cache
+ }
+
private func fileSize(_ url: URL) -> Int64? {
// totalFileAllocatedSize recurses into directories; attributesOfItem
// returns the directory's own metadata size (≈0), which is why
@@ -180,6 +394,38 @@ struct AppFilesView: View {
}
}
+/// Magnifier over expanding sonar rings — the "actively searching" beat for
+/// the related-files scan. Only built when Reduce Motion is off.
+private struct SearchPulse: View {
+ @State private var pulse = false
+
+ var body: some View {
+ ZStack {
+ ForEach(0..<2, id: \.self) { i in
+ Circle()
+ .stroke(Tint.blue.opacity(0.35), lineWidth: 1.5)
+ .frame(width: 44, height: 44)
+ .scaleEffect(pulse ? 1.8 : 1.0)
+ .opacity(pulse ? 0 : 0.7)
+ .animation(
+ .easeOut(duration: 1.4)
+ .repeatForever(autoreverses: false)
+ .delay(Double(i) * 0.7),
+ value: pulse
+ )
+ }
+ Circle()
+ .fill(Tint.blue.opacity(0.12))
+ .frame(width: 44, height: 44)
+ Image(systemName: "magnifyingglass")
+ .font(.system(size: 18, weight: .semibold))
+ .foregroundStyle(Tint.blue)
+ }
+ .frame(width: 56, height: 56)
+ .onAppear { pulse = true }
+ }
+}
+
// MARK: - File Row with hover-to-reveal actions
struct FileRow: View {
@@ -190,6 +436,7 @@ struct FileRow: View {
@State private var isHovering = false
@State private var showConfirmation = false
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
var body: some View {
Toggle(isOn: $isSelected) {
@@ -210,29 +457,33 @@ struct FileRow: View {
Spacer()
- if isHovering {
- Button {
- NSWorkspace.shared.selectFile(fileURL.path, inFileViewerRootedAtPath: "")
- } label: {
- Image(systemName: "folder")
- .font(.caption)
- .foregroundStyle(.secondary)
- }
- .buttonStyle(.plain)
- .help("Reveal in Finder")
- .transition(.opacity)
-
- Button {
- showConfirmation = true
- } label: {
- Image(systemName: "trash")
- .font(.caption)
- .foregroundStyle(.red)
- }
- .buttonStyle(.plain)
- .help("Remove this file")
- .transition(.opacity)
+ // Buttons stay in the layout permanently and fade with
+ // hover, so the trailing size badge never jumps sideways.
+ Button {
+ NSWorkspace.shared.selectFile(fileURL.path, inFileViewerRootedAtPath: "")
+ } label: {
+ Image(systemName: "folder")
+ .font(.caption)
+ .foregroundStyle(.secondary)
}
+ .buttonStyle(.plain)
+ .help("Reveal in Finder")
+ .opacity(isHovering ? 1 : 0)
+ .scaleEffect(reduceMotion ? 1 : (isHovering ? 1 : 0.8))
+ .allowsHitTesting(isHovering)
+
+ Button {
+ showConfirmation = true
+ } label: {
+ Image(systemName: "trash")
+ .font(.caption)
+ .foregroundStyle(.red)
+ }
+ .buttonStyle(.plain)
+ .help("Remove this file")
+ .opacity(isHovering ? 1 : 0)
+ .scaleEffect(reduceMotion ? 1 : (isHovering ? 1 : 0.8))
+ .allowsHitTesting(isHovering)
if let size = fileSize {
Text(ByteCountFormatter.string(fromByteCount: size, countStyle: .file))
@@ -241,16 +492,16 @@ struct FileRow: View {
}
}
}
- .toggleStyle(.checkbox)
+ .toggleStyle(AnimatedCheckboxStyle())
.padding(.vertical, 2)
.padding(.horizontal, 4)
.background(
RoundedRectangle(cornerRadius: 6)
- .fill(isHovering ? Color.primary.opacity(0.04) : Color.clear)
+ .fill(isHovering ? Color.primary.opacity(0.06) : Color.clear)
)
- .onHover { hovering in
- withAnimation(.easeInOut(duration: 0.15)) { isHovering = hovering }
- }
+ .scaleEffect(isHovering && !reduceMotion ? 1.01 : 1)
+ .animation(reduceMotion ? nil : MotionTokens.snappy, value: isHovering)
+ .onHover { isHovering = $0 }
.alert(
Text(
String(format: String(localized: "Remove %@?"), fileURL.lastPathComponent)
diff --git a/PureMac/Views/Apps/AppListView.swift b/PureMac/Views/Apps/AppListView.swift
index 1131432..b2dad5c 100644
--- a/PureMac/Views/Apps/AppListView.swift
+++ b/PureMac/Views/Apps/AppListView.swift
@@ -4,6 +4,7 @@ struct AppListView: View {
@EnvironmentObject var appState: AppState
@State private var searchText = ""
@State private var selection: InstalledApp.ID?
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
@State private var sortOrder: [KeyPathComparator<InstalledApp>] = [
.init(\.appName, order: .forward)
]
@@ -42,13 +43,17 @@ struct AppListView: View {
Label("Refresh", systemImage: "arrow.clockwise")
}
- if !appState.selectedFiles.isEmpty {
- Button(uninstallLabel(count: appState.selectedFiles.count), role: .destructive) {
- appState.removeSelectedFiles()
- }
- .buttonStyle(.borderedProminent)
- .tint(.red)
+ // ToolbarItems can't run insertion transitions on macOS 13 —
+ // keep the button mounted and fade it with the selection.
+ Button(uninstallLabel(count: appState.selectedFiles.count), role: .destructive) {
+ appState.removeSelectedFiles()
}
+ .buttonStyle(.borderedProminent)
+ .tint(.red)
+ .opacity(appState.selectedFiles.isEmpty ? 0 : 1)
+ .disabled(appState.selectedFiles.isEmpty)
+ .animation(reduceMotion ? nil : .spring(response: 0.35, dampingFraction: 0.8),
+ value: appState.selectedFiles.isEmpty)
}
}
}
@@ -82,9 +87,7 @@ struct AppListView: View {
Table(filteredApps, selection: $selection, sortOrder: $sortOrder) {
TableColumn("Application", value: \.appName) { app in
HStack(spacing: 8) {
- Image(nsImage: app.icon)
- .resizable()
- .frame(width: 20, height: 20)
+ HoverScaleIcon(icon: app.icon)
Text(app.appName)
}
}
@@ -134,8 +137,26 @@ struct AppListView: View {
EmptyStateView(
"Select an App",
systemImage: "cursorarrow.click.2",
- description: "Select an app from the list to see all its related files across your system."
+ description: "Select an app from the list to see all its related files across your system.",
+ tint: Tint.purple
)
}
}
}
+
+/// App icon that scales up slightly on hover inside a Table cell.
+private struct HoverScaleIcon: View {
+ let icon: NSImage
+
+ @State private var hovering = false
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
+
+ var body: some View {
+ Image(nsImage: icon)
+ .resizable()
+ .frame(width: 20, height: 20)
+ .scaleEffect(hovering && !reduceMotion ? 1.12 : 1)
+ .animation(reduceMotion ? nil : MotionTokens.snappy, value: hovering)
+ .onHover { hovering = $0 }
+ }
+}
diff --git a/PureMac/Views/CategoryDetailView.swift b/PureMac/Views/CategoryDetailView.swift
index 77b2959..d87e62b 100644
--- a/PureMac/Views/CategoryDetailView.swift
+++ b/PureMac/Views/CategoryDetailView.swift
@@ -7,6 +7,7 @@ struct CategoryDetailView: View {
@State private var sortDescending: Bool = true
@State private var searchText = ""
@State private var showConfirmation = false
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
private var result: CategoryResult? {
appState.categoryResults[category]
@@ -22,12 +23,12 @@ struct CategoryDetailView: View {
Group {
if let result = result {
if result.items.isEmpty {
- EmptyStateView("All Clean", systemImage: "checkmark.circle", description: "No junk files found in this category.")
+ EmptyStateView("All Clean", systemImage: "checkmark.circle", description: "No junk files found in this category.", tint: Tint.green)
} else {
fileList(result)
}
} else {
- EmptyStateView("Not Scanned", systemImage: category.icon, description: "Run a scan to analyze this category.", action: { appState.scanSingleCategory(category) }, actionLabel: "Scan Now")
+ EmptyStateView("Not Scanned", systemImage: category.icon, description: "Run a scan to analyze this category.", action: { appState.scanSingleCategory(category) }, actionLabel: "Scan Now", tint: category.color)
}
}
}
@@ -121,8 +122,11 @@ struct CategoryDetailView: View {
if itemCount > 0 {
Text(itemsAndSizeText(itemCount: itemCount, totalSize: totalSize))
.font(.system(size: 11.5, weight: .medium))
+ .monospacedDigit()
+ .contentTransition(reduceMotion ? .identity : .numericText())
.foregroundStyle(category.color)
.padding(.top, 2)
+ .animation(reduceMotion ? nil : MotionTokens.gentle, value: totalSize)
}
}
@@ -167,7 +171,12 @@ struct CategoryDetailView: View {
}
return List {
Section {
- ForEach(items) { item in
+ // No .staggered() here: List is lazy, so a delayed-reveal
+ // modifier would blank each row for ~0.45s as it scrolls into
+ // view on large scans. The row hover/selection polish carries
+ // the motion; the list-level sort/filter animation handles
+ // reorders.
+ ForEach(Array(items.enumerated()), id: \.element.id) { _, item in
FileRowView(item: item)
}
} header: {
@@ -180,8 +189,15 @@ struct CategoryDetailView: View {
Int64(totalCount)
)
)
+ .monospacedDigit()
+ .contentTransition(reduceMotion ? .identity : .numericText())
+ .animation(reduceMotion ? nil : MotionTokens.gentle, value: selectedCount)
}
}
+ // CleanableItem ids are stable, so SwiftUI move-animates re-sorts and
+ // fades filtered rows instead of snapping.
+ .animation(reduceMotion ? nil : .spring(response: 0.4, dampingFraction: 0.85), value: sortDescending)
+ .animation(reduceMotion ? nil : .easeOut(duration: 0.2), value: searchText)
}
private func sortedItems(_ items: [CleanableItem]) -> [CleanableItem] {
@@ -195,6 +211,9 @@ private struct FileRowView: View {
@EnvironmentObject var appState: AppState
let item: CleanableItem
+ @State private var hovering = false
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
+
private var isSelected: Bool {
appState.isItemSelected(item)
}
@@ -234,10 +253,24 @@ private struct FileRowView: View {
Text(item.formattedSize)
.font(.callout)
.fontWeight(.medium)
+ .monospacedDigit()
.frame(width: 80, alignment: .trailing)
}
}
- .toggleStyle(.checkbox)
+ .toggleStyle(AnimatedCheckboxStyle(tint: item.category.color))
+ .padding(.vertical, 2)
+ .padding(.horizontal, 4)
+ .background(
+ RoundedRectangle(cornerRadius: 6, style: .continuous)
+ .fill(
+ hovering
+ ? Color.primary.opacity(0.06)
+ : (isSelected ? item.category.color.opacity(0.04) : .clear)
+ )
+ )
+ .animation(reduceMotion ? nil : MotionTokens.snappy, value: hovering)
+ .animation(reduceMotion ? nil : .easeOut(duration: 0.15), value: isSelected)
+ .onHover { hovering = $0 }
.contextMenu {
if !item.path.isEmpty {
Button("Reveal in Finder") {
diff --git a/PureMac/Views/Components/AppTheme.swift b/PureMac/Views/Components/AppTheme.swift
index b45b4e6..cd1ba0a 100644
--- a/PureMac/Views/Components/AppTheme.swift
+++ b/PureMac/Views/Components/AppTheme.swift
@@ -57,50 +57,96 @@ enum Tint {
static let yellow = Color(red: 1.00, green: 0.78, blue: 0.04)
}
+/// Shared animation vocabulary so every surface moves with the same feel.
+/// Hover/selection feedback uses `snappy`, entrances and state swaps use
+/// `gentle`, press acknowledgment uses `press`.
+enum MotionTokens {
+ static let snappy = Animation.spring(response: 0.3, dampingFraction: 0.7)
+ static let gentle = Animation.spring(response: 0.5, dampingFraction: 0.85)
+ static let press = Animation.easeOut(duration: 0.12)
+}
+
+/// Gradient pairs built from the flat `Tint` palette. Reserved for primary
+/// CTAs and focal chrome — secondary surfaces stay flat.
+enum TintGradient {
+ static let accent = LinearGradient(
+ colors: [Tint.blue, Tint.purple],
+ startPoint: .topLeading, endPoint: .bottomTrailing
+ )
+ static let destructive = LinearGradient(
+ colors: [Tint.red, Tint.red.opacity(0.8)],
+ startPoint: .top, endPoint: .bottom
+ )
+ static func of(_ color: Color) -> LinearGradient {
+ LinearGradient(colors: [color, color.opacity(0.65)], startPoint: .top, endPoint: .bottom)
+ }
+}
+
/// Tinted square icon container used in the sidebar and on dashboard cards.
-/// Single muted fill, thin border. The tint identifies the category - it
-/// doesn't need to glow.
+/// Single muted fill, thin border. When `glow` is set (selected sidebar row,
+/// emphasized card) the tile picks up a gradient fill and a soft tinted halo.
struct IconTile: View {
let systemName: String
var tint: Color = Tint.blue
var size: CGFloat = 26
var corner: CGFloat = 7
- /// Retained for callsite compatibility; intentionally a no-op in the
- /// restrained design so call sites don't have to change.
var glow: Bool = false
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
+
var body: some View {
ZStack {
RoundedRectangle(cornerRadius: corner, style: .continuous)
- .fill(tint.opacity(0.14))
+ .fill(
+ LinearGradient(
+ colors: [tint.opacity(glow ? 0.30 : 0.14), tint.opacity(0.14)],
+ startPoint: .topLeading, endPoint: .bottomTrailing
+ )
+ )
+ .shadow(color: tint.opacity(glow ? 0.45 : 0), radius: glow ? 5 : 0)
Image(systemName: systemName)
.font(.system(size: size * 0.52, weight: .semibold))
.foregroundStyle(tint)
+ .shadow(color: tint.opacity(glow ? 0.5 : 0), radius: glow ? 3 : 0)
}
.frame(width: size, height: size)
+ .animation(reduceMotion ? nil : MotionTokens.snappy, value: glow)
}
}
/// Card surface. Flat fill, hairline border, single soft shadow. No accent
/// stripe by default — content hierarchy carries the meaning, not chrome.
+/// Pass `material` for a vibrancy/glass panel (used on focal hero states
+/// where a tinted backdrop sits behind the card).
struct CardSurface<Content: View>: View {
var padding: CGFloat = 16
/// Retained for callsite compatibility; the accent line is intentionally
/// not rendered in the restrained design.
var accent: Color? = nil
var elevation: CardElevation = .standard
+ var material: Material? = nil
@ViewBuilder var content: Content
var body: some View {
content
.padding(padding)
.background(
- RoundedRectangle(cornerRadius: 12, style: .continuous)
- .fill(Color(nsColor: .controlBackgroundColor))
+ ZStack {
+ if let material {
+ RoundedRectangle(cornerRadius: 12, style: .continuous)
+ .fill(material)
+ } else {
+ RoundedRectangle(cornerRadius: 12, style: .continuous)
+ .fill(Color(nsColor: .controlBackgroundColor))
+ }
+ }
)
.overlay(
RoundedRectangle(cornerRadius: 12, style: .continuous)
- .strokeBorder(Color.primary.opacity(0.07), lineWidth: 0.5)
+ .strokeBorder(
+ material != nil ? Color.white.opacity(0.14) : Color.primary.opacity(0.07),
+ lineWidth: material != nil ? 1 : 0.5
+ )
)
.shadow(color: .black.opacity(elevation.ambient), radius: elevation.ambientRadius, y: elevation.ambientY)
}
@@ -157,17 +203,26 @@ struct StatusChip: View {
}
}
-/// Subtle hover/press feedback for tappable cards. Scale only — no glow.
+/// Hover/press feedback for tappable cards. Plain mode is a subtle scale;
+/// `lift` mode adds the CleanMyMac-style float (rise + soft shadow). Under
+/// Reduce Motion the scale/offset are dropped and only the shadow remains.
struct PressableScale: ViewModifier {
@State private var hovering = false
@State private var pressing = false
var hoverScale: CGFloat = 1.006
+ var lift: Bool = false
+
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
func body(content: Content) -> some View {
content
- .scaleEffect(pressing ? 0.99 : (hovering ? hoverScale : 1.0))
- .animation(.easeOut(duration: 0.18), value: hovering)
- .animation(.easeOut(duration: 0.08), value: pressing)
+ .scaleEffect(reduceMotion ? 1.0 : (pressing ? 0.97 : (hovering ? (lift ? 1.02 : hoverScale) : 1.0)))
+ .offset(y: lift && hovering && !reduceMotion ? -2 : 0)
+ .shadow(color: .black.opacity(lift && hovering ? 0.12 : 0),
+ radius: lift && hovering ? 14 : 0,
+ y: lift && hovering ? 6 : 0)
+ .animation(reduceMotion ? nil : MotionTokens.snappy, value: hovering)
+ .animation(reduceMotion ? nil : MotionTokens.press, value: pressing)
.onHover { hovering = $0 }
.simultaneousGesture(
DragGesture(minimumDistance: 0)
@@ -178,7 +233,99 @@ struct PressableScale: ViewModifier {
}
extension View {
- func pressable(hoverScale: CGFloat = 1.006) -> some View {
- modifier(PressableScale(hoverScale: hoverScale))
+ func pressable(hoverScale: CGFloat = 1.006, lift: Bool = false) -> some View {
+ modifier(PressableScale(hoverScale: hoverScale, lift: lift))
+ }
+}
+
+/// Gradient capsule CTA with a soft tinted glow — the primary-action style.
+/// Hover lifts the glow and scale; press squeezes. `breathes` adds a gentle
+/// idle glow pulse (radius only, no scale) for the single hero CTA on an
+/// otherwise calm screen. All motion is suppressed under Reduce Motion.
+struct GlowProminentButtonStyle: ButtonStyle {
+ var tint: Color = Tint.blue
+ var gradient: LinearGradient = TintGradient.accent
+ var breathes: Bool = false
+
+ func makeBody(configuration: Configuration) -> some View {
+ GlowBody(configuration: configuration, tint: tint, gradient: gradient, breathes: breathes)
+ }
+
+ private struct GlowBody: View {
+ let configuration: ButtonStyleConfiguration
+ let tint: Color
+ let gradient: LinearGradient
+ let breathes: Bool
+
+ @State private var hovering = false
+ @State private var breathe = false
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
+
+ var body: some View {
+ configuration.label
+ .font(.system(size: 13, weight: .semibold))
+ .foregroundStyle(.white)
+ .padding(.horizontal, 18)
+ .padding(.vertical, 9)
+ .background(Capsule().fill(gradient))
+ .overlay(Capsule().strokeBorder(.white.opacity(0.18), lineWidth: 0.5))
+ .shadow(color: tint.opacity(hovering ? 0.45 : (breathe ? 0.40 : 0.22)),
+ radius: hovering ? 14 : (breathe ? 12 : 7), y: 3)
+ .scaleEffect(reduceMotion ? 1 : (configuration.isPressed ? 0.97 : (hovering ? 1.03 : 1)))
+ .animation(reduceMotion ? nil : MotionTokens.snappy, value: hovering)
+ .animation(reduceMotion ? nil : MotionTokens.press, value: configuration.isPressed)
+ .onHover { hovering = $0 }
+ .onAppear {
+ guard breathes, !reduceMotion else { return }
+ withAnimation(.easeInOut(duration: 1.2).repeatForever(autoreverses: true)) {
+ breathe = true
+ }
+ }
+ }
+ }
+}
+
+/// Checkbox replacement with a springy check pop. Visually matches the size
+/// of the native control so adopting it doesn't shift row layout. Keeps the
+/// native checkbox's accessibility semantics (role, checked value, Space-key
+/// toggling, VoiceOver) via accessibilityRepresentation so swapping it in
+/// doesn't regress keyboard/screen-reader users.
+struct AnimatedCheckboxStyle: ToggleStyle {
+ var tint: Color = Tint.blue
+
+ func makeBody(configuration: Configuration) -> some View {
+ CheckBody(configuration: configuration, tint: tint)
+ .accessibilityRepresentation {
+ Toggle(isOn: configuration.$isOn) { configuration.label }
+ .toggleStyle(.checkbox)
+ }
+ }
+
+ private struct CheckBody: View {
+ let configuration: ToggleStyleConfiguration
+ let tint: Color
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
+
+ var body: some View {
+ HStack(spacing: 8) {
+ ZStack {
+ RoundedRectangle(cornerRadius: 4.5, style: .continuous)
+ .fill(configuration.isOn ? tint : Color.primary.opacity(0.05))
+ RoundedRectangle(cornerRadius: 4.5, style: .continuous)
+ .strokeBorder(configuration.isOn ? tint : Color.primary.opacity(0.25), lineWidth: 1)
+ Image(systemName: "checkmark")
+ .font(.system(size: 9, weight: .bold))
+ .foregroundStyle(.white)
+ .scaleEffect(configuration.isOn ? 1 : 0.3)
+ .opacity(configuration.isOn ? 1 : 0)
+ }
+ .frame(width: 15, height: 15)
+ .animation(reduceMotion ? nil : .spring(response: 0.25, dampingFraction: 0.6), value: configuration.isOn)
+
+ configuration.label
+ }
+ .contentShape(Rectangle())
+ .onTapGesture { configuration.isOn.toggle() }
+ }
}
}
diff --git a/PureMac/Views/Components/AppearancePill.swift b/PureMac/Views/Components/AppearancePill.swift
index ea14236..907462e 100644
--- a/PureMac/Views/Components/AppearancePill.swift
+++ b/PureMac/Views/Components/AppearancePill.swift
@@ -6,12 +6,13 @@ import SwiftUI
struct AppearancePill: View {
@Binding var selection: AppearanceMode
@Namespace private var indicator
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
var body: some View {
HStack(spacing: 2) {
ForEach(AppearanceMode.allCases) { mode in
Button {
- withAnimation(.spring(response: 0.32, dampingFraction: 0.78)) {
+ withAnimation(reduceMotion ? nil : .spring(response: 0.32, dampingFraction: 0.78)) {
selection = mode
}
} label: {
diff --git a/PureMac/Views/Components/ConfettiView.swift b/PureMac/Views/Components/ConfettiView.swift
index cbc5274..5e9b90d 100644
--- a/PureMac/Views/Components/ConfettiView.swift
+++ b/PureMac/Views/Components/ConfettiView.swift
@@ -7,8 +7,17 @@ import SwiftUI
/// `ConfettiView(trigger:)` — each rising edge fires one burst that quiets
/// itself. Honors Reduce Motion (renders nothing).
struct ConfettiView: View {
+ enum Mode {
+ /// Pieces spawn above the frame and flutter down (ambient rain).
+ case rain
+ /// Pieces explode radially from a point (anchored celebration —
+ /// pair the origin with the visual element being celebrated).
+ case burst(origin: UnitPoint)
+ }
+
/// Flip to fire a burst. Each rising edge fires once.
let trigger: Bool
+ var mode: Mode = .rain
@State private var particles: [Particle] = []
@State private var start: Date?
@@ -41,7 +50,13 @@ struct ConfettiView: View {
private func fire(in size: CGSize) {
guard !reduceMotion, size.width > 0 else { return }
- particles = (0..<90).map { _ in Particle.random(width: size.width) }
+ switch mode {
+ case .rain:
+ particles = (0..<90).map { _ in Particle.random(width: size.width) }
+ case .burst(let origin):
+ let point = CGPoint(x: size.width * origin.x, y: size.height * origin.y)
+ particles = (0..<90).map { _ in Particle.burst(from: point) }
+ }
start = Date()
generation += 1
let g = generation
@@ -124,6 +139,38 @@ private struct Particle {
Color(red: 0.36, green: 0.80, blue: 0.94), // cyan
]
+ /// Radial explosion from a fixed point. Same physics as the rain mode —
+ /// the polar launch velocity plus the existing gravity term naturally
+ /// produces the arc — with an upward bias so the burst blooms before it
+ /// falls, and an earlier fade so pieces don't litter the screen.
+ static func burst(from point: CGPoint) -> Particle {
+ let shape = ConfettiShape.allCases.randomElement()!
+ let dim: CGSize
+ switch shape {
+ case .streamer: dim = CGSize(width: .random(in: 5...8), height: .random(in: 11...16))
+ case .disc: dim = CGSize(width: 9, height: .random(in: 7...10))
+ case .ring: dim = CGSize(width: 10, height: .random(in: 9...13))
+ }
+ let angle = Double.random(in: 0...(2 * .pi))
+ let speed = Double.random(in: 160...340)
+ return Particle(
+ x0: point.x,
+ y0: point.y,
+ vy0: sin(angle) * speed - .random(in: 140...220),
+ gravity: .random(in: 240...340),
+ drift: cos(angle) * speed,
+ swayAmp: .random(in: 4...14),
+ swayFreq: .random(in: 1.4...3.0),
+ phase: .random(in: 0...(2 * .pi)),
+ spin: .random(in: -6...6),
+ tumbleSpeed: .random(in: 2.5...5.5),
+ fadeStart: .random(in: 1.0...1.5),
+ color: palette.randomElement()!,
+ size: dim,
+ shape: shape
+ )
+ }
+
static func random(width: CGFloat) -> Particle {
let shape = ConfettiShape.allCases.randomElement()!
let dim: CGSize
diff --git a/PureMac/Views/Components/DashboardCharts.swift b/PureMac/Views/Components/DashboardCharts.swift
index d0481c7..c698c13 100644
--- a/PureMac/Views/Components/DashboardCharts.swift
+++ b/PureMac/Views/Components/DashboardCharts.swift
@@ -120,6 +120,8 @@ struct StorageDonut: View {
let segments: [Segment]
var lineWidth: CGFloat = 16
var gap: Double = 0.006 // angular gap between segments (fraction of circle)
+ /// When set (legend hover), every other segment dims for cross-highlight.
+ var highlightedID: String? = nil
@State private var reveal: CGFloat = 0
@Environment(\.accessibilityReduceMotion) private var reduceMotion
@@ -148,8 +150,10 @@ struct StorageDonut: View {
.trim(from: ranges[idx].start * reveal, to: ranges[idx].end * reveal)
.stroke(seg.color, style: StrokeStyle(lineWidth: lineWidth, lineCap: .butt))
.rotationEffect(.degrees(-90))
+ .opacity(highlightedID == nil || highlightedID == seg.id ? 1 : 0.25)
}
}
+ .animation(reduceMotion ? nil : .easeOut(duration: 0.2), value: highlightedID)
.onAppear {
if reduceMotion { reveal = 1; return }
withAnimation(.spring(response: 1.0, dampingFraction: 0.85)) { reveal = 1 }
@@ -174,6 +178,9 @@ struct CategoryBarChart: View {
let bars: [Bar]
+ @State private var reveal: Double = 0
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
+
var body: some View {
// Reserve ~28% trailing headroom so the byte-size annotation on the
// longest bar renders fully instead of clipping at the chart edge
@@ -183,7 +190,7 @@ struct CategoryBarChart: View {
return Chart(bars) { bar in
BarMark(
- x: .value("Size", bar.size),
+ x: .value("Size", Double(bar.size) * reveal),
y: .value("Category", bar.name)
)
.foregroundStyle(bar.category.color.gradient)
@@ -193,8 +200,13 @@ struct CategoryBarChart: View {
.font(.system(size: 10, weight: .semibold))
.monospacedDigit()
.foregroundStyle(.secondary)
+ .opacity(reveal)
}
}
+ .onAppear {
+ if reduceMotion { reveal = 1; return }
+ withAnimation(.spring(response: 0.8, dampingFraction: 0.85)) { reveal = 1 }
+ }
.chartXScale(domain: 0...upper)
.chartXAxis(.hidden)
.chartYAxis {
@@ -300,3 +312,135 @@ extension View {
modifier(StaggeredReveal(index: index, baseDelay: baseDelay))
}
}
+
+// MARK: - Count-up bytes
+//
+// Animatable byte counter. `.contentTransition(.numericText())` only rolls
+// when the change happens inside an animation transaction — values assigned
+// during a plain data refresh snap instead. Driving the formatter through
+// `animatableData` makes the roll-up play every time the target changes.
+// Styling (font/color) flows in from the environment of the call site.
+
+struct CountUpBytes: View {
+ let bytes: Int64
+
+ @State private var shown: Double = 0
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
+
+ var body: some View {
+ Color.clear
+ .frame(width: 0, height: 0)
+ .modifier(ByteRollEffect(value: shown))
+ .onAppear { animate(to: bytes) }
+ .onChange(of: bytes) { animate(to: $0) }
+ }
+
+ private func animate(to target: Int64) {
+ if reduceMotion {
+ shown = Double(target)
+ return
+ }
+ withAnimation(.easeOut(duration: 0.8)) {
+ shown = Double(target)
+ }
+ }
+}
+
+private struct ByteRollEffect: AnimatableModifier {
+ var value: Double
+
+ var animatableData: Double {
+ get { value }
+ set { value = newValue }
+ }
+
+ func body(content: Content) -> some View {
+ Text(ByteCountFormatter.string(fromByteCount: Int64(max(0, value)), countStyle: .file))
+ .monospacedDigit()
+ }
+}
+
+// MARK: - Scanning gauge
+//
+// Active-scan focal element: a rotating trimmed arc over a radar wedge sweep
+// with two expanding halo rings. Reduce Motion freezes every loop and falls
+// back to the static arc + rolling percent.
+
+struct ScanningGauge: View {
+ let progress: Double
+ var tint: Color = Tint.blue
+ var label: LocalizedStringKey = "SCANNING"
+
+ @State private var rotate = false
+ @State private var pulse = false
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
+
+ var body: some View {
+ ZStack {
+ // Expanding halo rings, SuccessMedal-style but repeating.
+ if !reduceMotion {
+ ForEach(0..<2, id: \.self) { i in
+ Circle()
+ .stroke(tint.opacity(0.35), lineWidth: 1.5)
+ .scaleEffect(pulse ? 1.22 : 0.9)
+ .opacity(pulse ? 0 : 0.6)
+ .animation(
+ .easeOut(duration: 1.6)
+ .repeatForever(autoreverses: false)
+ .delay(Double(i) * 0.8),
+ value: pulse
+ )
+ }
+ }
+
+ // Radar wedge sweeping the ring interior. TimelineView keeps the
+ // angle deterministic; the branch above removes it entirely under
+ // Reduce Motion.
+ if !reduceMotion {
+ TimelineView(.animation) { timeline in
+ let t = timeline.date.timeIntervalSinceReferenceDate
+ let angle = (t.truncatingRemainder(dividingBy: 3.0) / 3.0) * 360.0
+ Circle()
+ .fill(
+ AngularGradient(
+ colors: [tint.opacity(0), tint.opacity(0), tint.opacity(0.22)],
+ center: .center
+ )
+ )
+ .rotationEffect(.degrees(angle))
+ }
+ .padding(14)
+ .clipShape(Circle())
+ }
+
+ Circle()
+ .stroke(Color.primary.opacity(0.07), lineWidth: 10)
+
+ Circle()
+ .trim(from: 0, to: CGFloat(max(0.05, min(0.95, progress))))
+ .stroke(tint, style: StrokeStyle(lineWidth: 10, lineCap: .round))
+ .rotationEffect(.degrees(rotate ? 360 : 0))
+ .animation(
+ reduceMotion ? nil : .linear(duration: 4).repeatForever(autoreverses: false),
+ value: rotate
+ )
+
+ VStack(spacing: 2) {
+ Text("\(Int(progress * 100))%")
+ .font(.system(size: 36, weight: .semibold))
+ .monospacedDigit()
+ .contentTransition(reduceMotion ? .identity : .numericText())
+ .animation(reduceMotion ? nil : .easeOut(duration: 0.3), value: Int(progress * 100))
+ Text(label)
+ .font(.system(size: 10, weight: .medium))
+ .tracking(0.6)
+ .foregroundStyle(.secondary)
+ }
+ }
+ .onAppear {
+ guard !reduceMotion else { return }
+ rotate = true
+ pulse = true
+ }
+ }
+}
diff --git a/PureMac/Views/Components/EmptyStateView.swift b/PureMac/Views/Components/EmptyStateView.swift
index bbfad6d..90c5265 100644
--- a/PureMac/Views/Components/EmptyStateView.swift
+++ b/PureMac/Views/Components/EmptyStateView.swift
@@ -6,32 +6,63 @@ struct EmptyStateView: View {
let description: LocalizedStringKey
var action: (() -> Void)?
var actionLabel: LocalizedStringKey?
+ /// Halo/icon tint — positive states pass a color (e.g. green for "All
+ /// Clean"); neutral states keep the secondary look.
+ var tint: Color?
- init(_ title: LocalizedStringKey, systemImage: String, description: LocalizedStringKey, action: (() -> Void)? = nil, actionLabel: LocalizedStringKey? = nil) {
+ @State private var floating = false
+ @State private var popped = false
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
+
+ init(_ title: LocalizedStringKey, systemImage: String, description: LocalizedStringKey,
+ action: (() -> Void)? = nil, actionLabel: LocalizedStringKey? = nil, tint: Color? = nil) {
self.title = title
self.systemImage = systemImage
self.description = description
self.action = action
self.actionLabel = actionLabel
+ self.tint = tint
}
var body: some View {
VStack(spacing: 12) {
Spacer()
- Image(systemName: systemImage)
- .font(.system(size: 40))
- .foregroundStyle(.secondary)
+ ZStack {
+ Circle()
+ .fill((tint ?? Color.secondary).opacity(0.10))
+ .frame(width: 96, height: 96)
+ Image(systemName: systemImage)
+ .font(.system(size: 40))
+ .foregroundStyle(tint ?? Color.secondary)
+ }
+ // One-shot entrance pop, then a gentle idle float. Both skipped
+ // under Reduce Motion.
+ .scaleEffect(popped || reduceMotion ? 1 : 0.8)
+ .offset(y: reduceMotion ? 0 : (floating ? -5 : 5))
+ .onAppear {
+ guard !reduceMotion else { return }
+ withAnimation(.spring(response: 0.4, dampingFraction: 0.6)) {
+ popped = true
+ }
+ withAnimation(.easeInOut(duration: 2.4).repeatForever(autoreverses: true)) {
+ floating = true
+ }
+ }
+
Text(title)
.font(.title3.bold())
+ .staggered(0, baseDelay: 0.08)
Text(description)
.font(.callout)
.foregroundStyle(.secondary)
.multilineTextAlignment(.center)
.frame(maxWidth: 300)
+ .staggered(1, baseDelay: 0.08)
if let action, let label = actionLabel {
Button(action: action) { Text(label) }
.buttonStyle(.borderedProminent)
.padding(.top, 4)
+ .staggered(2, baseDelay: 0.08)
}
Spacer()
}
diff --git a/PureMac/Views/Components/FDADemoView.swift b/PureMac/Views/Components/FDADemoView.swift
index 1f46db0..52d8a9d 100644
--- a/PureMac/Views/Components/FDADemoView.swift
+++ b/PureMac/Views/Components/FDADemoView.swift
@@ -18,6 +18,7 @@ struct FDADemoView: View {
@State private var frame: Frame = .idle
@State private var isActive = true
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
private var rows: [DemoRow] {
[
@@ -42,6 +43,13 @@ struct FDADemoView: View {
.foregroundStyle(.secondary)
}
.onAppear {
+ // Reduce Motion: freeze on the end state — the user sees the
+ // "toggled on, granted" frame as a static illustration instead
+ // of an infinite loop.
+ if reduceMotion {
+ frame = .hold
+ return
+ }
isActive = true
cycle()
}
@@ -130,7 +138,7 @@ struct FDADemoView: View {
// MARK: - Cycle
private func cycle() {
- guard isActive else { return }
+ guard isActive, !reduceMotion else { return }
let schedule: [(Frame, Double)] = [
(.idle, 0.6),
diff --git a/PureMac/Views/Components/PermissionSheet.swift b/PureMac/Views/Components/PermissionSheet.swift
index 5004e4a..ebeb437 100644
--- a/PureMac/Views/Components/PermissionSheet.swift
+++ b/PureMac/Views/Components/PermissionSheet.swift
@@ -8,6 +8,7 @@ struct PermissionSheet: View {
@State private var appeared = false
@State private var pulse = false
@State private var showAdvanced = false
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
var body: some View {
VStack(spacing: 0) {
@@ -19,7 +20,13 @@ struct PermissionSheet: View {
}
.frame(width: 540)
.background(Color(nsColor: .windowBackgroundColor))
+ .animation(reduceMotion ? nil : .spring(response: 0.4, dampingFraction: 0.8),
+ value: coordinator.hasFullDiskAccess)
.onAppear {
+ if reduceMotion {
+ appeared = true
+ return
+ }
withAnimation(.easeOut(duration: 0.4)) { appeared = true }
withAnimation(.easeInOut(duration: 1.4).repeatForever(autoreverses: true)) {
pulse = true
@@ -76,8 +83,14 @@ struct PermissionSheet: View {
private var body_: some View {
if coordinator.hasFullDiskAccess {
grantedBody
+ .transition(
+ reduceMotion
+ ? .opacity
+ : .scale(scale: 0.9).combined(with: .opacity)
+ )
} else {
requestBody
+ .transition(.opacity)
}
}
@@ -299,15 +312,9 @@ struct PermissionSheet: View {
private var grantedBody: some View {
VStack(spacing: 10) {
- ZStack {
- Circle()
- .fill(Tint.green.opacity(0.15))
- .frame(width: 72, height: 72)
- .scaleEffect(pulse ? 1.05 : 0.95)
- Image(systemName: "checkmark.seal.fill")
- .font(.system(size: 36, weight: .bold))
- .foregroundStyle(Tint.green)
- }
+ // SuccessMedal pops + ripples once on its own and already
+ // honors Reduce Motion — no shared `pulse` state reuse.
+ SuccessMedal(size: 72)
Text("Access granted")
.font(.system(size: 15, weight: .bold))
Text("Retrying the operation now.")
diff --git a/PureMac/Views/DashboardView.swift b/PureMac/Views/DashboardView.swift
index 8236a6b..afa7e8d 100644
--- a/PureMac/Views/DashboardView.swift
+++ b/PureMac/Views/DashboardView.swift
@@ -9,14 +9,45 @@ struct DashboardView: View {
@State private var showConfirmation = false
@State private var fireCleanConfetti = false
@State private var lastCleanedScanState: Bool = false
+ @State private var hoveredSegment: String?
+ /// Confetti burst origin as a fraction of the dashboard, derived from the
+ /// SuccessMedal's real frame so the burst tracks it across window sizes
+ /// and RTL layout instead of a hand-aimed constant.
+ @State private var burstOrigin: UnitPoint = UnitPoint(x: 0.25, y: 0.28)
+ @State private var dashboardSize: CGSize = .zero
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
+
+ private let dashboardSpace = "dashboard"
+
+ /// Hero cards rise in with a slight settle and dissolve out; under
+ /// Reduce Motion both directions collapse to a plain cross-fade.
+ private var heroTransition: AnyTransition {
+ reduceMotion
+ ? .opacity
+ : .asymmetric(
+ insertion: .opacity
+ .combined(with: .offset(y: 12))
+ .combined(with: .scale(scale: 0.98, anchor: .top)),
+ removal: .opacity
+ )
+ }
var body: some View {
ZStack {
+ // Quiet tinted wash so the glass hero states have color to
+ // refract. Static — no Reduce Motion concerns.
+ LinearGradient(
+ colors: [Tint.blue.opacity(0.08), Tint.purple.opacity(0.05), .clear],
+ startPoint: .top, endPoint: .bottom
+ )
+ .ignoresSafeArea()
+
ScrollView {
VStack(alignment: .leading, spacing: 20) {
switch appState.scanState {
case .idle:
hero
+ .transition(heroTransition)
stats
if appState.diskInfo.totalSpace > 0 {
sectionHeader("Storage composition")
@@ -28,12 +59,14 @@ struct DashboardView: View {
}
case .scanning:
scanningHero
+ .transition(heroTransition)
if !appState.allResults.isEmpty {
sectionHeader("Found so far")
liveResults
}
case .completed:
completedHero
+ .transition(heroTransition)
if appState.totalJunkSize > 0 {
sectionHeader("By category")
categoryChartCard
@@ -41,22 +74,33 @@ struct DashboardView: View {
}
case .cleaning:
cleaningHero
+ .transition(heroTransition)
case .cleaned:
cleanedHero
+ .transition(heroTransition)
}
}
.padding(.horizontal, 28)
.padding(.vertical, 24)
.frame(maxWidth: 920, alignment: .leading)
+ .animation(reduceMotion ? nil : MotionTokens.gentle, value: appState.scanState)
}
// Celebratory burst when a clean cycle finishes with something
- // freed. Pinned to the whole dashboard so particles cover the
- // hero card. allowsHitTesting=false keeps Done clickable through
- // falling confetti.
- ConfettiView(trigger: fireCleanConfetti)
+ // freed. Origin tracks the SuccessMedal's real frame (see
+ // burstOrigin) so it explodes from the celebration on any window
+ // size / layout direction.
+ // allowsHitTesting=false keeps Done clickable through particles.
+ ConfettiView(trigger: fireCleanConfetti, mode: .burst(origin: burstOrigin))
.allowsHitTesting(false)
}
+ .coordinateSpace(name: dashboardSpace)
+ .background(
+ GeometryReader { geo in
+ Color.clear.onAppear { dashboardSize = geo.size }
+ .onChange(of: geo.size) { dashboardSize = $0 }
+ }
+ )
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
.onChange(of: appState.scanState) { newState in
// Fire only on the rising edge of .cleaned with freed > 0 so
@@ -67,7 +111,17 @@ struct DashboardView: View {
return false
}()
if isCleaned && !lastCleanedScanState && appState.totalFreedSpace > 0 {
- fireCleanConfetti.toggle()
+ if reduceMotion {
+ // Confetti renders nothing under Reduce Motion; no need
+ // to wait for an entrance spring that isn't playing.
+ fireCleanConfetti.toggle()
+ } else {
+ // Let the hero settle and the counter roll before the
+ // burst so the celebration lands as one beat.
+ DispatchQueue.main.asyncAfter(deadline: .now() + 0.55) {
+ fireCleanConfetti.toggle()
+ }
+ }
}
lastCleanedScanState = isCleaned
}
@@ -101,8 +155,13 @@ struct DashboardView: View {
return CardSurface(padding: 24, accent: stress ? Tint.orange : Tint.blue, elevation: .raised) {
HStack(alignment: .center, spacing: 28) {
- HealthRing(percent: percentUsed)
- .frame(width: 180, height: 180)
+ ZStack {
+ // Slow atmospheric drift behind the ring — barely-there
+ // ambient depth, frozen under Reduce Motion.
+ HeroDrift(tint: stress ? Tint.orange : Tint.blue)
+ HealthRing(percent: percentUsed)
+ .frame(width: 180, height: 180)
+ }
VStack(alignment: .leading, spacing: 14) {
HStack(alignment: .top) {
@@ -119,10 +178,8 @@ struct DashboardView: View {
tint: Tint.orange)
}
}
- Text(ByteCountFormatter.string(fromByteCount: free, countStyle: .file))
+ CountUpBytes(bytes: free)
.font(.system(size: 34, weight: .semibold))
- .monospacedDigit()
- .contentTransition(.numericText())
.foregroundStyle(stress ? Tint.orange : Color.primary)
Text(freeOfText(total: total))
.font(.system(size: 12))
@@ -133,11 +190,9 @@ struct DashboardView: View {
appState.startSmartScan()
} label: {
Label("Smart Scan", systemImage: "sparkles")
- .font(.system(size: 13, weight: .semibold))
.padding(.horizontal, 4)
}
- .buttonStyle(.borderedProminent)
- .controlSize(.large)
+ .buttonStyle(GlowProminentButtonStyle(breathes: true))
}
storageBreakdown(used: used, total: total)
@@ -215,7 +270,8 @@ struct DashboardView: View {
tint: Tint.blue,
label: "Free Space",
value: ByteCountFormatter.string(fromByteCount: free, countStyle: .file),
- delta: total > 0 ? freeSpaceDelta(total: total, percentUsed: percentUsed) : nil
+ delta: total > 0 ? freeSpaceDelta(total: total, percentUsed: percentUsed) : nil,
+ byteValue: free
)
.staggered(0)
StatCard(
@@ -227,7 +283,8 @@ struct DashboardView: View {
: "—",
delta: appState.allResults.isEmpty
? String(localized: "Run a scan")
- : junkFoundDelta(count: appState.allResults.count)
+ : junkFoundDelta(count: appState.allResults.count),
+ byteValue: appState.totalJunkSize > 0 ? appState.totalJunkSize : nil
)
.staggered(1)
StatCard(
@@ -245,7 +302,8 @@ struct DashboardView: View {
value: appState.diskInfo.purgeableSpace > 0
? ByteCountFormatter.string(fromByteCount: appState.diskInfo.purgeableSpace, countStyle: .file)
: "—",
- delta: String(localized: "APFS reclaimable")
+ delta: String(localized: "APFS reclaimable"),
+ byteValue: appState.diskInfo.purgeableSpace > 0 ? appState.diskInfo.purgeableSpace : nil
)
.staggered(3)
}
@@ -293,7 +351,7 @@ struct DashboardView: View {
return CardSurface(padding: 18, elevation: .standard) {
HStack(alignment: .center, spacing: 24) {
ZStack {
- StorageDonut(segments: segments)
+ StorageDonut(segments: segments, highlightedID: hoveredSegment)
.frame(width: 132, height: 132)
VStack(spacing: 1) {
Text(ByteCountFormatter.string(fromByteCount: total, countStyle: .file))
@@ -307,8 +365,12 @@ struct DashboardView: View {
VStack(alignment: .leading, spacing: 12) {
ForEach(Array(segments.enumerated()), id: \.element.id) { idx, seg in
- LegendChip(color: seg.color, label: seg.label, value: seg.display)
- .staggered(idx)
+ HoverableLegendChip(
+ color: seg.color, label: seg.label, value: seg.display
+ ) { hovering in
+ hoveredSegment = hovering ? seg.id : nil
+ }
+ .staggered(idx)
}
}
Spacer(minLength: 0)
@@ -359,7 +421,7 @@ struct DashboardView: View {
// MARK: - Scanning state
private var scanningHero: some View {
- CardSurface(padding: 24, accent: Tint.blue, elevation: .raised) {
+ CardSurface(padding: 24, accent: Tint.blue, elevation: .raised, material: .ultraThinMaterial) {
HStack(alignment: .center, spacing: 28) {
ScanningGauge(progress: appState.scanProgress)
.frame(width: 180, height: 180)
@@ -369,20 +431,48 @@ struct DashboardView: View {
Text("Scanning your Mac")
.font(.system(size: 22, weight: .bold))
}
+
+ // Category line slides up as the scan advances.
Text(currentlyInText)
.font(.system(size: 13))
.foregroundStyle(.secondary)
- ProgressView(value: appState.scanProgress)
- .progressViewStyle(.linear)
- .tint(Tint.blue)
+ .id(appState.currentScanCategory)
+ .transition(
+ reduceMotion
+ ? .opacity
+ : .asymmetric(
+ insertion: .move(edge: .bottom).combined(with: .opacity),
+ removal: .move(edge: .top).combined(with: .opacity)
+ )
+ )
+
+ ShimmerProgressBar(progress: appState.scanProgress)
.frame(maxWidth: 320)
.padding(.top, 2)
+
+ // Live file-path ticker — the "it's really working"
+ // signal. Fixed height so rapid path swaps don't bounce
+ // the layout.
+ Text(tickerPath)
+ .font(.system(size: 11, design: .monospaced))
+ .foregroundStyle(.tertiary)
+ .lineLimit(1)
+ .truncationMode(.middle)
+ .frame(maxWidth: 360, alignment: .leading)
+ .frame(height: 14)
+ .opacity(tickerPath.isEmpty ? 0 : 1)
}
+ .animation(reduceMotion ? nil : .easeOut(duration: 0.18), value: appState.currentScanCategory)
Spacer(minLength: 0)
}
}
}
+ private var tickerPath: String {
+ guard !appState.currentScanPath.isEmpty else { return "" }
+ return (appState.currentScanPath as NSString).abbreviatingWithTildeInPath
+ }
+
private var currentlyInText: String {
String(
format: String(localized: "Currently in: %@"),
@@ -406,11 +496,18 @@ struct DashboardView: View {
}
.padding(.horizontal, 16)
.padding(.vertical, 12)
+ .transition(
+ reduceMotion
+ ? .opacity
+ : .move(edge: .bottom).combined(with: .opacity)
+ )
if result.id != appState.allResults.prefix(8).last?.id {
Divider().padding(.leading, 54)
}
}
}
+ .animation(reduceMotion ? nil : .spring(response: 0.4, dampingFraction: 0.85),
+ value: appState.allResults.count)
}
}
@@ -422,10 +519,8 @@ struct DashboardView: View {
VStack(alignment: .leading, spacing: 14) {
HStack(alignment: .firstTextBaseline) {
if !isClean {
- Text(ByteCountFormatter.string(fromByteCount: appState.totalJunkSize, countStyle: .file))
+ CountUpBytes(bytes: appState.totalJunkSize)
.font(.system(size: 40, weight: .semibold))
- .monospacedDigit()
- .contentTransition(.numericText())
Text("found")
.font(.system(size: 16))
.foregroundStyle(.secondary)
@@ -452,11 +547,9 @@ struct DashboardView: View {
} icon: {
Image(systemName: "sparkles")
}
- .font(.system(size: 13, weight: .semibold))
.padding(.horizontal, 6)
}
- .buttonStyle(.borderedProminent)
- .controlSize(.large)
+ .buttonStyle(GlowProminentButtonStyle())
}
Spacer()
}
@@ -526,7 +619,7 @@ struct DashboardView: View {
}
private var cleaningHero: some View {
- CardSurface(padding: 24, accent: Tint.orange, elevation: .raised) {
+ CardSurface(padding: 24, accent: Tint.orange, elevation: .raised, material: .ultraThinMaterial) {
HStack(alignment: .center, spacing: 28) {
ScanningGauge(progress: appState.cleanProgress, tint: Tint.orange, label: "CLEANING")
.frame(width: 180, height: 180)
@@ -536,6 +629,9 @@ struct DashboardView: View {
Text(percentCompleteText)
.font(.system(size: 13))
.foregroundStyle(.secondary)
+ ShimmerProgressBar(progress: appState.cleanProgress, tint: Tint.orange)
+ .frame(maxWidth: 320)
+ .padding(.top, 2)
}
Spacer(minLength: 0)
}
@@ -546,23 +642,36 @@ struct DashboardView: View {
String(format: String(localized: "%lld%% complete"), Int64(appState.cleanProgress * 100))
}
+ /// Convert the medal's frame (in dashboard coordinates) into a UnitPoint
+ /// for the confetti emitter. Falls back to the existing value until the
+ /// dashboard size is known.
+ private func updateBurstOrigin(medalFrame: CGRect) {
+ guard dashboardSize.width > 0, dashboardSize.height > 0 else { return }
+ burstOrigin = UnitPoint(
+ x: max(0, min(1, medalFrame.midX / dashboardSize.width)),
+ y: max(0, min(1, medalFrame.midY / dashboardSize.height))
+ )
+ }
+
private var cleanedHero: some View {
- CardSurface(padding: 24, accent: Tint.green, elevation: .raised) {
+ CardSurface(padding: 24, accent: Tint.green, elevation: .raised, material: .ultraThinMaterial) {
HStack(alignment: .center, spacing: 28) {
SuccessMedal()
+ .background(
+ GeometryReader { geo in
+ Color.clear.onAppear { updateBurstOrigin(medalFrame: geo.frame(in: .named(dashboardSpace))) }
+ }
+ )
VStack(alignment: .leading, spacing: 6) {
- Text(ByteCountFormatter.string(fromByteCount: appState.totalFreedSpace, countStyle: .file))
+ CountUpBytes(bytes: appState.totalFreedSpace)
.font(.system(size: 40, weight: .semibold))
- .monospacedDigit()
- .contentTransition(.numericText())
.foregroundStyle(Tint.green)
Text("freed")
.font(.system(size: 14))
.foregroundStyle(.secondary)
Button("Done") { appState.scanState = .idle }
- .buttonStyle(.borderedProminent)
- .controlSize(.large)
+ .buttonStyle(GlowProminentButtonStyle(tint: Tint.green, gradient: TintGradient.of(Tint.green)))
.padding(.top, 4)
}
Spacer(minLength: 0)
@@ -587,6 +696,9 @@ private struct StatCard: View {
let label: LocalizedStringKey
let value: String
let delta: String?
+ /// When set, the headline renders as a rolling byte counter instead of
+ /// the static `value` string.
+ var byteValue: Int64? = nil
var body: some View {
CardSurface(padding: 14, accent: tint) {
@@ -599,12 +711,18 @@ private struct StatCard: View {
.textCase(.uppercase)
.tracking(0.4)
}
- Text(value)
- .font(.system(size: 22, weight: .bold))
- .monospacedDigit()
- .contentTransition(.numericText())
- .lineLimit(1)
- .minimumScaleFactor(0.6)
+ Group {
+ if let byteValue {
+ CountUpBytes(bytes: byteValue)
+ } else {
+ Text(value)
+ .monospacedDigit()
+ .contentTransition(.numericText())
+ }
+ }
+ .font(.system(size: 22, weight: .bold))
+ .lineLimit(1)
+ .minimumScaleFactor(0.6)
if let delta {
Text(delta)
.font(.system(size: 11))
@@ -612,7 +730,7 @@ private struct StatCard: View {
}
}
}
- .pressable(hoverScale: 1.018)
+ .pressable(hoverScale: 1.02, lift: true)
}
}
@@ -648,7 +766,7 @@ private struct SuggestionRow: View {
.foregroundStyle(.tertiary)
}
}
- .pressable(hoverScale: 1.01)
+ .pressable(hoverScale: 1.01, lift: true)
}
}
@@ -674,35 +792,103 @@ private struct LegendDot: View {
}
}
-private struct ScanningGauge: View {
+// ScanningGauge now lives in Components/DashboardCharts.swift (radar sweep +
+// halo rings + Reduce Motion compliance).
+
+/// Legend chip wrapper that reports hover for donut cross-highlighting and
+/// scales slightly while hovered.
+private struct HoverableLegendChip: View {
+ let color: Color
+ let label: LocalizedStringKey
+ let value: String
+ let onHoverChange: (Bool) -> Void
+
+ @State private var hovering = false
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
+
+ var body: some View {
+ LegendChip(color: color, label: label, value: value)
+ .scaleEffect(hovering && !reduceMotion ? 1.05 : 1, anchor: .leading)
+ .animation(reduceMotion ? nil : MotionTokens.snappy, value: hovering)
+ .onHover { h in
+ hovering = h
+ onHoverChange(h)
+ }
+ }
+}
+
+/// Barely-there radial wash that drifts behind the idle hero ring. Static at
+/// rest size under Reduce Motion.
+private struct HeroDrift: View {
+ let tint: Color
+
+ @State private var drift = false
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
+
+ var body: some View {
+ RadialGradient(
+ colors: [tint.opacity(0.16), .clear],
+ center: .center, startRadius: 10, endRadius: 130
+ )
+ .blur(radius: 24)
+ .scaleEffect(drift ? 1.12 : 0.96)
+ .offset(x: drift ? 8 : -8)
+ .onAppear {
+ guard !reduceMotion else { return }
+ withAnimation(.easeInOut(duration: 3.0).repeatForever(autoreverses: true)) {
+ drift = true
+ }
+ }
+ }
+}
+
+/// Gradient progress capsule with a traveling shimmer band, replacing the
+/// stock linear ProgressView during scans/cleans. Shimmer is masked to the
+/// filled portion and removed entirely under Reduce Motion.
+private struct ShimmerProgressBar: View {
let progress: Double
var tint: Color = Tint.blue
- var label: LocalizedStringKey = "SCANNING"
- @State private var rotate = false
+
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
+
+ private var clamped: Double { max(0, min(1, progress)) }
var body: some View {
- ZStack {
- Circle()
- .stroke(Color.primary.opacity(0.07), lineWidth: 10)
-
- Circle()
- .trim(from: 0, to: CGFloat(max(0.05, min(0.95, progress))))
- .stroke(tint, style: StrokeStyle(lineWidth: 10, lineCap: .round))
- .rotationEffect(.degrees(rotate ? 360 : 0))
- .animation(.linear(duration: 4).repeatForever(autoreverses: false), value: rotate)
-
- VStack(spacing: 2) {
- Text("\(Int(progress * 100))%")
- .font(.system(size: 36, weight: .semibold))
- .monospacedDigit()
- .contentTransition(.numericText())
- Text(label)
- .font(.system(size: 10, weight: .medium))
- .tracking(0.6)
- .foregroundStyle(.secondary)
+ GeometryReader { geo in
+ let fillWidth = geo.size.width * CGFloat(clamped)
+ ZStack(alignment: .leading) {
+ Capsule()
+ .fill(Color.primary.opacity(0.08))
+
+ Capsule()
+ .fill(
+ LinearGradient(colors: [tint, tint.opacity(0.7)],
+ startPoint: .leading, endPoint: .trailing)
+ )
+ .frame(width: max(8, fillWidth))
+ .animation(reduceMotion ? nil : .easeOut(duration: 0.35), value: clamped)
+
+ if !reduceMotion {
+ TimelineView(.animation) { timeline in
+ let t = timeline.date.timeIntervalSinceReferenceDate
+ let cycle = (t.truncatingRemainder(dividingBy: 1.8)) / 1.8
+ let bandWidth: CGFloat = 56
+ LinearGradient(
+ colors: [.clear, .white.opacity(0.35), .clear],
+ startPoint: .leading, endPoint: .trailing
+ )
+ .frame(width: bandWidth)
+ .offset(x: CGFloat(cycle) * (geo.size.width + bandWidth) - bandWidth)
+ }
+ .mask(
+ Capsule()
+ .frame(width: max(8, fillWidth))
+ .frame(maxWidth: .infinity, alignment: .leading)
+ )
+ }
}
}
- .onAppear { rotate = true }
+ .frame(height: 9)
}
}
diff --git a/PureMac/Views/MainWindow.swift b/PureMac/Views/MainWindow.swift
index 26e57be..2ca27dd 100644
--- a/PureMac/Views/MainWindow.swift
+++ b/PureMac/Views/MainWindow.swift
@@ -6,6 +6,7 @@ struct MainWindow: View {
@ObservedObject private var permission = PermissionCoordinator.shared
@State private var selectedSection: AppSection? = .cleaning(.smartScan)
@State private var columnVisibility: NavigationSplitViewVisibility = .all
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
var body: some View {
NavigationSplitView(columnVisibility: $columnVisibility) {
@@ -115,28 +116,10 @@ struct MainWindow: View {
private func navRow(section: AppSection, label: LocalizedStringKey, icon: String,
tint: Color, badge: String?) -> some View {
- let isSelected = selectedSection == section
- return HStack(spacing: 10) {
- IconTile(systemName: icon, tint: tint, size: 24, glow: isSelected)
- Text(label)
- .font(.system(size: 13, weight: isSelected ? .semibold : .regular))
- Spacer()
- if let badge {
- Text(badge)
- .font(.system(size: 11, weight: .semibold))
- .monospacedDigit()
- .foregroundStyle(isSelected ? tint : .secondary)
- .padding(.horizontal, 7)
- .padding(.vertical, 2)
- .background(
- Capsule().fill(
- (isSelected ? tint : Color.primary).opacity(isSelected ? 0.15 : 0.06)
- )
- )
- }
- }
- .padding(.vertical, 2)
- .contentShape(Rectangle())
+ SidebarNavRow(
+ label: label, icon: icon, tint: tint, badge: badge,
+ isSelected: selectedSection == section
+ )
.tag(section)
}
@@ -199,11 +182,45 @@ struct MainWindow: View {
fdaToast
.padding(.horizontal, 16)
.padding(.top, 12)
+ .transition(
+ reduceMotion
+ ? .opacity
+ : .move(edge: .top).combined(with: .opacity)
+ )
}
detailView
+ .id(selectedSection)
+ .transition(
+ reduceMotion
+ ? .opacity
+ : .asymmetric(
+ insertion: .opacity.combined(with: .offset(y: 10)),
+ removal: .opacity
+ )
+ )
}
+ .animation(reduceMotion ? nil : .easeOut(duration: 0.22), value: selectedSection)
+ .animation(reduceMotion ? nil : .spring(response: 0.4, dampingFraction: 0.8),
+ value: appState.fdaBannerDismissed)
+ .animation(reduceMotion ? nil : .spring(response: 0.4, dampingFraction: 0.8),
+ value: appState.hasFullDiskAccess)
.frame(maxWidth: .infinity, maxHeight: .infinity)
- .background(Color(nsColor: .windowBackgroundColor))
+ .background(
+ // Quiet ambient gradient under every section. Static layers,
+ // opacities kept low enough to stay clean in light mode.
+ ZStack {
+ Color(nsColor: .windowBackgroundColor)
+ LinearGradient(
+ colors: [Tint.blue.opacity(0.05), .clear],
+ startPoint: .topLeading, endPoint: .center
+ )
+ RadialGradient(
+ colors: [Tint.purple.opacity(0.03), .clear],
+ center: .topTrailing, startRadius: 0, endRadius: 600
+ )
+ }
+ .ignoresSafeArea()
+ )
}
@ViewBuilder
@@ -290,16 +307,65 @@ private func pulsingLockIconView() -> some View {
}
}
+/// Sidebar row with a springy hover highlight. Extracted to a struct so each
+/// row owns its hover state; the selected row's IconTile glows via the shared
+/// glow treatment in AppTheme.
+private struct SidebarNavRow: View {
+ let label: LocalizedStringKey
+ let icon: String
+ let tint: Color
+ let badge: String?
+ let isSelected: Bool
+
+ @State private var hovering = false
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
+
+ var body: some View {
+ HStack(spacing: 10) {
+ IconTile(systemName: icon, tint: tint, size: 24, glow: isSelected)
+ Text(label)
+ .font(.system(size: 13, weight: isSelected ? .semibold : .regular))
+ Spacer()
+ if let badge {
+ Text(badge)
+ .font(.system(size: 11, weight: .semibold))
+ .monospacedDigit()
+ .foregroundStyle(isSelected ? tint : .secondary)
+ .padding(.horizontal, 7)
+ .padding(.vertical, 2)
+ .background(
+ Capsule().fill(
+ (isSelected ? tint : Color.primary).opacity(isSelected ? 0.15 : 0.06)
+ )
+ )
+ .contentTransition(.numericText())
+ }
+ }
+ .padding(.vertical, 2)
+ // Leading anchor keeps the row from clipping against the sidebar edge.
+ .scaleEffect(hovering && !reduceMotion ? 1.02 : 1, anchor: .leading)
+ .background(
+ RoundedRectangle(cornerRadius: 6, style: .continuous)
+ .fill(Color.primary.opacity(hovering && !isSelected ? 0.05 : 0))
+ .padding(.horizontal, -6)
+ )
+ .animation(reduceMotion ? nil : MotionTokens.snappy, value: hovering)
+ .contentShape(Rectangle())
+ .onHover { hovering = $0 }
+ }
+}
+
/// Small reusable status dot with optional pulse. Used in the sidebar health
/// footer and other "system status" surfaces.
private struct PulsingDot: View {
let tint: Color
var isPulsing: Bool = false
@State private var pulse = false
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
var body: some View {
ZStack {
- if isPulsing {
+ if isPulsing && !reduceMotion {
Circle()
.stroke(tint.opacity(pulse ? 0.0 : 0.6), lineWidth: 2)
.frame(width: 18, height: 18)
@@ -315,11 +381,19 @@ private struct PulsingDot: View {
.shadow(color: tint.opacity(0.6), radius: 3)
}
.frame(width: 18, height: 18)
- .onAppear {
- guard isPulsing else { return }
- withAnimation(.easeOut(duration: 1.4).repeatForever(autoreverses: false)) {
- pulse = true
- }
+ .onAppear { syncPulse() }
+ // The FDA status can flip while the window stays open — onAppear
+ // alone latches the first value and never starts/stops the loop.
+ .onChange(of: isPulsing) { _ in syncPulse() }
+ }
+
+ private func syncPulse() {
+ guard isPulsing, !reduceMotion else {
+ pulse = false
+ return
+ }
+ withAnimation(.easeOut(duration: 1.4).repeatForever(autoreverses: false)) {
+ pulse = true
}
}
}
diff --git a/PureMac/Views/OnboardingView.swift b/PureMac/Views/OnboardingView.swift
index b17a788..228a8e0 100644
--- a/PureMac/Views/OnboardingView.swift
+++ b/PureMac/Views/OnboardingView.swift
@@ -8,10 +8,13 @@ import SwiftUI
struct OnboardingView: View {
@Binding var isComplete: Bool
@State private var page: Page = .welcome
- @State private var appeared = false
@State private var hasFda = false
@State private var hasOpenedSettings = false
@State private var autoAdvanceScheduled = false
+ /// +1 when navigating forward, -1 going back — drives the slide direction
+ /// so Back doesn't slide the wrong way.
+ @State private var direction: Int = 1
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
private let pollTimer = Timer.publish(every: 1.0, on: .main, in: .common).autoconnect()
@@ -22,6 +25,17 @@ struct OnboardingView: View {
static var count: Int { allCases.count }
}
+ private var pageTransition: AnyTransition {
+ guard !reduceMotion else { return .opacity }
+ return .asymmetric(
+ insertion: .offset(x: direction >= 0 ? 48 : -48)
+ .combined(with: .opacity)
+ .combined(with: .scale(scale: 0.98)),
+ removal: .offset(x: direction >= 0 ? -48 : 48)
+ .combined(with: .opacity)
+ )
+ }
+
var body: some View {
ZStack {
backdrop
@@ -34,12 +48,7 @@ struct OnboardingView: View {
.padding(.top, 44)
.padding(.bottom, 12)
.id(page)
- .transition(
- .asymmetric(
- insertion: .opacity.combined(with: .move(edge: .trailing)),
- removal: .opacity.combined(with: .move(edge: .leading))
- )
- )
+ .transition(pageTransition)
bottomBar
}
@@ -47,7 +56,6 @@ struct OnboardingView: View {
.frame(width: 680, height: 560)
.onAppear {
FullDiskAccessManager.shared.triggerRegistration()
- withAnimation(.easeOut(duration: 0.5)) { appeared = true }
refreshFda()
}
.onReceive(pollTimer) { _ in
@@ -58,7 +66,7 @@ struct OnboardingView: View {
@ViewBuilder
private var content: some View {
switch page {
- case .welcome: WelcomeScene(appeared: appeared)
+ case .welcome: WelcomeScene()
case .mission: MissionScene()
case .permission: PermissionScene(
hasFda: hasFda,
@@ -75,15 +83,17 @@ struct OnboardingView: View {
private var backdrop: some View {
ZStack {
Color(nsColor: .windowBackgroundColor)
- // Radial wash that shifts hue per page. Subtle enough to read
- // as ambient warmth rather than decoration.
+ // Radial wash that shifts hue per page and drifts opposite the
+ // page slide — a slow parallax layer behind the faster foreground
+ // spring. Static under Reduce Motion.
RadialGradient(
colors: [pageTint.opacity(0.18), .clear],
center: .topTrailing,
startRadius: 60,
endRadius: 520
)
- .animation(.easeInOut(duration: 0.6), value: page)
+ .offset(x: reduceMotion ? 0 : CGFloat(page.index) * -30)
+ .animation(reduceMotion ? nil : .easeInOut(duration: 0.8), value: page)
}
}
@@ -125,8 +135,7 @@ struct OnboardingView: View {
if page == .ready {
Button("Start") { isComplete = true }
- .buttonStyle(.borderedProminent)
- .controlSize(.large)
+ .buttonStyle(GlowProminentButtonStyle(breathes: true))
} else {
Button(page == .permission ? "Continue" : "Next") { advance(by: 1) }
.buttonStyle(.borderedProminent)
@@ -149,7 +158,10 @@ struct OnboardingView: View {
let target = max(0, min(Page.count - 1, page.index + delta))
guard target != page.index else { return }
Haptics.tap()
- withAnimation(.spring(response: 0.45, dampingFraction: 0.85)) {
+ // Direction must be set BEFORE the transaction so the transition
+ // resolves with the correct slide edge.
+ direction = delta >= 0 ? 1 : -1
+ withAnimation(reduceMotion ? nil : .spring(response: 0.45, dampingFraction: 0.85)) {
page = Page(rawValue: target) ?? page
}
}
@@ -194,8 +206,8 @@ struct OnboardingView: View {
// MARK: - Scenes
private struct WelcomeScene: View {
- let appeared: Bool
@State private var bob = false
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
var body: some View {
VStack(spacing: 26) {
@@ -208,8 +220,9 @@ private struct WelcomeScene: View {
.interpolation(.high)
.frame(width: 120, height: 120)
.shadow(color: .black.opacity(0.15), radius: 18, y: 8)
- .offset(y: bob ? -4 : 4)
+ .offset(y: reduceMotion ? 0 : (bob ? -4 : 4))
.onAppear {
+ guard !reduceMotion else { return }
withAnimation(.easeInOut(duration: 2.4).repeatForever(autoreverses: true)) {
bob = true
}
@@ -220,6 +233,7 @@ private struct WelcomeScene: View {
.foregroundStyle(Tint.blue)
}
}
+ .staggered(0, baseDelay: 0.07)
VStack(spacing: 12) {
Text("Reclaim your Mac")
@@ -231,14 +245,14 @@ private struct WelcomeScene: View {
.multilineTextAlignment(.center)
.frame(maxWidth: 420)
}
- .opacity(appeared ? 1 : 0)
- .offset(y: appeared ? 0 : 8)
+ .staggered(1, baseDelay: 0.07)
Text("Free. Open source. MIT licensed.")
.font(.system(size: 11.5, weight: .medium))
.foregroundStyle(.tertiary)
.tracking(0.3)
.padding(.top, 4)
+ .staggered(2, baseDelay: 0.07)
Spacer(minLength: 0)
}
@@ -258,6 +272,7 @@ private struct MissionScene: View {
.font(.system(size: 14))
.foregroundStyle(.secondary)
}
+ .staggered(0, baseDelay: 0.07)
VStack(spacing: 12) {
FeatureRow(
@@ -266,18 +281,21 @@ private struct MissionScene: View {
title: "Smart Scan",
body: "Find caches, logs, broken installs, and the AI-app history hiding in your library."
)
+ .staggered(1, baseDelay: 0.07)
FeatureRow(
systemImage: "square.grid.2x2.fill",
tint: Tint.purple,
title: "App Uninstaller",
body: "Drag an app, see every file it dropped, remove all of it. No leftovers."
)
+ .staggered(2, baseDelay: 0.07)
FeatureRow(
systemImage: "doc.questionmark.fill",
tint: Tint.pink,
title: "Orphan Finder",
body: "Surfaces files that outlived the apps that created them."
)
+ .staggered(3, baseDelay: 0.07)
}
.frame(maxWidth: 460)
@@ -340,9 +358,11 @@ private struct PermissionScene: View {
.multilineTextAlignment(.center)
.frame(maxWidth: 460)
}
+ .staggered(0, baseDelay: 0.07)
FDADemoView()
.frame(maxWidth: 420)
+ .staggered(1, baseDelay: 0.07)
if hasFda {
Label("All set — moving you to the next step.", systemImage: "checkmark.circle.fill")
diff --git a/PureMac/Views/Orphans/OrphanListView.swift b/PureMac/Views/Orphans/OrphanListView.swift
index 2c628e6..a018e64 100644
--- a/PureMac/Views/Orphans/OrphanListView.swift
+++ b/PureMac/Views/Orphans/OrphanListView.swift
@@ -5,6 +5,7 @@ struct OrphanListView: View {
@State private var selectedOrphans: Set<URL> = []
@State private var isRemoving = false
@State private var removalErrorMessage: String?
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
var body: some View {
Group {
@@ -16,47 +17,32 @@ struct OrphanListView: View {
}
.frame(maxWidth: .infinity, maxHeight: .infinity)
} else if appState.orphanedFiles.isEmpty {
- EmptyStateView("No Orphaned Files", systemImage: "checkmark.circle", description: "No leftover files from uninstalled apps were found.", action: { appState.findOrphans() }, actionLabel: "Scan for Orphans")
+ EmptyStateView("No Orphaned Files", systemImage: "checkmark.circle", description: "No leftover files from uninstalled apps were found.", action: { appState.findOrphans() }, actionLabel: "Scan for Orphans", tint: Tint.green)
} else {
- List(appState.orphanedFiles, id: \.self) { fileURL in
- Toggle(isOn: orphanBinding(for: fileURL)) {
- HStack {
- Image(nsImage: NSWorkspace.shared.icon(forFile: fileURL.path))
- .resizable()
- .frame(width: 16, height: 16)
-
- VStack(alignment: .leading, spacing: 2) {
- Text(fileURL.lastPathComponent)
- .lineLimit(1)
- Text(fileURL.path)
- .font(.caption)
- .foregroundStyle(.tertiary)
- .lineLimit(1)
- .truncationMode(.middle)
- }
-
- Spacer()
-
- if let size = fileSize(fileURL) {
- Text(ByteCountFormatter.string(fromByteCount: size, countStyle: .file))
- .monospacedDigit()
- .foregroundStyle(.secondary)
- }
- }
- }
- .toggleStyle(.checkbox)
- .contextMenu {
- Button("Reveal in Finder") {
- revealInFinder(fileURL)
- }
- Button("Copy Path") {
- NSPasteboard.general.clearContents()
- NSPasteboard.general.setString(fileURL.path, forType: .string)
- }
- Divider()
- Button("Move to Trash", role: .destructive) {
- Task { await removeSingleOrphan(fileURL) }
- }
+ List {
+ // No .staggered(): List is lazy, so a delayed-reveal would
+ // blank each row as it scrolls in. The removal transition
+ // below still gives the sweep-out on delete.
+ ForEach(Array(appState.orphanedFiles.enumerated()), id: \.element) { _, fileURL in
+ OrphanRowView(
+ fileURL: fileURL,
+ isSelected: orphanBinding(for: fileURL),
+ fileSize: fileSize(fileURL),
+ onReveal: { revealInFinder(fileURL) },
+ onCopyPath: {
+ NSPasteboard.general.clearContents()
+ NSPasteboard.general.setString(fileURL.path, forType: .string)
+ },
+ onTrash: { Task { await removeSingleOrphan(fileURL) } }
+ )
+ .transition(
+ reduceMotion
+ ? .opacity
+ : .asymmetric(
+ insertion: .opacity,
+ removal: .move(edge: .leading).combined(with: .opacity)
+ )
+ )
}
}
}
@@ -174,7 +160,15 @@ struct OrphanListView: View {
}
}
- appState.orphanedFiles.removeAll { removedURLs.contains($0) }
+ // Sweep removed rows out (per-row transitions are attached in the
+ // List above); plain assignment under Reduce Motion.
+ if reduceMotion {
+ appState.orphanedFiles.removeAll { removedURLs.contains($0) }
+ } else {
+ withAnimation(.spring(response: 0.35, dampingFraction: 0.8)) {
+ appState.orphanedFiles.removeAll { removedURLs.contains($0) }
+ }
+ }
selectedOrphans.subtract(removedURLs)
if !failedPaths.isEmpty {
@@ -267,3 +261,62 @@ struct OrphanListView: View {
}
}
}
+
+// MARK: - Row
+
+/// Orphan row extracted to its own struct so hover highlight and the springy
+/// checkbox are per-row state.
+private struct OrphanRowView: View {
+ let fileURL: URL
+ @Binding var isSelected: Bool
+ let fileSize: Int64?
+ let onReveal: () -> Void
+ let onCopyPath: () -> Void
+ let onTrash: () -> Void
+
+ @State private var hovering = false
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
+
+ var body: some View {
+ Toggle(isOn: $isSelected) {
+ HStack {
+ Image(nsImage: NSWorkspace.shared.icon(forFile: fileURL.path))
+ .resizable()
+ .frame(width: 16, height: 16)
+
+ VStack(alignment: .leading, spacing: 2) {
+ Text(fileURL.lastPathComponent)
+ .lineLimit(1)
+ Text(fileURL.path)
+ .font(.caption)
+ .foregroundStyle(.tertiary)
+ .lineLimit(1)
+ .truncationMode(.middle)
+ }
+
+ Spacer()
+
+ if let size = fileSize {
+ Text(ByteCountFormatter.string(fromByteCount: size, countStyle: .file))
+ .monospacedDigit()
+ .foregroundStyle(.secondary)
+ }
+ }
+ }
+ .toggleStyle(AnimatedCheckboxStyle(tint: Tint.pink))
+ .padding(.vertical, 2)
+ .padding(.horizontal, 4)
+ .background(
+ RoundedRectangle(cornerRadius: 6, style: .continuous)
+ .fill(hovering ? Color.primary.opacity(0.06) : .clear)
+ )
+ .animation(reduceMotion ? nil : MotionTokens.snappy, value: hovering)
+ .onHover { hovering = $0 }
+ .contextMenu {
+ Button("Reveal in Finder") { onReveal() }
+ Button("Copy Path") { onCopyPath() }
+ Divider()
+ Button("Move to Trash", role: .destructive) { onTrash() }
+ }
+ }
+}
diff --git a/PureMac/Views/Settings/SettingsView.swift b/PureMac/Views/Settings/SettingsView.swift
index 71e2520..1174e98 100644
--- a/PureMac/Views/Settings/SettingsView.swift
+++ b/PureMac/Views/Settings/SettingsView.swift
@@ -40,8 +40,10 @@ struct GeneralSettingsView: View {
@AppStorage("settings.general.launchAtLogin") private var launchAtLogin = false
@AppStorage("settings.general.searchSensitivity") private var sensitivity: SearchSensitivity = .enhanced
@AppStorage("settings.general.confirmBeforeDelete") private var confirmBeforeDelete = true
+ @AppStorage(Haptics.soundEffectsKey) private var soundEffects = true
@AppStorage(AppLanguage.preferenceKey) private var appLanguageRaw = AppLanguage.current.rawValue
@State private var languageNeedsRelaunch = false
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
var body: some View {
Form {
@@ -75,18 +77,26 @@ struct GeneralSettingsView: View {
Text("Restart PureMac to apply the selected language.")
.font(.caption)
.foregroundStyle(.secondary)
+ .transition(.opacity.combined(with: .move(edge: .top)))
Button("Relaunch Now") {
relaunchApp()
}
+ .transition(.opacity.combined(with: .move(edge: .top)))
}
}
+ Section("Sound") {
+ Toggle("Play sound effects", isOn: $soundEffects)
+ }
+
Section("Safety") {
Toggle("Confirm before deleting files", isOn: $confirmBeforeDelete)
}
}
.formStyle(.grouped)
+ .animation(reduceMotion ? nil : .spring(response: 0.35, dampingFraction: 0.85),
+ value: languageNeedsRelaunch)
}
private var launchAtLoginBinding: Binding<Bool> {
@@ -181,6 +191,7 @@ struct CleaningSettingsView: View {
struct ScheduleSettingsView: View {
@EnvironmentObject var appState: AppState
+ @Environment(\.accessibilityReduceMotion) private var reduceMotion
var body: some View {
Form {
@@ -188,26 +199,31 @@ struct ScheduleSettingsView: View {
Toggle("Enable scheduled scanning", isOn: $appState.scheduler.config.isEnabled)
if appState.scheduler.config.isEnabled {
- Picker("Scan interval", selection: $appState.scheduler.config.interval) {
- ForEach(ScheduleInterval.allCases) { interval in
- Text(LocalizedStringKey(interval.rawValue)).tag(interval)
+ Group {
+ Picker("Scan interval", selection: $appState.scheduler.config.interval) {
+ ForEach(ScheduleInterval.allCases) { interval in
+ Text(LocalizedStringKey(interval.rawValue)).tag(interval)
+ }
}
- }
- Toggle("Auto-clean after scan", isOn: $appState.scheduler.config.autoClean)
- Toggle("Auto-purge purgeable space", isOn: $appState.scheduler.config.autoPurge)
- Toggle("Notify on completion", isOn: $appState.scheduler.config.notifyOnCompletion)
+ Toggle("Auto-clean after scan", isOn: $appState.scheduler.config.autoClean)
+ Toggle("Auto-purge purgeable space", isOn: $appState.scheduler.config.autoPurge)
+ Toggle("Notify on completion", isOn: $appState.scheduler.config.notifyOnCompletion)
- HStack {
- Text("Last run")
- Spacer()
- Text(appState.scheduler.config.formattedLastRun)
- .foregroundStyle(.secondary)
+ HStack {
+ Text("Last run")
+ Spacer()
+ Text(appState.scheduler.config.formattedLastRun)
+ .foregroundStyle(.secondary)
+ }
}
+ .transition(.opacity.combined(with: .move(edge: .top)))
}
}
}
.formStyle(.grouped)
+ .animation(reduceMotion ? nil : .spring(response: 0.35, dampingFraction: 0.85),
+ value: appState.scheduler.config.isEnabled)
}
}
diff --git a/PureMac/ar.lproj/Localizable.strings b/PureMac/ar.lproj/Localizable.strings
index c9aaf16..7ac6163 100644
--- a/PureMac/ar.lproj/Localizable.strings
+++ b/PureMac/ar.lproj/Localizable.strings
@@ -335,3 +335,15 @@
"Storage composition" = "تكوين مساحة التخزين";
"total" = "الإجمالي";
"Free" = "متاح";
+
+/* UI polish (v2.8.0): leftover groups + sound toggle */
+"Application" = "التطبيق";
+"Caches" = "ذاكرة التخزين المؤقت";
+"Application Support" = "دعم التطبيقات";
+"Preferences" = "التفضيلات";
+"Logs" = "السجلات";
+"Containers" = "الحاويات";
+"Launch Agents" = "عناصر بدء التشغيل";
+"Other Files" = "ملفات أخرى";
+"Sound" = "الصوت";
+"Play sound effects" = "تشغيل المؤثرات الصوتية";
diff --git a/PureMac/en.lproj/Localizable.strings b/PureMac/en.lproj/Localizable.strings
index 427abd9..bb6dd48 100644
--- a/PureMac/en.lproj/Localizable.strings
+++ b/PureMac/en.lproj/Localizable.strings
@@ -335,3 +335,15 @@
"Storage composition" = "Storage composition";
"total" = "total";
"Free" = "Free";
+
+/* UI polish (v2.8.0): leftover groups + sound toggle */
+"Application" = "Application";
+"Caches" = "Caches";
+"Application Support" = "Application Support";
+"Preferences" = "Preferences";
+"Logs" = "Logs";
+"Containers" = "Containers";
+"Launch Agents" = "Launch Agents";
+"Other Files" = "Other Files";
+"Sound" = "Sound";
+"Play sound effects" = "Play sound effects";
diff --git a/PureMac/es.lproj/Localizable.strings b/PureMac/es.lproj/Localizable.strings
index d718615..4221928 100644
--- a/PureMac/es.lproj/Localizable.strings
+++ b/PureMac/es.lproj/Localizable.strings
@@ -335,3 +335,15 @@
"Storage composition" = "Composición del almacenamiento";
"total" = "total";
"Free" = "Libre";
+
+/* UI polish (v2.8.0): leftover groups + sound toggle */
+"Application" = "Aplicación";
+"Caches" = "Cachés";
+"Application Support" = "Soporte de aplicaciones";
+"Preferences" = "Preferencias";
+"Logs" = "Registros";
+"Containers" = "Contenedores";
+"Launch Agents" = "Agentes de inicio";
+"Other Files" = "Otros archivos";
+"Sound" = "Sonido";
+"Play sound effects" = "Reproducir efectos de sonido";
diff --git a/PureMac/ja.lproj/Localizable.strings b/PureMac/ja.lproj/Localizable.strings
index 3d1104c..e1bdf74 100644
--- a/PureMac/ja.lproj/Localizable.strings
+++ b/PureMac/ja.lproj/Localizable.strings
@@ -335,3 +335,15 @@
"Storage composition" = "ストレージの内訳";
"total" = "合計";
"Free" = "空き";
+
+/* UI polish (v2.8.0): leftover groups + sound toggle */
+"Application" = "アプリケーション";
+"Caches" = "キャッシュ";
+"Application Support" = "アプリケーションサポート";
+"Preferences" = "環境設定";
+"Logs" = "ログ";
+"Containers" = "コンテナ";
+"Launch Agents" = "起動エージェント";
+"Other Files" = "その他のファイル";
+"Sound" = "サウンド";
+"Play sound effects" = "効果音を再生";
diff --git a/PureMac/pt-BR.lproj/Localizable.strings b/PureMac/pt-BR.lproj/Localizable.strings
index 57c150d..c3e2245 100644
--- a/PureMac/pt-BR.lproj/Localizable.strings
+++ b/PureMac/pt-BR.lproj/Localizable.strings
@@ -335,3 +335,15 @@
"Storage composition" = "Composição do armazenamento";
"total" = "total";
"Free" = "Livre";
+
+/* UI polish (v2.8.0): leftover groups + sound toggle */
+"Application" = "Aplicativo";
+"Caches" = "Caches";
+"Application Support" = "Suporte de aplicativos";
+"Preferences" = "Preferências";
+"Logs" = "Registros";
+"Containers" = "Contêineres";
+"Launch Agents" = "Agentes de inicialização";
+"Other Files" = "Outros arquivos";
+"Sound" = "Som";
+"Play sound effects" = "Reproduzir efeitos sonoros";
diff --git a/PureMac/zh-Hans.lproj/Localizable.strings b/PureMac/zh-Hans.lproj/Localizable.strings
index a5fe1bf..1858e26 100644
--- a/PureMac/zh-Hans.lproj/Localizable.strings
+++ b/PureMac/zh-Hans.lproj/Localizable.strings
@@ -335,3 +335,15 @@
"Storage composition" = "存储构成";
"total" = "总计";
"Free" = "可用";
+
+/* UI polish (v2.8.0): leftover groups + sound toggle */
+"Application" = "应用程序";
+"Caches" = "缓存";
+"Application Support" = "应用程序支持";
+"Preferences" = "偏好设置";
+"Logs" = "日志";
+"Containers" = "容器";
+"Launch Agents" = "启动代理";
+"Other Files" = "其他文件";
+"Sound" = "声音";
+"Play sound effects" = "播放音效";
diff --git a/PureMac/zh-Hant.lproj/Localizable.strings b/PureMac/zh-Hant.lproj/Localizable.strings
index b569e40..4e8f255 100644
--- a/PureMac/zh-Hant.lproj/Localizable.strings
+++ b/PureMac/zh-Hant.lproj/Localizable.strings
@@ -335,3 +335,15 @@
"Storage composition" = "儲存空間組成";
"total" = "總計";
"Free" = "可用";
+
+/* UI polish (v2.8.0): leftover groups + sound toggle */
+"Application" = "應用程式";
+"Caches" = "快取";
+"Application Support" = "應用程式支援";
+"Preferences" = "偏好設定";
+"Logs" = "日誌";
+"Containers" = "容器";
+"Launch Agents" = "啟動代理";
+"Other Files" = "其他檔案";
+"Sound" = "聲音";
+"Play sound effects" = "播放音效";
diff --git a/project.yml b/project.yml
index 649f8ac..75449a1 100644
--- a/project.yml
+++ b/project.yml
@@ -23,8 +23,8 @@ settings:
CODE_SIGN_ENTITLEMENTS: "PureMac/PureMac.entitlements"
INFOPLIST_FILE: "PureMac/Info.plist"
PRODUCT_BUNDLE_IDENTIFIER: "com.puremac.app"
- MARKETING_VERSION: "2.7.0"
- CURRENT_PROJECT_VERSION: "14"
+ MARKETING_VERSION: "2.8.0"
+ CURRENT_PROJECT_VERSION: "15"
GENERATE_INFOPLIST_FILE: "NO"
ASSETCATALOG_COMPILER_APPICON_NAME: "AppIcon"
COMBINE_HIDPI_IMAGES: "YES"