Free, open-source macOS cleaner. CleanMyMac alternative with zero telemetry. Native SwiftUI, scheduled auto-cleaning, Xcode/Homebrew/system cache cleanup. MIT licensed.
Swift cache-cleanercleanmymaccleanupdisk-cleanerdisk-spacehomebrewmac-utilitymacosmacos-appmacos-cleanermacosxnativeossosxprivacyswiftswiftuisystem-cleanerxcode-cleaner
feat: drag-to-Settings + haptics + welcome confetti + bump to 2.6.0 (build 12)
moamen8978cbdee11d
diff --git a/PureMac.xcodeproj/project.pbxproj b/PureMac.xcodeproj/project.pbxprojindex 3c831bd..04b10f7 100644--- a/PureMac.xcodeproj/project.pbxproj+++ b/PureMac.xcodeproj/project.pbxproj@@ -31,13 +31,16 @@9AA80E035DF7B33F6EE118DF /* AppState.swift in Sources */ = {isa = PBXBuildFile; fileRef = CED1B71D5F9510582E869CFD /* AppState.swift */; };9BB5AAA574AFED6C27A3F8E2 /* AppPathFinder.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC0FEE7141871ED5F9E36121 /* AppPathFinder.swift */; };A2AE68CC75CB72D6B10CBDF5 /* DashboardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F661A0F64CF93E482CB1728F /* DashboardView.swift */; };+ A549D8A39A9E5E70D91B90A6 /* Haptics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40A3F22FCEF534DE4A2CAD0E /* Haptics.swift */; };A9C3A1F643C26930F442E729 /* OrphanSafetyPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AE790496C936424EF98320A /* OrphanSafetyPolicy.swift */; };+ ABDDD4F35102A39CC1A2C325 /* ConfettiView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0599AA604B0D6BA4F957537 /* ConfettiView.swift */; };B52938BBD11842631314543D /* CategoryDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10B0AF194677EAC1D5568785 /* CategoryDetailView.swift */; };BC6C800216343438413349A3 /* OnboardingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D4FD34378988D430A582ED0 /* OnboardingView.swift */; };CDCDFEBA39A3290101F86AC6 /* MainWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F510F232341EE18F11DC934 /* MainWindow.swift */; };CFA64F54CDBF8A4765E0068D /* LocalizationFilesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 155CE1B8CDCCCA6F9FD028C1 /* LocalizationFilesTests.swift */; };D50EB059E741011EB2523731 /* ScanError.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEF15CB1B8EFCA78EF491824 /* ScanError.swift */; };D9445C2641A8637B65DA5ACE /* ScanEngine.swift in Sources */ = {isa = PBXBuildFile; fileRef = A711CDF5285F68775D9B5513 /* ScanEngine.swift */; };+ DC32253D26D0E29762006DA0 /* AppBundleDragHandle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D3F9FEDC493A8E49E910F67 /* AppBundleDragHandle.swift */; };DDD6BA35DBF32E7A6B5F6F8B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B2EA41E1096FA8E3B916AD13 /* Assets.xcassets */; };DDDA5879006CB97D5D7BDD87 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5785762276FB5E3209C6DE4D /* Logger.swift */; };E2403D82F00D749C9AD4A6D4 /* AppStateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 752603285F7DBBA12BB3AA91 /* AppStateTests.swift */; };@@ -73,11 +76,13 @@2641C6376DD6F5889F35510E /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };28181F034530331A550C6A3D /* SchedulerService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SchedulerService.swift; sourceTree = "<group>"; };2A8DE5D45BA19E2670B57DC5 /* CleaningEngine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CleaningEngine.swift; sourceTree = "<group>"; };+ 2D3F9FEDC493A8E49E910F67 /* AppBundleDragHandle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppBundleDragHandle.swift; sourceTree = "<group>"; };311078221878708524283765 /* PureMac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PureMac.app; sourceTree = BUILT_PRODUCTS_DIR; };340D303C60FF878B019056B6 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };3667D46D8E2004EB4D73835A /* Models.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Models.swift; sourceTree = "<group>"; };3A8D39C3C250F26302EC45AB /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };3D4FD34378988D430A582ED0 /* OnboardingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingView.swift; sourceTree = "<group>"; };+ 40A3F22FCEF534DE4A2CAD0E /* Haptics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Haptics.swift; sourceTree = "<group>"; };424F7B28624C271620E13BBC /* EmptyStateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyStateView.swift; sourceTree = "<group>"; };46660271CFF167AB0FE7371D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };491771F923C93FD61A263893 /* AppLanguagePreferencesTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLanguagePreferencesTests.swift; sourceTree = "<group>"; };@@ -106,6 +111,7 @@CED1B71D5F9510582E869CFD /* AppState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppState.swift; sourceTree = "<group>"; };E866A1541D289C69144A5E62 /* FullDiskAccessManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FullDiskAccessManager.swift; sourceTree = "<group>"; };EEF15CB1B8EFCA78EF491824 /* ScanError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScanError.swift; sourceTree = "<group>"; };+ F0599AA604B0D6BA4F957537 /* ConfettiView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfettiView.swift; sourceTree = "<group>"; };F31F91226CDCFBB8E303B7DA /* AppConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppConstants.swift; sourceTree = "<group>"; };F661A0F64CF93E482CB1728F /* DashboardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DashboardView.swift; sourceTree = "<group>"; };F9DCBD97CC88D77AE8DB01A4 /* PermissionCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionCoordinator.swift; sourceTree = "<group>"; };@@ -181,6 +187,7 @@children = (2A8DE5D45BA19E2670B57DC5 /* CleaningEngine.swift */,E866A1541D289C69144A5E62 /* FullDiskAccessManager.swift */,+ 40A3F22FCEF534DE4A2CAD0E /* Haptics.swift */,F9DCBD97CC88D77AE8DB01A4 /* PermissionCoordinator.swift */,A711CDF5285F68775D9B5513 /* ScanEngine.swift */,28181F034530331A550C6A3D /* SchedulerService.swift */,@@ -208,8 +215,10 @@8AE26715B5748307483A1A5E /* Components */ = {isa = PBXGroup;children = (+ 2D3F9FEDC493A8E49E910F67 /* AppBundleDragHandle.swift */,92259B3E9F4468865F15DEEC /* AppearancePill.swift */,1AB003A7751F05727DBFD1A5 /* AppTheme.swift */,+ F0599AA604B0D6BA4F957537 /* ConfettiView.swift */,424F7B28624C271620E13BBC /* EmptyStateView.swift */,231FF7CBB5F621B66F2AB8A5 /* FDADemoView.swift */,069AAE87E3F9EDE5593AD8B3 /* PermissionSheet.swift */,@@ -406,6 +415,7 @@isa = PBXSourcesBuildPhase;buildActionMask = 2147483647;files = (+ DC32253D26D0E29762006DA0 /* AppBundleDragHandle.swift in Sources */,4F754D89F4CE5142BE384062 /* AppConstants.swift in Sources */,1B0D043102FDB245312A5147 /* AppFilesView.swift in Sources */,F1F506C146E17D6CEC4A12F3 /* AppInfoFetcher.swift in Sources */,@@ -419,10 +429,12 @@B52938BBD11842631314543D /* CategoryDetailView.swift in Sources */,48D1431A7C99C19EEBDB056B /* CleaningEngine.swift in Sources */,8947F0CE448791BD50EECF46 /* Conditions.swift in Sources */,+ ABDDD4F35102A39CC1A2C325 /* ConfettiView.swift in Sources */,A2AE68CC75CB72D6B10CBDF5 /* DashboardView.swift in Sources */,76B132F9C499225D33E0D075 /* EmptyStateView.swift in Sources */,52F11962555C639F0EECADD6 /* FDADemoView.swift in Sources */,2253F11BDF561B617439C96B /* FullDiskAccessManager.swift in Sources */,+ A549D8A39A9E5E70D91B90A6 /* Haptics.swift in Sources */,E60B0A2C5D0A6CAE35BF4DFB /* Locations.swift in Sources */,DDDA5879006CB97D5D7BDD87 /* Logger.swift in Sources */,CDCDFEBA39A3290101F86AC6 /* MainWindow.swift in Sources */,@@ -521,7 +533,7 @@CODE_SIGN_STYLE = Automatic;COMBINE_HIDPI_IMAGES = YES;COPY_PHASE_STRIP = NO;- CURRENT_PROJECT_VERSION = 11;+ CURRENT_PROJECT_VERSION = 12;DEBUG_INFORMATION_FORMAT = dwarf;DEVELOPMENT_TEAM = H3WXHVTP97;ENABLE_STRICT_OBJC_MSGSEND = YES;@@ -543,7 +555,7 @@GENERATE_INFOPLIST_FILE = NO;INFOPLIST_FILE = PureMac/Info.plist;MACOSX_DEPLOYMENT_TARGET = 13.0;- MARKETING_VERSION = 2.5.2;+ MARKETING_VERSION = 2.6.0;MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;MTL_FAST_MATH = YES;ONLY_ACTIVE_ARCH = NO;@@ -645,7 +657,7 @@CODE_SIGN_STYLE = Automatic;COMBINE_HIDPI_IMAGES = YES;COPY_PHASE_STRIP = NO;- CURRENT_PROJECT_VERSION = 11;+ CURRENT_PROJECT_VERSION = 12;DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";DEVELOPMENT_TEAM = H3WXHVTP97;ENABLE_NS_ASSERTIONS = NO;@@ -661,7 +673,7 @@GENERATE_INFOPLIST_FILE = NO;INFOPLIST_FILE = PureMac/Info.plist;MACOSX_DEPLOYMENT_TARGET = 13.0;- MARKETING_VERSION = 2.5.2;+ MARKETING_VERSION = 2.6.0;MTL_ENABLE_DEBUG_INFO = NO;MTL_FAST_MATH = YES;ONLY_ACTIVE_ARCH = NO;diff --git a/PureMac/Services/Haptics.swift b/PureMac/Services/Haptics.swiftnew file mode 100644index 0000000..f229695--- /dev/null+++ b/PureMac/Services/Haptics.swift@@ -0,0 +1,31 @@+import AppKit++/// Thin wrapper around `NSHapticFeedbackManager` so call sites don't have to+/// reach into AppKit. Only Force Touch trackpads produce a click; on other+/// hardware the calls are no-ops, which is the documented behavior.+///+/// We deliberately use the system performer rather than spinning up a custom+/// haptic engine — the standard patterns (alignment / levelChange / generic)+/// already match what users expect from Apple's own apps.+enum Haptics {+ /// Light tick — use for transient UI feedback like advancing a page or+ /// flipping a toggle. Cheapest of the three.+ static func tap() {+ perform(.alignment)+ }++ /// Stronger affirmation — use when a user-visible state change crosses a+ /// boundary (Full Disk Access granted, scan completed, clean finished).+ static func success() {+ perform(.levelChange)+ }++ /// Generic feedback — fallback when nothing else fits.+ static func generic() {+ perform(.generic)+ }++ private static func perform(_ pattern: NSHapticFeedbackManager.FeedbackPattern) {+ NSHapticFeedbackManager.defaultPerformer.perform(pattern, performanceTime: .now)+ }+}diff --git a/PureMac/Services/PermissionCoordinator.swift b/PureMac/Services/PermissionCoordinator.swiftindex 9cd7bf0..2193718 100644--- a/PureMac/Services/PermissionCoordinator.swift+++ b/PureMac/Services/PermissionCoordinator.swift@@ -174,6 +174,7 @@ final class PermissionCoordinator: ObservableObject {let callback = onGrantCallbackonGrantCallback = nilstopPolling()+ Haptics.success()// Cancel any prior pending grant work — guarantees the callback fires// at most once even if grant is detected twice in rapid succession// (e.g. immediate-read + first poll tick both fire).diff --git a/PureMac/ViewModels/AppState.swift b/PureMac/ViewModels/AppState.swiftindex 85a3a2a..1d0d099 100644--- a/PureMac/ViewModels/AppState.swift+++ b/PureMac/ViewModels/AppState.swift@@ -724,6 +724,7 @@ final class AppState: ObservableObject {totalFreedSpace = result.freedSpacelastCleanedDate = Date()+ if result.itemsCleaned > 0 { Haptics.success() }let survivors = itemsToClean.filter { !result.cleanedPaths.contains($0.path) }diff --git a/PureMac/Views/Components/AppBundleDragHandle.swift b/PureMac/Views/Components/AppBundleDragHandle.swiftnew file mode 100644index 0000000..06e0e4f--- /dev/null+++ b/PureMac/Views/Components/AppBundleDragHandle.swift@@ -0,0 +1,78 @@+import AppKit+import SwiftUI++/// Draggable PureMac.app affordance. The user grabs the icon out of our sheet+/// and drops it into the Full Disk Access list inside System Settings, which+/// auto-adds the bundle without making them hunt for it in Finder.+///+/// macOS's Privacy & Security panes accept file-URL drops in their service+/// lists. We expose the running app's bundle URL via `NSItemProvider` so the+/// drop registers as a legitimate filesystem drag — identical to dragging+/// from Finder, just sourced from inside the app.+struct AppBundleDragHandle: View {+ @State private var hovering = false++ private var bundleURL: URL {+ Bundle.main.bundleURL+ }++ var body: some View {+ VStack(spacing: 8) {+ ZStack {+ RoundedRectangle(cornerRadius: 14, style: .continuous)+ .fill(Color.primary.opacity(hovering ? 0.10 : 0.06))+ .frame(width: 84, height: 84)+ .overlay(+ RoundedRectangle(cornerRadius: 14, style: .continuous)+ .strokeBorder(+ hovering ? Tint.blue.opacity(0.6) : Color.primary.opacity(0.10),+ style: StrokeStyle(lineWidth: hovering ? 1.5 : 0.5,+ dash: hovering ? [] : [3, 3])+ )+ )++ appIcon+ .frame(width: 56, height: 56)+ .scaleEffect(hovering ? 1.04 : 1.0)+ .shadow(color: .black.opacity(hovering ? 0.18 : 0.08),+ radius: hovering ? 8 : 4, y: hovering ? 3 : 1)+ }+ .animation(.easeOut(duration: 0.18), value: hovering)++ VStack(spacing: 1) {+ Text("PureMac.app")+ .font(.system(size: 11.5, weight: .semibold))+ Text("Drag to the Settings list")+ .font(.system(size: 10.5))+ .foregroundStyle(.secondary)+ }+ }+ .padding(12)+ .onHover { hovering = $0 }+ .help("Drag this icon into the Full Disk Access list in System Settings.")+ // Standard file-drag pipeline. `NSItemProvider(contentsOf:)` infers+ // the right uniform type (com.apple.application-bundle for an .app)+ // and exposes the URL as a file representation — exactly what+ // System Settings' FDA pane expects from a Finder drop.+ .onDrag {+ if let provider = NSItemProvider(contentsOf: bundleURL) {+ provider.suggestedName = bundleURL.lastPathComponent+ return provider+ }+ return NSItemProvider()+ }+ }++ @ViewBuilder+ private var appIcon: some View {+ if let nsImage = NSWorkspace.shared.icon(forFile: bundleURL.path) as NSImage? {+ Image(nsImage: nsImage)+ .resizable()+ .interpolation(.high)+ } else {+ Image(systemName: "app.fill")+ .font(.system(size: 36))+ .foregroundStyle(Tint.blue)+ }+ }+}diff --git a/PureMac/Views/Components/ConfettiView.swift b/PureMac/Views/Components/ConfettiView.swiftnew file mode 100644index 0000000..41128d2--- /dev/null+++ b/PureMac/Views/Components/ConfettiView.swift@@ -0,0 +1,106 @@+import AppKit+import SwiftUI++/// One-shot confetti burst. Wraps a `CAEmitterLayer` so the particles run on+/// Core Animation rather than burning a SwiftUI render pass per frame. Use+/// `ConfettiView(trigger: someBool)` and flip `trigger` to fire. The emitter+/// produces a short burst (~1.2s of emission, ~2.5s for particles to fall)+/// then quiets itself so it doesn't keep churning if the view stays alive.+struct ConfettiView: NSViewRepresentable {+ /// Flip this to fire a new burst. Each rising edge fires once.+ let trigger: Bool++ final class Coordinator {+ var lastTrigger = false+ }++ func makeCoordinator() -> Coordinator { Coordinator() }++ func makeNSView(context: Context) -> NSView {+ let host = HostingView()+ host.wantsLayer = true+ host.layer = CALayer()+ return host+ }++ func updateNSView(_ nsView: NSView, context: Context) {+ if trigger && !context.coordinator.lastTrigger {+ (nsView as? HostingView)?.fire()+ }+ context.coordinator.lastTrigger = trigger+ }++ // MARK: - Host+ /// Subclass so we can capture bounds for emitter geometry.+ final class HostingView: NSView {+ override var isFlipped: Bool { true }++ func fire() {+ guard let layer = self.layer else { return }+ let emitter = CAEmitterLayer()+ emitter.emitterPosition = CGPoint(x: bounds.midX, y: -10)+ emitter.emitterSize = CGSize(width: bounds.width, height: 1)+ emitter.emitterShape = .line+ emitter.beginTime = CACurrentMediaTime()+ emitter.birthRate = 1.0+ emitter.emitterCells = makeCells()+ layer.addSublayer(emitter)++ // Stop emission after a short burst — particles already in flight+ // continue falling and clean up via removeFromSuperlayer below.+ DispatchQueue.main.asyncAfter(deadline: .now() + 1.2) {+ emitter.birthRate = 0+ }+ DispatchQueue.main.asyncAfter(deadline: .now() + 4.0) {+ emitter.removeFromSuperlayer()+ }+ }++ private func makeCells() -> [CAEmitterCell] {+ let colors: [NSColor] = [+ NSColor(srgbRed: 0.04, green: 0.52, blue: 1.00, alpha: 1),+ NSColor(srgbRed: 0.18, green: 0.78, blue: 0.47, alpha: 1),+ NSColor(srgbRed: 1.00, green: 0.58, blue: 0.04, alpha: 1),+ NSColor(srgbRed: 0.55, green: 0.32, blue: 0.87, alpha: 1),+ NSColor(srgbRed: 1.00, green: 0.30, blue: 0.50, alpha: 1),+ NSColor(srgbRed: 1.00, green: 0.78, blue: 0.04, alpha: 1),+ ]+ return colors.map { color in+ let cell = CAEmitterCell()+ cell.contents = Self.particleImage().cgImage(+ forProposedRect: nil, context: nil, hints: nil+ )+ cell.color = color.cgColor+ cell.birthRate = 16+ cell.lifetime = 6.0+ cell.lifetimeRange = 1.0+ cell.velocity = 220+ cell.velocityRange = 90+ cell.yAcceleration = 240+ cell.xAcceleration = 0+ cell.emissionLongitude = .pi / 2 // straight down+ cell.emissionRange = .pi / 5+ cell.spin = 4+ cell.spinRange = 6+ cell.scale = 0.35+ cell.scaleRange = 0.20+ cell.alphaSpeed = -0.35 // fade as they fall+ return cell+ }+ }++ /// Tiny rectangle PNG used as the particle texture. Keeping the image+ /// procedural means we don't ship an asset just for confetti.+ private static func particleImage() -> NSImage {+ let size = NSSize(width: 10, height: 14)+ let image = NSImage(size: size)+ image.lockFocus()+ NSColor.white.setFill()+ let path = NSBezierPath(roundedRect: NSRect(origin: .zero, size: size),+ xRadius: 1.5, yRadius: 1.5)+ path.fill()+ image.unlockFocus()+ return image+ }+ }+}diff --git a/PureMac/Views/Components/PermissionSheet.swift b/PureMac/Views/Components/PermissionSheet.swiftindex aa9e3ef..5004e4a 100644--- a/PureMac/Views/Components/PermissionSheet.swift+++ b/PureMac/Views/Components/PermissionSheet.swift@@ -83,19 +83,36 @@ struct PermissionSheet: View {private var requestBody: some View {VStack(alignment: .leading, spacing: 18) {- // Primary action — use the system's borderedProminent so the- // button feels native rather than like a marketing CTA.- Button {- coordinator.openSettingsAndReveal()- } label: {- Label("Open Settings & reveal PureMac", systemImage: "gear")- .font(.system(size: 13, weight: .semibold))- .frame(maxWidth: .infinity)- .padding(.vertical, 6)+ // Two paths the user can choose between: drag the PureMac bundle+ // straight into the FDA list, OR have us reveal it in Finder so+ // they can drag from there. Drag-from-our-sheet is faster but+ // some users will still prefer the Finder flow they recognize.+ HStack(alignment: .center, spacing: 14) {+ AppBundleDragHandle()++ Divider().frame(maxHeight: 110)++ VStack(spacing: 8) {+ Button {+ Haptics.tap()+ coordinator.openSettingsAndReveal()+ } label: {+ Label("Open Settings & reveal PureMac", systemImage: "gear")+ .font(.system(size: 13, weight: .semibold))+ .frame(maxWidth: .infinity)+ .padding(.vertical, 4)+ }+ .buttonStyle(.borderedProminent)+ .controlSize(.large)+ .keyboardShortcut(.defaultAction)++ Text("Or drag the icon on the left straight into Settings.")+ .font(.system(size: 11))+ .foregroundStyle(.tertiary)+ .multilineTextAlignment(.center)+ }+ .frame(maxWidth: .infinity)}- .buttonStyle(.borderedProminent)- .controlSize(.large)- .keyboardShortcut(.defaultAction)// Step-by-step stripHStack(spacing: 0) {diff --git a/PureMac/Views/OnboardingView.swift b/PureMac/Views/OnboardingView.swiftindex 7c16f18..e206d9f 100644--- a/PureMac/Views/OnboardingView.swift+++ b/PureMac/Views/OnboardingView.swift@@ -147,6 +147,8 @@ struct OnboardingView: View {private func advance(by delta: Int) {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)) {page = Page(rawValue: target) ?? page}@@ -168,6 +170,7 @@ struct OnboardingView: View {withAnimation(.easeInOut(duration: 0.3)) {hasFda = granted}+ if granted { Haptics.success() }}// Auto-advance once they grant access while on the permission page.// The autoAdvanceScheduled latch prevents the 1-second poll from@@ -324,8 +327,8 @@ private struct PermissionScene: View {let revealAppInFinder: () -> Voidvar body: some View {- VStack(spacing: 20) {- VStack(spacing: 10) {+ VStack(spacing: 18) {+ VStack(spacing: 8) {Text(hasFda ? "Permission granted" : "One permission, then we're done").font(.system(size: 26, weight: .semibold)).multilineTextAlignment(.center)@@ -339,7 +342,7 @@ private struct PermissionScene: View {}FDADemoView()- .frame(maxWidth: 440)+ .frame(maxWidth: 420)if hasFda {Label("All set — moving you to the next step.", systemImage: "checkmark.circle.fill")@@ -347,35 +350,51 @@ private struct PermissionScene: View {.foregroundStyle(Tint.green).transition(.opacity.combined(with: .scale))} else {- VStack(spacing: 6) {- Button {- openSettings()- } label: {- Label(hasOpenedSettings ? "Reopen Settings" : "Open Settings & reveal PureMac",- systemImage: "gear")- .font(.system(size: 13, weight: .semibold))- .frame(minWidth: 280)- .padding(.vertical, 4)- }- .buttonStyle(.borderedProminent)- .controlSize(.large)- .keyboardShortcut(.defaultAction)-- if hasOpenedSettings {- HStack(spacing: 14) {- Button("Reveal app again") { revealAppInFinder() }+ // Two equally legitimate paths: open Settings and have it+ // reveal PureMac in Finder, OR grab the draggable icon on the+ // left and drop it directly into the FDA list. Showing both+ // side by side lets users pick the path their mental model+ // prefers without a 3-step decision tree.+ HStack(alignment: .top, spacing: 18) {+ AppBundleDragHandle()+ Divider().frame(maxHeight: 90)+ VStack(spacing: 8) {+ Button {+ openSettings()+ } label: {+ Label(hasOpenedSettings ? "Reopen Settings" : "Open Settings & reveal PureMac",+ systemImage: "gear")+ .font(.system(size: 13, weight: .semibold))+ .frame(minWidth: 240)+ .padding(.vertical, 2)+ }+ .buttonStyle(.borderedProminent)+ .controlSize(.large)+ .keyboardShortcut(.defaultAction)++ if hasOpenedSettings {+ HStack(spacing: 12) {+ Button("Reveal app again") { revealAppInFinder() }+ .buttonStyle(.link)+ .font(.system(size: 11.5))+ Button("Reset permissions") {+ _ = FullDiskAccessManager.shared.resetFullDiskAccess()+ FullDiskAccessManager.shared.triggerRegistration()+ }.buttonStyle(.link).font(.system(size: 11.5))- Button("Reset permissions") {- _ = FullDiskAccessManager.shared.resetFullDiskAccess()- FullDiskAccessManager.shared.triggerRegistration()}- .buttonStyle(.link)- .font(.system(size: 11.5))+ .transition(.opacity)+ } else {+ Text("Tip: drag the icon on the left straight into the list.")+ .font(.system(size: 11))+ .foregroundStyle(.tertiary)+ .multilineTextAlignment(.center)}- .transition(.opacity)}+ .frame(maxWidth: 260)}+ .padding(.top, 4)}}}@@ -384,39 +403,62 @@ private struct PermissionScene: View {private struct ReadyScene: View {let hasFda: Bool@State private var bounce = false+ @State private var fireConfetti = false+ @AppStorage("PureMac.HasSeenWelcomeConfetti") private var hasSeenConfetti = falsevar body: some View {- VStack(spacing: 22) {- Spacer(minLength: 0)-- ZStack {- Circle()- .fill((hasFda ? Tint.green : Tint.orange).opacity(0.12))- .frame(width: 110, height: 110)- Image(systemName: hasFda ? "checkmark" : "hand.wave.fill")- .font(.system(size: 50, weight: .semibold))- .foregroundStyle(hasFda ? Tint.green : Tint.orange)- .scaleEffect(bounce ? 1.05 : 1.0)+ ZStack {+ // Confetti sits above the content but behind any touch targets;+ // disabling hit-testing keeps the Start button clickable through+ // falling particles.+ if !hasSeenConfetti {+ ConfettiView(trigger: fireConfetti)+ .allowsHitTesting(false)}- .onAppear {- withAnimation(.spring(response: 0.5, dampingFraction: 0.55)) {- bounce = true++ VStack(spacing: 22) {+ Spacer(minLength: 0)++ ZStack {+ Circle()+ .fill((hasFda ? Tint.green : Tint.orange).opacity(0.12))+ .frame(width: 110, height: 110)+ Image(systemName: hasFda ? "checkmark" : "hand.wave.fill")+ .font(.system(size: 50, weight: .semibold))+ .foregroundStyle(hasFda ? Tint.green : Tint.orange)+ .scaleEffect(bounce ? 1.05 : 1.0)+ }+ .onAppear {+ withAnimation(.spring(response: 0.5, dampingFraction: 0.55)) {+ bounce = true+ }+ // Fire the welcome confetti exactly once per install.+ // Subsequent onboarding re-entries (e.g. after a Reset)+ // get a clean ready scene without the celebration.+ guard !hasSeenConfetti else { return }+ DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) {+ fireConfetti = true+ Haptics.success()+ }+ DispatchQueue.main.asyncAfter(deadline: .now() + 4.0) {+ hasSeenConfetti = true+ }}- }- VStack(spacing: 10) {- Text(hasFda ? "You're ready" : "Ready when you are")- .font(.system(size: 30, weight: .semibold))- Text(hasFda- ? "Hit Start to run your first Smart Scan."- : "Some features will be limited without Full Disk Access. You can grant it later in Settings.")- .font(.system(size: 13.5))- .foregroundStyle(.secondary)- .multilineTextAlignment(.center)- .frame(maxWidth: 420)- }+ VStack(spacing: 10) {+ Text(hasFda ? "You're ready" : "Ready when you are")+ .font(.system(size: 30, weight: .semibold))+ Text(hasFda+ ? "Hit Start to run your first Smart Scan."+ : "Some features will be limited without Full Disk Access. You can grant it later in Settings.")+ .font(.system(size: 13.5))+ .foregroundStyle(.secondary)+ .multilineTextAlignment(.center)+ .frame(maxWidth: 420)+ }- Spacer(minLength: 0)+ Spacer(minLength: 0)+ }}}}diff --git a/PureMac/ar.lproj/Localizable.strings b/PureMac/ar.lproj/Localizable.stringsindex 3b957a3..d89bbc2 100644--- a/PureMac/ar.lproj/Localizable.strings+++ b/PureMac/ar.lproj/Localizable.strings@@ -324,3 +324,9 @@"Skip" = "تخطي";"Start" = "ابدأ";"Continue" = "متابعة";++/* Drag handle */+"Drag to the Settings list" = "اسحب إلى قائمة الإعدادات";+"Drag this icon into the Full Disk Access list in System Settings." = "اسحب هذه الأيقونة إلى قائمة الوصول الكامل للقرص في إعدادات النظام.";+"Tip: drag the icon on the left straight into the list." = "نصيحة: اسحب الأيقونة على اليسار مباشرةً إلى القائمة.";+"Or drag the icon on the left straight into Settings." = "أو اسحب الأيقونة على اليسار مباشرةً إلى الإعدادات.";diff --git a/PureMac/en.lproj/Localizable.strings b/PureMac/en.lproj/Localizable.stringsindex a24185e..bb28698 100644--- a/PureMac/en.lproj/Localizable.strings+++ b/PureMac/en.lproj/Localizable.strings@@ -324,3 +324,9 @@"Skip" = "Skip";"Start" = "Start";"Continue" = "Continue";++/* Drag handle */+"Drag to the Settings list" = "Drag to the Settings list";+"Drag this icon into the Full Disk Access list in System Settings." = "Drag this icon into the Full Disk Access list in System Settings.";+"Tip: drag the icon on the left straight into the list." = "Tip: drag the icon on the left straight into the list.";+"Or drag the icon on the left straight into Settings." = "Or drag the icon on the left straight into Settings.";diff --git a/PureMac/es.lproj/Localizable.strings b/PureMac/es.lproj/Localizable.stringsindex 9472637..bfdf8d1 100644--- a/PureMac/es.lproj/Localizable.strings+++ b/PureMac/es.lproj/Localizable.strings@@ -324,3 +324,9 @@"Skip" = "Omitir";"Start" = "Empezar";"Continue" = "Continuar";++/* Drag handle */+"Drag to the Settings list" = "Arrastra a la lista de Ajustes";+"Drag this icon into the Full Disk Access list in System Settings." = "Arrastra este icono a la lista de Acceso a Todo el Disco en Ajustes del Sistema.";+"Tip: drag the icon on the left straight into the list." = "Consejo: arrastra el icono de la izquierda directamente a la lista.";+"Or drag the icon on the left straight into Settings." = "O arrastra el icono de la izquierda directamente a Ajustes.";diff --git a/PureMac/ja.lproj/Localizable.strings b/PureMac/ja.lproj/Localizable.stringsindex aea305d..f780153 100644--- a/PureMac/ja.lproj/Localizable.strings+++ b/PureMac/ja.lproj/Localizable.strings@@ -324,3 +324,9 @@"Skip" = "スキップ";"Start" = "開始";"Continue" = "続ける";++/* Drag handle */+"Drag to the Settings list" = "設定のリストにドラッグ";+"Drag this icon into the Full Disk Access list in System Settings." = "このアイコンをシステム設定のフルディスクアクセスのリストにドラッグしてください。";+"Tip: drag the icon on the left straight into the list." = "ヒント: 左のアイコンをそのままリストにドラッグできます。";+"Or drag the icon on the left straight into Settings." = "または左のアイコンをそのまま設定にドラッグしてください。";diff --git a/PureMac/pt-BR.lproj/Localizable.strings b/PureMac/pt-BR.lproj/Localizable.stringsindex a5d02df..ab2153f 100644--- a/PureMac/pt-BR.lproj/Localizable.strings+++ b/PureMac/pt-BR.lproj/Localizable.strings@@ -324,3 +324,9 @@"Skip" = "Pular";"Start" = "Iniciar";"Continue" = "Continuar";++/* Drag handle */+"Drag to the Settings list" = "Arraste para a lista de Ajustes";+"Drag this icon into the Full Disk Access list in System Settings." = "Arraste este ícone para a lista de Acesso Total ao Disco em Ajustes do Sistema.";+"Tip: drag the icon on the left straight into the list." = "Dica: arraste o ícone da esquerda diretamente para a lista.";+"Or drag the icon on the left straight into Settings." = "Ou arraste o ícone da esquerda direto para os Ajustes.";diff --git a/PureMac/zh-Hans.lproj/Localizable.strings b/PureMac/zh-Hans.lproj/Localizable.stringsindex 203b07b..8b5157d 100644--- a/PureMac/zh-Hans.lproj/Localizable.strings+++ b/PureMac/zh-Hans.lproj/Localizable.strings@@ -324,3 +324,9 @@"Skip" = "跳过";"Start" = "开始";"Continue" = "继续";++/* Drag handle */+"Drag to the Settings list" = "拖到设置列表";+"Drag this icon into the Full Disk Access list in System Settings." = "将此图标拖入系统设置中的完整磁盘访问列表。";+"Tip: drag the icon on the left straight into the list." = "提示:把左侧图标直接拖入列表。";+"Or drag the icon on the left straight into Settings." = "或者把左侧图标直接拖入设置。";diff --git a/PureMac/zh-Hant.lproj/Localizable.strings b/PureMac/zh-Hant.lproj/Localizable.stringsindex 1229393..6f47902 100644--- a/PureMac/zh-Hant.lproj/Localizable.strings+++ b/PureMac/zh-Hant.lproj/Localizable.strings@@ -324,3 +324,9 @@"Skip" = "略過";"Start" = "開始";"Continue" = "繼續";++/* Drag handle */+"Drag to the Settings list" = "拖到設定清單";+"Drag this icon into the Full Disk Access list in System Settings." = "將此圖示拖入系統設定中的完整磁碟存取清單。";+"Tip: drag the icon on the left straight into the list." = "提示:把左側圖示直接拖入清單。";+"Or drag the icon on the left straight into Settings." = "或者把左側圖示直接拖入設定。";diff --git a/README.md b/README.mdindex add1764..e0e21fa 100644--- a/README.md+++ b/README.md@@ -70,8 +70,6 @@ Most Mac cleaners are subscription apps that hide their disk usage behind a payw- **Honest scans.** "Junk" means actually-junk: cache directories the OS itself would purge, orphaned files left by apps you've already deleted, broken installer receipts, that 4 GB Xcode DerivedData blob from 2023.- **Real uninstalls.** Drag an app, see every preference plist, cache folder, container, launch agent and log file it dropped across your library, remove all of it at once.-The goal is to leave behind software that respects the people running it long after the people who wrote it have moved on.-## What it does### App Uninstallerdiff --git a/project.yml b/project.ymlindex 40dc24b..7a62fd1 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.5.2"- CURRENT_PROJECT_VERSION: "11"+ MARKETING_VERSION: "2.6.0"+ CURRENT_PROJECT_VERSION: "12"GENERATE_INFOPLIST_FILE: "NO"ASSETCATALOG_COMPILER_APPICON_NAME: "AppIcon"COMBINE_HIDPI_IMAGES: "YES"