mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-02 12:07:55 +00:00
accessibility improvements + tests refinement
This commit is contained in:
@@ -14,6 +14,7 @@ enum MatrixEntityRegex: String {
|
||||
case roomAlias
|
||||
case uri
|
||||
case allUsers
|
||||
case legacyRoomID
|
||||
|
||||
var rawValue: String {
|
||||
switch self {
|
||||
@@ -23,6 +24,8 @@ enum MatrixEntityRegex: String {
|
||||
return "@[\\x21-\\x39\\x3B-\\x7F]+:" + MatrixEntityRegex.homeserver.rawValue
|
||||
case .roomAlias:
|
||||
return "#[A-Z0-9._%#@=+-]+:" + MatrixEntityRegex.homeserver.rawValue
|
||||
case .legacyRoomID:
|
||||
return "![A-Z0-9_\\-\\/]+:" + MatrixEntityRegex.homeserver.rawValue
|
||||
case .uri:
|
||||
return "matrix:(r|u|roomid)\\/[A-Z0-9\\-._~:/?#\\[\\]@!$&'()*+,;=%]*(?:\\?[A-Z0-9\\-._~:/?#\\[\\]@!$&'()*+,;=%]*)?"
|
||||
case .allUsers:
|
||||
@@ -37,6 +40,7 @@ enum MatrixEntityRegex: String {
|
||||
static let uriRegex = try! NSRegularExpression(pattern: MatrixEntityRegex.uri.rawValue, options: .caseInsensitive)
|
||||
static let allUsersRegex = try! NSRegularExpression(pattern: MatrixEntityRegex.allUsers.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
|
||||
|
||||
static func isMatrixHomeserver(_ homeserver: String) -> Bool {
|
||||
@@ -63,6 +67,14 @@ enum MatrixEntityRegex: String {
|
||||
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 {
|
||||
guard let match = uriRegex.firstMatch(in: uri) else {
|
||||
return false
|
||||
|
||||
@@ -44,6 +44,7 @@ struct TimelineMediaPreviewDetailsView: View {
|
||||
contentID: item.sender.id,
|
||||
avatarSize: .user(on: .mediaPreviewDetails),
|
||||
mediaProvider: context.mediaProvider)
|
||||
.accessibilityHidden(true)
|
||||
|
||||
VStack(alignment: .leading, spacing: 0) {
|
||||
if let displayName = item.sender.displayName {
|
||||
|
||||
+1
@@ -71,6 +71,7 @@ struct TimelineMediaPreviewRedactConfirmationView: View {
|
||||
.aspectRatio(contentMode: .fill)
|
||||
}
|
||||
.clipShape(RoundedRectangle(cornerRadius: 8))
|
||||
.accessibilityHidden(true)
|
||||
}
|
||||
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
|
||||
+5
@@ -85,6 +85,7 @@ struct MediaEventsTimelineScreen: View {
|
||||
ForEach(group.items) { item in
|
||||
VStack(spacing: 20) {
|
||||
Divider()
|
||||
.accessibilityHidden(true)
|
||||
|
||||
Button {
|
||||
tappedItem(item)
|
||||
@@ -92,7 +93,11 @@ struct MediaEventsTimelineScreen: View {
|
||||
viewForTimelineItem(item)
|
||||
.scaleEffect(CGSize(width: 1, height: -1))
|
||||
}
|
||||
.accessibilityRepresentation {
|
||||
viewForTimelineItem(item)
|
||||
}
|
||||
}
|
||||
.accessibilityElement(children: .combine)
|
||||
.padding(.horizontal, 16)
|
||||
}
|
||||
} footer: {
|
||||
|
||||
@@ -19,6 +19,7 @@ struct SpaceHeaderView: View {
|
||||
RoomAvatarImage(avatar: spaceRoomProxy.avatar,
|
||||
avatarSize: .room(on: .spaceHeader),
|
||||
mediaProvider: mediaProvider)
|
||||
.accessibilityHidden(true)
|
||||
|
||||
VStack(spacing: 8) {
|
||||
Text(title)
|
||||
|
||||
Reference in New Issue
Block a user