Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.
Swift cache-cleanercleanerclideveloper-toolsdisk-cleanupdisk-spaceduplicate-finderhomebrewliquid-glassmac-cleanermacosmacos-appmacos-golden-gatemacos-tahoemacos-tweaksswiftswiftuiterminal-themesuninstalluninstaller
Removal rows use AppKit's checkbox beside their item
Țugui Dragoșc04176e5101a
diff --git a/Peel/Views/NativeCheckbox.swift b/Peel/Views/NativeCheckbox.swiftindex 7902f8ed..3f4c4591 100644--- a/Peel/Views/NativeCheckbox.swift+++ b/Peel/Views/NativeCheckbox.swift@@ -10,7 +10,10 @@ struct NativeCheckbox: NSViewRepresentable {@Binding var isOn: Bool/// What VoiceOver reads, since the checkbox has no title of its own.let label: String+ /// The help tag, which VoiceOver also reads unless there is a hint.var help: String?+ /// What VoiceOver reads after the label, in place of the help tag.+ var hint: String?func makeCoordinator() -> Coordinator {Coordinator(isOn: $isOn)@@ -41,6 +44,7 @@ struct NativeCheckbox: NSViewRepresentable {if button.isEnabled != context.environment.isEnabled { button.isEnabled = context.environment.isEnabled }if button.accessibilityLabel() != label { button.setAccessibilityLabel(label) }if button.toolTip != help { button.toolTip = help }+ if button.accessibilityHelp() != hint ?? help { button.setAccessibilityHelp(hint ?? help) }}/// AppKit's standard checkbox with no title. `init(checkboxWithTitle:target:action:)` makes the same button but@@ -75,3 +79,51 @@ struct NativeCheckbox: NSViewRepresentable {}}}++extension VerticalAlignment {+ /// The middle of the first line of a checkbox's title, which the checkbox is centered on. A checkbox's own is+ /// its center; its title's is set by `checkboxTitleLine()`.+ nonisolated static let checkboxTitleLine = VerticalAlignment(CheckboxTitleLine.self)++ private nonisolated enum CheckboxTitleLine: AlignmentID {+ static func defaultValue(in dimensions: ViewDimensions) -> CGFloat {+ dimensions[VerticalAlignment.center]+ }+ }+}++extension View {+ /// Draws this view as a checkbox's title, which a disabled checkbox dims two levels, primary content to tertiary,+ /// secondary to quaternary and tertiary to quinary, as SwiftUI's own checkbox toggle draws its label.+ func checkboxTitle() -> some View {+ modifier(CheckboxTitleStyle())+ }++ /// Marks this text as the first line of a checkbox's title. Its middle is its baseline less half the height of+ /// its capitals, where AppKit and SwiftUI center their own checkbox beside a title.+ func checkboxTitleLine() -> some View {+ modifier(CheckboxTitleLineGuide())+ }+}++private struct CheckboxTitleStyle: ViewModifier {+ @Environment(\.isEnabled) private var isEnabled++ func body(content: Content) -> some View {+ if isEnabled {+ content+ } else {+ content.foregroundStyle(.tertiary, .quaternary, .quinary)+ }+ }+}++private struct CheckboxTitleLineGuide: ViewModifier {+ @Environment(\.font) private var font+ @Environment(\.fontResolutionContext) private var fontContext++ func body(content: Content) -> some View {+ let capHeight = CTFontGetCapHeight((font ?? .body).resolve(in: fontContext).ctFont)+ content.alignmentGuide(.checkboxTitleLine) { $0[.firstTextBaseline] - capHeight / 2 }+ }+}diff --git a/Peel/Views/RemovalRow.swift b/Peel/Views/RemovalRow.swiftindex d2205bb3..afe442f7 100644--- a/Peel/Views/RemovalRow.swift+++ b/Peel/Views/RemovalRow.swift@@ -48,7 +48,7 @@ struct RemovalRow: View {var body: some View {HStack(spacing: 6) {- toggle+ checkboxAndItemif hasNoteColumn {note}@@ -62,51 +62,75 @@ struct RemovalRow: View {}}- private var toggle: some View {- Toggle(isOn: Binding(get: { isSelected }, set: { selection.setSelected($0, for: url) })) {- if isCompact {- HStack(alignment: .firstTextBaseline, spacing: 10) {- iconView- .frame(width: 20)- VStack(alignment: .leading, spacing: 2) {- pathAndBadge- HStack(spacing: 8) {- if let kind {- Text(kind)- .font(.caption)- .foregroundStyle(.secondary)- .lineLimit(1)- }- Spacer(minLength: 8)- sizeText+ /// The checkbox, and beside it the item it selects. VoiceOver hears the two as one checkbox, as it would a+ /// checkbox's title, so the item itself is hidden from it.+ private var checkboxAndItem: some View {+ HStack(alignment: .checkboxTitleLine, spacing: 5) {+ NativeCheckbox(+ isOn: Binding(get: { isSelected }, set: { selection.setSelected($0, for: url) }),+ label: spokenItem,+ // The label reads every column, so the hint adds only the warning from the note.+ hint: warning.map { String(Self.commandsMarked($0).characters) }+ )+ item+ .contentShape(.rect)+ // A click on the item selects it, as a click on a checkbox's title does.+ .onTapGesture { selection.setSelected(!isSelected, for: url) }+ .checkboxTitle()+ .accessibilityHidden(true)+ }+ .disabled(isLocked || isExcluded || isLeftAlone)+ }++ /// The item as the checkbox's title reads it: its path, its badge, its kind and its size.+ private var spokenItem: String {+ let badge = badgeKind.map { String(localized: $0.title) }+ let size = isMeasured ? size.byteCount : String(localized: "Unknown")+ return [url.abbreviatedPath, badge, kind.map { String(localized: $0) }, size]+ .compactMap(\.self)+ .joined(separator: ", ")+ }++ @ViewBuilder+ private var item: some View {+ if isCompact {+ HStack(alignment: .firstTextBaseline, spacing: 10) {+ iconView+ .frame(width: 20)+ VStack(alignment: .leading, spacing: 2) {+ pathAndBadge+ HStack(spacing: 8) {+ if let kind {+ Text(kind).font(.caption).foregroundStyle(.secondary)+ .lineLimit(1)}- }- }- } else {- HStack(alignment: .firstTextBaseline, spacing: 10) {- iconView- .frame(width: 20)- pathAndBadge- if let kind {- Text(kind)+ Spacer(minLength: 8)+ sizeText.font(.caption).foregroundStyle(.secondary)- .lineLimit(1)- .frame(width: RowColumns.kind, alignment: .leading)- .help(Text(kind))}- sizeText+ }+ }+ } else {+ HStack(alignment: .firstTextBaseline, spacing: 10) {+ iconView+ .frame(width: 20)+ pathAndBadge+ if let kind {+ Text(kind)+ .font(.caption).foregroundStyle(.secondary)- .frame(width: RowColumns.size, alignment: .trailing)+ .lineLimit(1)+ .frame(width: RowColumns.kind, alignment: .leading)+ .help(Text(kind))}+ sizeText+ .foregroundStyle(.secondary)+ .frame(width: RowColumns.size, alignment: .trailing)}}- .toggleStyle(.checkbox)- .disabled(isLocked || isExcluded || isLeftAlone)- // VoiceOver reads every column from the label, so the hint adds only the warning from the note.- .accessibilityHint(warning.map { Text(Self.commandsMarked($0)) } ?? Text(verbatim: ""))}private var path: some View {@@ -114,6 +138,7 @@ struct RemovalRow: View {.lineLimit(1).truncationMode(.middle).help(Text(verbatim: url.path(percentEncoded: false)))+ .checkboxTitleLine()}/// The path with its badge beside it, or under it when the path would get less than `pathFloor`.@@ -138,17 +163,24 @@ struct RemovalRow: View {}}+ /// Why the row's checkbox can't be selected, which would otherwise look like a fault, as its badge says it.+ private var badgeKind: (title: LocalizedStringResource, symbol: String)? {+ if isExcluded { return ("Excluded in Settings", "hand.raised.fill") }+ if isLeftAlone { return ("Left alone", "hand.raised") }+ if isLocked { return ("Helper", "lock.fill") }+ return nil+ }+/// Never cut, so the path is what gets shortened instead.private var badge: some View {Group {- if isExcluded {- Badge(title: Text("Excluded in Settings"), systemImage: "hand.raised.fill")- } else if isLeftAlone {- // Says why the checkbox can't be selected, which would otherwise look like a fault.- Badge(title: Text("Left alone"), systemImage: "hand.raised")- } else if isLocked {- Badge(title: Text("Helper"), systemImage: "lock.fill")- .help(Text("Needs administrator access"))+ if let badgeKind {+ if isLocked, !isExcluded, !isLeftAlone {+ Badge(title: Text(badgeKind.title), systemImage: badgeKind.symbol)+ .help(Text("Needs administrator access"))+ } else {+ Badge(title: Text(badgeKind.title), systemImage: badgeKind.symbol)+ }}}.fixedSize()