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.

Every page's title is its first heading for VoiceOver

Țugui Dragoș0622aebcd0c6
diff --git a/Peel/Views/AppHeader.swift b/Peel/Views/AppHeader.swift
index 8b0a717e..066b40e9 100644
--- a/Peel/Views/AppHeader.swift
+++ b/Peel/Views/AppHeader.swift
@@ -22,8 +22,7 @@ struct AppHeader<Actions: View>: View {
VStack(alignment: .leading, spacing: 10) {
VStack(alignment: .leading, spacing: 4) {
Text(app.name)
- .font(.title.bold())
- .titleLine()
+ .pageTitle()
.help(Text(verbatim: app.name))
identity
}
diff --git a/Peel/Views/BackgroundItems/BackgroundItemDetailView.swift b/Peel/Views/BackgroundItems/BackgroundItemDetailView.swift
index cf65924a..380d49a5 100644
--- a/Peel/Views/BackgroundItems/BackgroundItemDetailView.swift
+++ b/Peel/Views/BackgroundItems/BackgroundItemDetailView.swift
@@ -233,8 +233,7 @@ struct BackgroundItemDetailView: View {
}
VStack(alignment: .leading, spacing: 6) {
Text(verbatim: item.label)
- .font(.title.bold())
- .titleLine()
+ .pageTitle()
.textSelection(.enabled)
.help(Text(verbatim: item.label))
FlowLayout(spacing: 6) {
diff --git a/Peel/Views/Duplicates/DuplicateFolderGroupView.swift b/Peel/Views/Duplicates/DuplicateFolderGroupView.swift
index d729c6fd..919d2e39 100644
--- a/Peel/Views/Duplicates/DuplicateFolderGroupView.swift
+++ b/Peel/Views/Duplicates/DuplicateFolderGroupView.swift
@@ -44,8 +44,7 @@ struct DuplicateFolderGroupView: View {
copies
VStack(alignment: .leading, spacing: 6) {
Text(verbatim: group.folders[0].url.lastPathComponent)
- .font(.title.bold())
- .titleLine()
+ .pageTitle()
.help(Text(verbatim: group.folders[0].url.lastPathComponent))
HStack(spacing: 6) {
Badge(title: Text(verbatim: group.size.byteCount), systemImage: "folder", tint: .secondary)
diff --git a/Peel/Views/Duplicates/DuplicateGroupView.swift b/Peel/Views/Duplicates/DuplicateGroupView.swift
index 62aeebb7..d4b8d6cc 100644
--- a/Peel/Views/Duplicates/DuplicateGroupView.swift
+++ b/Peel/Views/Duplicates/DuplicateGroupView.swift
@@ -49,8 +49,7 @@ struct DuplicateGroupView: View {
copies
VStack(alignment: .leading, spacing: 6) {
Text(verbatim: group.files[0].url.lastPathComponent)
- .font(.title.bold())
- .titleLine()
+ .pageTitle()
.help(Text(verbatim: group.files[0].url.lastPathComponent))
FlowLayout(spacing: 6) {
Badge(title: Text(verbatim: group.size.byteCount), systemImage: "doc", tint: .secondary)
diff --git a/Peel/Views/FileSearch/FileSearchFileView.swift b/Peel/Views/FileSearch/FileSearchFileView.swift
index 1de41b58..4f008607 100644
--- a/Peel/Views/FileSearch/FileSearchFileView.swift
+++ b/Peel/Views/FileSearch/FileSearchFileView.swift
@@ -13,8 +13,7 @@ struct FileSearchFileView: View {
AppIcon(url: file.url)
.frame(width: 64, height: 64)
Text(verbatim: file.url.lastPathComponent)
- .font(.title.bold())
- .titleLine()
+ .pageTitle()
.help(Text(verbatim: file.url.lastPathComponent))
Spacer(minLength: 0)
}
diff --git a/Peel/Views/Homebrew/HomebrewDetailView.swift b/Peel/Views/Homebrew/HomebrewDetailView.swift
index 1b0f916d..d4a71f61 100644
--- a/Peel/Views/Homebrew/HomebrewDetailView.swift
+++ b/Peel/Views/Homebrew/HomebrewDetailView.swift
@@ -19,8 +19,7 @@ struct HomebrewDetailView: View {
.accessibilityHidden(true)
VStack(alignment: .leading, spacing: 6) {
Text(verbatim: package.name)
- .font(.title.bold())
- .titleLine()
+ .pageTitle()
.textSelection(.enabled)
.help(Text(verbatim: package.name))
if let summary = package.summary {
diff --git a/Peel/Views/Intel/IntelDetailView.swift b/Peel/Views/Intel/IntelDetailView.swift
index 46bad21a..c5a4efc2 100644
--- a/Peel/Views/Intel/IntelDetailView.swift
+++ b/Peel/Views/Intel/IntelDetailView.swift
@@ -134,8 +134,7 @@ struct IntelDetailView: View {
.frame(width: 64, height: 64)
VStack(alignment: .leading, spacing: 6) {
Text(verbatim: finding.name)
- .font(.title.bold())
- .titleLine()
+ .pageTitle()
.help(Text(verbatim: finding.name))
if let owner = finding.owner {
Text("in \(owner)")
diff --git a/Peel/Views/PageHeader.swift b/Peel/Views/PageHeader.swift
index 3d97598d..e9b6fee9 100644
--- a/Peel/Views/PageHeader.swift
+++ b/Peel/Views/PageHeader.swift
@@ -36,7 +36,7 @@ extension PageHeader where Trailing == EmptyView {
extension Text {
/// Styles a page title that is a name, such as an app's: bold title type on one line (see `titleLine()`).
func pageTitle() -> some View {
- font(.title.bold()).titleLine()
+ font(.title.bold()).titleLine().headsThePage()
}
/// Styles a page title that is a phrase in the user's language. It wraps to a second line rather than
@@ -45,5 +45,14 @@ extension Text {
font(.title.bold())
.lineLimit(2)
.fixedSize(horizontal: false, vertical: true)
+ .headsThePage()
+ }
+}
+
+extension View {
+ /// Makes a page's or a sheet's title its first heading, where VoiceOver's Headings rotor starts, above the
+ /// sections' second level ones.
+ func headsThePage() -> some View {
+ accessibilityAddTraits(.isHeader).accessibilityHeading(.h1)
}
}
diff --git a/Peel/Views/Plugins/PluginDetailView.swift b/Peel/Views/Plugins/PluginDetailView.swift
index 0009e218..7a760255 100644
--- a/Peel/Views/Plugins/PluginDetailView.swift
+++ b/Peel/Views/Plugins/PluginDetailView.swift
@@ -19,8 +19,7 @@ struct PluginDetailView: View {
.frame(width: 56, height: 56)
VStack(alignment: .leading, spacing: 6) {
Text(verbatim: plugin.name)
- .font(.title.bold())
- .titleLine()
+ .pageTitle()
.help(Text(verbatim: plugin.name))
FlowLayout(spacing: 6) {
Badge(title: Text(plugin.category.title), systemImage: "powerplug", tint: .secondary)
diff --git a/Peel/Views/ResetSheet.swift b/Peel/Views/ResetSheet.swift
index 3bb6db89..1b2565b3 100644
--- a/Peel/Views/ResetSheet.swift
+++ b/Peel/Views/ResetSheet.swift
@@ -170,6 +170,7 @@ struct ResetSheet: View {
VStack(alignment: .leading, spacing: 4) {
Text("Reset \(plan.app.name)")
.font(.title.bold())
+ .headsThePage()
Text("\(plan.app.name) stays installed and forgets what is selected below. What is selected goes to the Trash, and the settings are copied first.")
.font(.callout)
.foregroundStyle(.secondary)
@@ -210,6 +211,7 @@ struct ResetSheet: View {
VStack(alignment: .leading, spacing: 10) {
outcomeTitle
.font(.title.bold())
+ .headsThePage()
// Two paragraphs, not one sentence joined in code: languages build sentences differently.
Group {
if plan.askedToMove > 0 {