Skip to content

[Stats Revamp] VoiceOver improvements #19773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Dec 15, 2022
Merged

[Stats Revamp] VoiceOver improvements #19773

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
790a638
Make Add Stats Card button visible for voice over in No Results View
staskus Dec 13, 2022
fac90e5
Voice inactive card hint for a row in Inactive cards section
staskus Dec 13, 2022
bf2aade
Reselect row for voiceover when card is moved from active to inactive
staskus Dec 13, 2022
d75398c
Enable ability to reload ImmuTable manually
staskus Dec 14, 2022
dae28bf
Manually move rows when toggling rows to support animation and voiceover
staskus Dec 14, 2022
015afd7
Fix typo
staskus Dec 14, 2022
dc79613
Reload the data of the cell after moving the row to update accessibil…
staskus Dec 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions ...ses/ViewRelated/Stats/Insights/Insights Management/InsightsManagementViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ class InsightsManagementViewController: UITableViewController {
}
}

private var insightsInactive: [StatSection] {
InsightsManagementViewController.allInsights.filter({ !self.insightsShown.contains($0) })
}

private var hasChanges: Bool {
return insightsShown != originalInsightsShown
}
Expand Down Expand Up @@ -250,7 +254,7 @@ private extension InsightsManagementViewController {
}

func inactiveCardsSection() -> ImmuTableSection {
let rows = InsightsManagementViewController.allInsights.filter({ !self.insightsShown.contains($0) })
let rows = insightsInactive

guard rows.count > 0 else {
return ImmuTableSection(headerText: TextContent.inactiveCardsHeader, rows: [inactivePlaceholderRow])
Expand All @@ -259,7 +263,7 @@ private extension InsightsManagementViewController {
return ImmuTableSection(headerText: TextContent.inactiveCardsHeader,
rows: rows.map {
return AddInsightStatRow(title: $0.insightManagementTitle,
enabled: true,
enabled: false,
action: rowActionFor($0)) }
)
}
Expand Down Expand Up @@ -310,6 +314,7 @@ private extension InsightsManagementViewController {
}

reloadViewModel()
selectToggledRowForAccessibility(for: statSection)
}

var placeholderRow: ImmuTableRow {
Expand Down Expand Up @@ -375,3 +380,13 @@ private extension InsightsManagementViewController {
}

}

private extension InsightsManagementViewController {
func selectToggledRowForAccessibility(for statSection: StatSection) {
if let shownIndex = insightsShown.firstIndex(of: statSection) {
UIAccessibility.post(notification: .screenChanged, argument: tableView.cellForRow(at: .init(item: shownIndex, section: 0)))
} else if let inactiveIndex = insightsInactive.firstIndex(of: statSection) {
UIAccessibility.post(notification: .screenChanged, argument: tableView.cellForRow(at: .init(item: inactiveIndex, section: 1)))
}
}
}
8 changes: 4 additions & 4 deletions WordPress/Classes/ViewRelated/Views/NoResultsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,11 +588,11 @@ private extension NoResultsViewController {
view.accessibilityLabel = titleLabel.text
view.accessibilityTraits = .staticText
} else {
view.accessibilityElements = [noResultsView!, actionButton!]
view.accessibilityElements = [labelStackView!, actionButton!]

noResultsView.isAccessibilityElement = true
noResultsView.accessibilityTraits = .staticText
noResultsView.accessibilityLabel = [
labelStackView.accessibilityTraits = .staticText
labelStackView.isAccessibilityElement = true
labelStackView.accessibilityLabel = [
titleLabel.text,
subtitleTextView.isHidden ? nil : subtitleTextView.attributedText.string
].compactMap { $0 }.joined(separator: ". ")
Expand Down