mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-03 16:10:20 +00:00
accessibility improvements + tests refinement
This commit is contained in:
@@ -16,7 +16,7 @@ final class AccessibilityTests: XCTestCase {
|
|||||||
app = Application.launch(viewID: name)
|
app = Application.launch(viewID: name)
|
||||||
await client.waitForApp()
|
await client.waitForApp()
|
||||||
defer { try? client.stop() }
|
defer { try? client.stop() }
|
||||||
|
|
||||||
try client.send(.accessibilityAudit(.nextPreview))
|
try client.send(.accessibilityAudit(.nextPreview))
|
||||||
|
|
||||||
// To handle location sharing popup in CI
|
// To handle location sharing popup in CI
|
||||||
@@ -55,6 +55,11 @@ final class AccessibilityTests: XCTestCase {
|
|||||||
do {
|
do {
|
||||||
// We have removed `textClipped` and `contrast` for now
|
// We have removed `textClipped` and `contrast` for now
|
||||||
try app.performAccessibilityAudit(for: [.dynamicType, .elementDetection, .hitRegion, .sufficientElementDescription, .trait]) { issue in
|
try app.performAccessibilityAudit(for: [.dynamicType, .elementDetection, .hitRegion, .sufficientElementDescription, .trait]) { issue in
|
||||||
|
// Specific tests do not need specific accessibilty audit types
|
||||||
|
if Self.ignoredA11yTest[name]?.isAccessibilityIssueFiltered(issue) == true {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
// Remove false positives for null elements
|
// Remove false positives for null elements
|
||||||
guard let element = issue.element else {
|
guard let element = issue.element else {
|
||||||
return true
|
return true
|
||||||
@@ -84,16 +89,23 @@ final class AccessibilityTests: XCTestCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static func isMatrixIdentifier(_ string: String) -> Bool {
|
private static func isMatrixIdentifier(_ string: String) -> Bool {
|
||||||
MatrixEntityRegex.isMatrixRoomAlias(string) || MatrixEntityRegex.isMatrixUserIdentifier(string) || string == PillUtilities.atRoom
|
MatrixEntityRegex.isMatrixRoomAlias(string) || MatrixEntityRegex.isMatrixUserIdentifier(string) || string == PillUtilities.atRoom || MatrixEntityRegex.isLegacyMatrixRoomID(string)
|
||||||
}
|
}
|
||||||
|
|
||||||
private static let partiallyUnsupportedDynamicTypeMessage = "Dynamic Type font sizes are partially unsupported"
|
private static let partiallyUnsupportedDynamicTypeMessage = "Dynamic Type font sizes are partially unsupported"
|
||||||
private static let notHumanReadableMessage = "Label not human-readable"
|
private static let notHumanReadableMessage = "Label not human-readable"
|
||||||
|
private static let elementHasNoDescription = "Element has no description"
|
||||||
|
|
||||||
/// Use this array to filter add specific filters to ignore specific issues for certain elements
|
/// Use this array to filter add specific filters to ignore specific issues for certain elements
|
||||||
private static let ignoredA11yIdentifiers: [String: [FilterType]] = [
|
private static let ignoredA11yIdentifiers: [String: [FilterType]] = [
|
||||||
A11yIdentifiers.serverConfirmationScreen.serverPicker: [.compactDescription(notHumanReadableMessage)]
|
A11yIdentifiers.serverConfirmationScreen.serverPicker: [.compactDescription(notHumanReadableMessage)]
|
||||||
]
|
]
|
||||||
|
|
||||||
|
/// Use this array to filter add specific filters to ignore specific tests
|
||||||
|
private static let ignoredA11yTest: [String: [FilterType]] = [
|
||||||
|
// It's an image rendering test doesn't need to have descriptions
|
||||||
|
"RoomAvatarImage_Previews-0": [.auditType(.sufficientElementDescription)]
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
private enum FilterType {
|
private enum FilterType {
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ enum MatrixEntityRegex: String {
|
|||||||
case roomAlias
|
case roomAlias
|
||||||
case uri
|
case uri
|
||||||
case allUsers
|
case allUsers
|
||||||
|
case legacyRoomID
|
||||||
|
|
||||||
var rawValue: String {
|
var rawValue: String {
|
||||||
switch self {
|
switch self {
|
||||||
@@ -23,6 +24,8 @@ enum MatrixEntityRegex: String {
|
|||||||
return "@[\\x21-\\x39\\x3B-\\x7F]+:" + MatrixEntityRegex.homeserver.rawValue
|
return "@[\\x21-\\x39\\x3B-\\x7F]+:" + MatrixEntityRegex.homeserver.rawValue
|
||||||
case .roomAlias:
|
case .roomAlias:
|
||||||
return "#[A-Z0-9._%#@=+-]+:" + MatrixEntityRegex.homeserver.rawValue
|
return "#[A-Z0-9._%#@=+-]+:" + MatrixEntityRegex.homeserver.rawValue
|
||||||
|
case .legacyRoomID:
|
||||||
|
return "![A-Z0-9_\\-\\/]+:" + MatrixEntityRegex.homeserver.rawValue
|
||||||
case .uri:
|
case .uri:
|
||||||
return "matrix:(r|u|roomid)\\/[A-Z0-9\\-._~:/?#\\[\\]@!$&'()*+,;=%]*(?:\\?[A-Z0-9\\-._~:/?#\\[\\]@!$&'()*+,;=%]*)?"
|
return "matrix:(r|u|roomid)\\/[A-Z0-9\\-._~:/?#\\[\\]@!$&'()*+,;=%]*(?:\\?[A-Z0-9\\-._~:/?#\\[\\]@!$&'()*+,;=%]*)?"
|
||||||
case .allUsers:
|
case .allUsers:
|
||||||
@@ -37,6 +40,7 @@ enum MatrixEntityRegex: String {
|
|||||||
static let uriRegex = try! NSRegularExpression(pattern: MatrixEntityRegex.uri.rawValue, options: .caseInsensitive)
|
static let uriRegex = try! NSRegularExpression(pattern: MatrixEntityRegex.uri.rawValue, options: .caseInsensitive)
|
||||||
static let allUsersRegex = try! NSRegularExpression(pattern: MatrixEntityRegex.allUsers.rawValue)
|
static let allUsersRegex = try! NSRegularExpression(pattern: MatrixEntityRegex.allUsers.rawValue)
|
||||||
static let linkRegex = try! NSDataDetector(types: NSTextCheckingResult.CheckingType.link.rawValue)
|
static let linkRegex = try! NSDataDetector(types: NSTextCheckingResult.CheckingType.link.rawValue)
|
||||||
|
static let legacyRoomIDRegex = try! NSRegularExpression(pattern: MatrixEntityRegex.legacyRoomID.rawValue, options: .caseInsensitive)
|
||||||
// swiftlint:enable force_try
|
// swiftlint:enable force_try
|
||||||
|
|
||||||
static func isMatrixHomeserver(_ homeserver: String) -> Bool {
|
static func isMatrixHomeserver(_ homeserver: String) -> Bool {
|
||||||
@@ -63,6 +67,14 @@ enum MatrixEntityRegex: String {
|
|||||||
return match.range.length == alias.count
|
return match.range.length == alias.count
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static func isLegacyMatrixRoomID(_ roomID: String) -> Bool {
|
||||||
|
guard let match = legacyRoomIDRegex.firstMatch(in: roomID) else {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
return match.range.length == roomID.count
|
||||||
|
}
|
||||||
|
|
||||||
static func isMatrixURI(_ uri: String) -> Bool {
|
static func isMatrixURI(_ uri: String) -> Bool {
|
||||||
guard let match = uriRegex.firstMatch(in: uri) else {
|
guard let match = uriRegex.firstMatch(in: uri) else {
|
||||||
return false
|
return false
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ struct TimelineMediaPreviewDetailsView: View {
|
|||||||
contentID: item.sender.id,
|
contentID: item.sender.id,
|
||||||
avatarSize: .user(on: .mediaPreviewDetails),
|
avatarSize: .user(on: .mediaPreviewDetails),
|
||||||
mediaProvider: context.mediaProvider)
|
mediaProvider: context.mediaProvider)
|
||||||
|
.accessibilityHidden(true)
|
||||||
|
|
||||||
VStack(alignment: .leading, spacing: 0) {
|
VStack(alignment: .leading, spacing: 0) {
|
||||||
if let displayName = item.sender.displayName {
|
if let displayName = item.sender.displayName {
|
||||||
|
|||||||
+1
@@ -71,6 +71,7 @@ struct TimelineMediaPreviewRedactConfirmationView: View {
|
|||||||
.aspectRatio(contentMode: .fill)
|
.aspectRatio(contentMode: .fill)
|
||||||
}
|
}
|
||||||
.clipShape(RoundedRectangle(cornerRadius: 8))
|
.clipShape(RoundedRectangle(cornerRadius: 8))
|
||||||
|
.accessibilityHidden(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
VStack(alignment: .leading, spacing: 4) {
|
VStack(alignment: .leading, spacing: 4) {
|
||||||
|
|||||||
+5
@@ -85,6 +85,7 @@ struct MediaEventsTimelineScreen: View {
|
|||||||
ForEach(group.items) { item in
|
ForEach(group.items) { item in
|
||||||
VStack(spacing: 20) {
|
VStack(spacing: 20) {
|
||||||
Divider()
|
Divider()
|
||||||
|
.accessibilityHidden(true)
|
||||||
|
|
||||||
Button {
|
Button {
|
||||||
tappedItem(item)
|
tappedItem(item)
|
||||||
@@ -92,7 +93,11 @@ struct MediaEventsTimelineScreen: View {
|
|||||||
viewForTimelineItem(item)
|
viewForTimelineItem(item)
|
||||||
.scaleEffect(CGSize(width: 1, height: -1))
|
.scaleEffect(CGSize(width: 1, height: -1))
|
||||||
}
|
}
|
||||||
|
.accessibilityRepresentation {
|
||||||
|
viewForTimelineItem(item)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
.accessibilityElement(children: .combine)
|
||||||
.padding(.horizontal, 16)
|
.padding(.horizontal, 16)
|
||||||
}
|
}
|
||||||
} footer: {
|
} footer: {
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ struct SpaceHeaderView: View {
|
|||||||
RoomAvatarImage(avatar: spaceRoomProxy.avatar,
|
RoomAvatarImage(avatar: spaceRoomProxy.avatar,
|
||||||
avatarSize: .room(on: .spaceHeader),
|
avatarSize: .room(on: .spaceHeader),
|
||||||
mediaProvider: mediaProvider)
|
mediaProvider: mediaProvider)
|
||||||
|
.accessibilityHidden(true)
|
||||||
|
|
||||||
VStack(spacing: 8) {
|
VStack(spacing: 8) {
|
||||||
Text(title)
|
Text(title)
|
||||||
|
|||||||
Reference in New Issue
Block a user