Skip to content

armgit / peel

Public Imported from GitHub
0

Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.

Nothing moves while its page scans

Țugui Dragoșa52bc397bb83
diff --git a/Peel/Views/AppDetailView.swift b/Peel/Views/AppDetailView.swift
index 10f3611c..11011b0a 100644
--- a/Peel/Views/AppDetailView.swift
+++ b/Peel/Views/AppDetailView.swift
@@ -192,7 +192,7 @@ struct AppDetailView: View {
isSelectionMeasured: selected.isComplete,
isScanning: isBusy,
scan: plan.scanRun,
- isEnabled: !plan.selectedURLs.isEmpty && !plan.isRemoving && !isBusy,
+ isEnabled: !plan.selectedURLs.isEmpty && !plan.isRemoving,
onRemove: requestRemoval
)
}
diff --git a/Peel/Views/Cloud/CloudView.swift b/Peel/Views/Cloud/CloudView.swift
index ccf9b100..ab5a4cf7 100644
--- a/Peel/Views/Cloud/CloudView.swift
+++ b/Peel/Views/Cloud/CloudView.swift
@@ -107,7 +107,7 @@ struct CloudView: View {
selectedSize: cloud.selectedSize,
isScanning: cloud.isScanning,
scan: cloud.scanRun,
- isEnabled: cloud.selectedSize > 0 && !cloud.isFreeing && !cloud.isScanning,
+ isEnabled: cloud.selectedSize > 0 && !cloud.isFreeing,
onRemove: { isConfirming = true },
title: "Remove Downloads",
systemImage: "icloud.and.arrow.down",
diff --git a/Peel/Views/MultipleAppsView.swift b/Peel/Views/MultipleAppsView.swift
index cb45fcd4..2d35f9d8 100644
--- a/Peel/Views/MultipleAppsView.swift
+++ b/Peel/Views/MultipleAppsView.swift
@@ -66,7 +66,7 @@ struct MultipleAppsView: View {
isSelectionMeasured: selected.isComplete,
isScanning: plan.isScanning,
scan: plan.scanRun,
- isEnabled: !plan.selectedURLs.isEmpty && !plan.isRemoving && !plan.isScanning,
+ isEnabled: !plan.selectedURLs.isEmpty && !plan.isRemoving,
onRemove: requestRemoval
)
}
diff --git a/Peel/Views/Packages/PackageDetailView.swift b/Peel/Views/Packages/PackageDetailView.swift
index ee613c5f..8880cd82 100644
--- a/Peel/Views/Packages/PackageDetailView.swift
+++ b/Peel/Views/Packages/PackageDetailView.swift
@@ -68,7 +68,8 @@ struct PackageDetailView: View {
}
}
}
- .disabled(packages.isWorking || packages.isScanning)
+ .disabled(packages.isWorking)
+ .dimmedWhileBusy(packages.isScanning)
.safeAreaBar(edge: .bottom) {
if !receipt.items.isEmpty {
RemovalBar(
@@ -76,7 +77,7 @@ struct PackageDetailView: View {
isSelectionMeasured: SizeTotal(selectedItems.map(\.size)).isComplete,
isScanning: packages.isScanning || packages.isWorking,
scan: packages.scanRun,
- isEnabled: !selectedItems.isEmpty && !packages.isWorking,
+ isEnabled: !selectedItems.isEmpty,
onRemove: { isConfirmingRemoval = true }
)
}
diff --git a/Peel/Views/Plugins/PluginDetailView.swift b/Peel/Views/Plugins/PluginDetailView.swift
index fcd42c14..720be92b 100644
--- a/Peel/Views/Plugins/PluginDetailView.swift
+++ b/Peel/Views/Plugins/PluginDetailView.swift
@@ -86,11 +86,12 @@ struct PluginDetailView: View {
isConfirmingRemoval = true
}
.buttonStyle(.borderedProminent)
- .disabled(isLocked || plugin.isLeftAlone || plugins.isRemoving || exclusions.exclusions.isUnreadable)
+ .disabled(isLocked || plugin.isLeftAlone || plugins.isRemoving || plugins.isScanning || exclusions.exclusions.isUnreadable)
}
}
}
.formStyle(.grouped)
+ .dimmedWhileBusy(plugins.isScanning)
.navigationTitle(plugin.name)
.toolbar(removing: .title)
.confirmationDialog(Text.movingToTrash(plugin.name, SizeTotal([plugin.size])), isPresented: $isConfirmingRemoval) {
diff --git a/Peel/Views/RemovalBar.swift b/Peel/Views/RemovalBar.swift
index c74cf6ff..13022b34 100644
--- a/Peel/Views/RemovalBar.swift
+++ b/Peel/Views/RemovalBar.swift
@@ -14,6 +14,7 @@ struct RemovalBar: View {
@State private var isAskingToQuit = false
@State private var isShowingPages = false
private let purpose: Purpose
+ /// True while the page scans. The bar then moves nothing, whatever is selected.
let isScanning: Bool
/// The page's scan. Its count of items read is shown beside the spinner.
var scan: ScanRun?
@@ -75,7 +76,7 @@ struct RemovalBar: View {
private var reading: Reading {
switch purpose {
case .own(let total, let isEnabled, let onRemove):
- return Reading(total: total, pages: nil, isEnabled: isEnabled, remove: onRemove)
+ return Reading(total: total, pages: nil, isEnabled: isEnabled && !isScanning, remove: onRemove)
case .carried(let page, _):
let parts = carrier.parts(from: page)
return Reading(
diff --git a/Peel/Views/Space/SpaceDetailView.swift b/Peel/Views/Space/SpaceDetailView.swift
index 8db5829d..b69db305 100644
--- a/Peel/Views/Space/SpaceDetailView.swift
+++ b/Peel/Views/Space/SpaceDetailView.swift
@@ -71,9 +71,10 @@ struct SpaceDetailView: View {
Text("Where")
}
}
+ .dimmedWhileBusy(space.isScanning)
.safeAreaBar(edge: .bottom) {
if !item.isReadOnly {
- RemovalBar(page: Tool.space.page(item.id), isScanning: plan == nil)
+ RemovalBar(page: Tool.space.page(item.id), isScanning: plan == nil || space.isScanning)
}
}
// Made again each time the page opens, since what is inside changes as apps run. A rescan that finds the