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.

Add item selection checkboxes before cleaning

moamen0fd94d168868
diff --git a/PureMac/ViewModels/AppViewModel.swift b/PureMac/ViewModels/AppViewModel.swift
index 190557c..b776022 100644
--- a/PureMac/ViewModels/AppViewModel.swift
+++ b/PureMac/ViewModels/AppViewModel.swift
@@ -15,7 +15,7 @@ class AppViewModel: ObservableObject {
@Published var currentScanCategory: String = ""
@Published var showCleanConfirmation = false
@Published var lastCleanedDate: Date?
- @Published var selectedItems: Set<UUID> = []
+ @Published var deselectedItems: Set<UUID> = []
var scheduler = SchedulerService()
private let scanEngine = ScanEngine()
@@ -35,6 +35,48 @@ class AppViewModel: ObservableObject {
CleaningCategory.scannable.compactMap { categoryResults[$0] }.filter { $0.totalSize > 0 }
}
+ // MARK: - Selection
+
+ func isItemSelected(_ item: CleanableItem) -> Bool {
+ !deselectedItems.contains(item.id)
+ }
+
+ func toggleItem(_ item: CleanableItem) {
+ if deselectedItems.contains(item.id) {
+ deselectedItems.remove(item.id)
+ } else {
+ deselectedItems.insert(item.id)
+ }
+ }
+
+ func selectAllInCategory(_ category: CleaningCategory) {
+ guard let result = categoryResults[category] else { return }
+ for item in result.items {
+ deselectedItems.remove(item.id)
+ }
+ }
+
+ func deselectAllInCategory(_ category: CleaningCategory) {
+ guard let result = categoryResults[category] else { return }
+ for item in result.items {
+ deselectedItems.insert(item.id)
+ }
+ }
+
+ func selectedSizeInCategory(_ category: CleaningCategory) -> Int64 {
+ guard let result = categoryResults[category] else { return 0 }
+ return result.items.filter { isItemSelected($0) }.reduce(0) { $0 + $1.size }
+ }
+
+ func selectedCountInCategory(_ category: CleaningCategory) -> Int {
+ guard let result = categoryResults[category] else { return 0 }
+ return result.items.filter { isItemSelected($0) }.count
+ }
+
+ var totalSelectedSize: Int64 {
+ allResults.flatMap { $0.items }.filter { isItemSelected($0) }.reduce(0) { $0 + $1.size }
+ }
+
// MARK: - Init
init() {
@@ -108,7 +150,7 @@ class AppViewModel: ObservableObject {
func cleanAll() {
guard !scanState.isActive else { return }
- let itemsToClean = allResults.flatMap { $0.items.filter { $0.isSelected } }
+ let itemsToClean = allResults.flatMap { $0.items }.filter { isItemSelected($0) }
guard !itemsToClean.isEmpty else { return }
scanState = .cleaning(progress: 0)
@@ -141,11 +183,14 @@ class AppViewModel: ObservableObject {
func cleanCategory(_ category: CleaningCategory) {
guard let result = categoryResults[category], !scanState.isActive else { return }
+ let selectedItems = result.items.filter { isItemSelected($0) }
+ guard !selectedItems.isEmpty else { return }
+
scanState = .cleaning(progress: 0)
cleanProgress = 0
Task {
- let cleanResult = await cleaningEngine.cleanCategory(result) { [weak self] progress in
+ let cleanResult = await cleaningEngine.cleanItems(selectedItems) { [weak self] progress in
Task { @MainActor [weak self] in
self?.cleanProgress = progress
self?.scanState = .cleaning(progress: progress)
diff --git a/PureMac/Views/CategoryDetailView.swift b/PureMac/Views/CategoryDetailView.swift
index f283e79..1422e3c 100644
--- a/PureMac/Views/CategoryDetailView.swift
+++ b/PureMac/Views/CategoryDetailView.swift
@@ -80,14 +80,52 @@ struct CategoryDetailView: View {
// MARK: - File List
private func fileList(_ result: CategoryResult) -> some View {
- ScrollView {
- LazyVStack(spacing: 4) {
- ForEach(result.items) { item in
- FileRow(item: item, color: category.color)
+ VStack(spacing: 0) {
+ // Select all / Deselect all bar
+ HStack(spacing: 16) {
+ let selectedCount = vm.selectedCountInCategory(category)
+ let totalCount = result.itemCount
+
+ Text("\(selectedCount) of \(totalCount) selected")
+ .font(.system(size: 11, weight: .medium, design: .rounded))
+ .foregroundColor(.pmTextMuted)
+
+ Spacer()
+
+ Button("Select All") {
+ vm.selectAllInCategory(category)
}
+ .font(.system(size: 11, weight: .medium))
+ .foregroundColor(.pmAccentLight)
+ .buttonStyle(.plain)
+
+ Text("|")
+ .foregroundColor(.pmSeparator)
+ .font(.system(size: 11))
+
+ Button("Deselect All") {
+ vm.deselectAllInCategory(category)
+ }
+ .font(.system(size: 11, weight: .medium))
+ .foregroundColor(.pmAccentLight)
+ .buttonStyle(.plain)
}
- .padding(.horizontal, 32)
+ .padding(.horizontal, 48)
.padding(.vertical, 8)
+
+ Divider()
+ .background(Color.pmSeparator)
+ .padding(.horizontal, 32)
+
+ ScrollView {
+ LazyVStack(spacing: 4) {
+ ForEach(result.items) { item in
+ FileRow(item: item, color: category.color)
+ }
+ }
+ .padding(.horizontal, 32)
+ .padding(.vertical, 8)
+ }
}
}
@@ -155,14 +193,18 @@ struct CategoryDetailView: View {
}
}
- if let result = result, result.totalSize > 0 && !vm.scanState.isActive {
- GradientActionButton(
- title: "Clean (\(result.formattedSize))",
- icon: "trash.fill",
- gradient: AppGradients.accent
- ) {
- withAnimation(.pmSpring) {
- vm.cleanCategory(category)
+ if let _ = result, !vm.scanState.isActive {
+ let selectedSize = vm.selectedSizeInCategory(category)
+ let selectedCount = vm.selectedCountInCategory(category)
+ if selectedSize > 0 {
+ GradientActionButton(
+ title: "Clean \(selectedCount) items (\(ByteCountFormatter.string(fromByteCount: selectedSize, countStyle: .file)))",
+ icon: "trash.fill",
+ gradient: AppGradients.accent
+ ) {
+ withAnimation(.pmSpring) {
+ vm.cleanCategory(category)
+ }
}
}
}
@@ -173,24 +215,49 @@ struct CategoryDetailView: View {
// MARK: - File Row
struct FileRow: View {
+ @EnvironmentObject var vm: AppViewModel
let item: CleanableItem
let color: Color
@State private var isHovering = false
+ var isSelected: Bool {
+ vm.isItemSelected(item)
+ }
+
var body: some View {
- HStack(spacing: 12) {
+ HStack(spacing: 10) {
+ // Checkbox
+ Button(action: { vm.toggleItem(item) }) {
+ ZStack {
+ RoundedRectangle(cornerRadius: 4)
+ .stroke(isSelected ? color : Color.pmTextMuted, lineWidth: 1.5)
+ .frame(width: 18, height: 18)
+
+ if isSelected {
+ RoundedRectangle(cornerRadius: 4)
+ .fill(color)
+ .frame(width: 18, height: 18)
+
+ Image(systemName: "checkmark")
+ .font(.system(size: 10, weight: .bold))
+ .foregroundColor(.white)
+ }
+ }
+ }
+ .buttonStyle(.plain)
+
// File icon
Image(systemName: fileIcon)
.font(.system(size: 14))
- .foregroundColor(color.opacity(0.7))
- .frame(width: 24)
+ .foregroundColor(isSelected ? color.opacity(0.7) : .pmTextMuted)
+ .frame(width: 20)
// File info
VStack(alignment: .leading, spacing: 2) {
Text(item.name)
.font(.pmBody)
- .foregroundColor(.pmTextPrimary)
+ .foregroundColor(isSelected ? .pmTextPrimary : .pmTextMuted)
.lineLimit(1)
.truncationMode(.middle)
@@ -213,7 +280,7 @@ struct FileRow: View {
// Size
Text(item.formattedSize)
.font(.system(size: 12, weight: .semibold, design: .rounded))
- .foregroundColor(.pmTextPrimary)
+ .foregroundColor(isSelected ? .pmTextPrimary : .pmTextMuted)
.frame(width: 70, alignment: .trailing)
// Reveal button on hover
diff --git a/PureMac/Views/SmartScanView.swift b/PureMac/Views/SmartScanView.swift
index e2448ec..118ce29 100644
--- a/PureMac/Views/SmartScanView.swift
+++ b/PureMac/Views/SmartScanView.swift
@@ -349,9 +349,9 @@ struct SmartScanView: View {
.disabled(true)
case .completed:
- if vm.totalJunkSize > 0 {
+ if vm.totalSelectedSize > 0 {
GradientActionButton(
- title: "Clean (\(ByteCountFormatter.string(fromByteCount: vm.totalJunkSize, countStyle: .file)))",
+ title: "Clean (\(ByteCountFormatter.string(fromByteCount: vm.totalSelectedSize, countStyle: .file)))",
icon: "trash.fill",
gradient: AppGradients.accent
) {
@@ -465,56 +465,108 @@ struct DiskStatCard: View {
// MARK: - Result Row (Clickable)
struct ResultRow: View {
+ @EnvironmentObject var vm: AppViewModel
let result: CategoryResult
let onTap: () -> Void
@State private var isHovering = false
+ var isCategorySelected: Bool {
+ vm.selectedCountInCategory(result.category) > 0
+ }
+
+ var isFullySelected: Bool {
+ vm.selectedCountInCategory(result.category) == result.itemCount
+ }
+
+ var selectedSize: Int64 {
+ vm.selectedSizeInCategory(result.category)
+ }
+
var body: some View {
- Button(action: onTap) {
- HStack(spacing: 12) {
+ HStack(spacing: 12) {
+ // Category checkbox
+ Button(action: {
+ withAnimation(.pmSmooth) {
+ if isFullySelected {
+ vm.deselectAllInCategory(result.category)
+ } else {
+ vm.selectAllInCategory(result.category)
+ }
+ }
+ }) {
ZStack {
- RoundedRectangle(cornerRadius: 6)
- .fill(result.category.color.opacity(0.15))
- .frame(width: 28, height: 28)
-
- Image(systemName: result.category.icon)
- .font(.system(size: 12))
- .foregroundColor(result.category.color)
+ RoundedRectangle(cornerRadius: 4)
+ .stroke(isCategorySelected ? result.category.color : Color.pmTextMuted, lineWidth: 1.5)
+ .frame(width: 18, height: 18)
+
+ if isFullySelected {
+ RoundedRectangle(cornerRadius: 4)
+ .fill(result.category.color)
+ .frame(width: 18, height: 18)
+
+ Image(systemName: "checkmark")
+ .font(.system(size: 10, weight: .bold))
+ .foregroundColor(.white)
+ } else if isCategorySelected {
+ RoundedRectangle(cornerRadius: 4)
+ .fill(result.category.color)
+ .frame(width: 18, height: 18)
+
+ Image(systemName: "minus")
+ .font(.system(size: 10, weight: .bold))
+ .foregroundColor(.white)
+ }
}
+ }
+ .buttonStyle(.plain)
- VStack(alignment: .leading, spacing: 2) {
- Text(result.category.rawValue)
- .font(.pmBody)
- .foregroundColor(.pmTextPrimary)
+ // Category icon + info (clickable to navigate)
+ Button(action: onTap) {
+ HStack(spacing: 12) {
+ ZStack {
+ RoundedRectangle(cornerRadius: 6)
+ .fill(result.category.color.opacity(isCategorySelected ? 0.15 : 0.05))
+ .frame(width: 28, height: 28)
+
+ Image(systemName: result.category.icon)
+ .font(.system(size: 12))
+ .foregroundColor(isCategorySelected ? result.category.color : .pmTextMuted)
+ }
- Text("\(result.itemCount) items")
- .font(.system(size: 10))
- .foregroundColor(.pmTextMuted)
- }
+ VStack(alignment: .leading, spacing: 2) {
+ Text(result.category.rawValue)
+ .font(.pmBody)
+ .foregroundColor(isCategorySelected ? .pmTextPrimary : .pmTextMuted)
- Spacer()
+ Text("\(vm.selectedCountInCategory(result.category))/\(result.itemCount) items")
+ .font(.system(size: 10))
+ .foregroundColor(.pmTextMuted)
+ }
+
+ Spacer()
- Text(result.formattedSize)
- .font(.system(size: 14, weight: .semibold, design: .rounded))
- .foregroundColor(result.category.color)
+ Text(ByteCountFormatter.string(fromByteCount: selectedSize, countStyle: .file))
+ .font(.system(size: 14, weight: .semibold, design: .rounded))
+ .foregroundColor(isCategorySelected ? result.category.color : .pmTextMuted)
- Image(systemName: "chevron.right")
- .font(.system(size: 10, weight: .semibold))
- .foregroundColor(isHovering ? result.category.color : .pmTextMuted)
+ Image(systemName: "chevron.right")
+ .font(.system(size: 10, weight: .semibold))
+ .foregroundColor(isHovering ? result.category.color : .pmTextMuted)
+ }
}
- .padding(.horizontal, 16)
- .padding(.vertical, 10)
- .background(
- RoundedRectangle(cornerRadius: 10)
- .fill(isHovering ? Color.pmCardHover : Color.pmCard.opacity(0.4))
- )
- .overlay(
- RoundedRectangle(cornerRadius: 10)
- .stroke(isHovering ? result.category.color.opacity(0.3) : Color.clear, lineWidth: 1)
- )
+ .buttonStyle(.plain)
}
- .buttonStyle(.plain)
+ .padding(.horizontal, 16)
+ .padding(.vertical, 10)
+ .background(
+ RoundedRectangle(cornerRadius: 10)
+ .fill(isHovering ? Color.pmCardHover : Color.pmCard.opacity(0.4))
+ )
+ .overlay(
+ RoundedRectangle(cornerRadius: 10)
+ .stroke(isHovering ? result.category.color.opacity(0.3) : Color.clear, lineWidth: 1)
+ )
.onHover { h in
withAnimation(.pmSmooth) { isHovering = h }
}
diff --git a/homebrew/puremac.rb b/homebrew/puremac.rb
index c8054cc..72eed7f 100644
--- a/homebrew/puremac.rb
+++ b/homebrew/puremac.rb
@@ -1,6 +1,6 @@
cask "puremac" do
version "1.0.0"
- sha256 "0c857ec3f6c93063854a1cd0418fae6edbc177ab855f98570265f3a2b56f5a23"
+ sha256 "789575c476e2ae60c647936944b7ddfbbb4f16ebb3dc26f0ccba3f3e7e03d572"
url "https://github.com/momenbasel/PureMac/releases/download/v#{version}/PureMac-v#{version}.zip"
name "PureMac"