Numerous label fixes, image removals, and actions

laevandus · laevandus · commit f72d4eeb8455 · 2025-01-22T14:57:31.000+02:00
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/ChatChannelInfoView.swift b/Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/ChatChannelInfoView.swift
@@ -112,6 +112,9 @@ public struct ChatChannelInfoView: View, KeyboardReadable {
                         .onTapGesture {
                             viewModel.addUsersShown = false
                         }
+                        .accessibilityAction {
+                            viewModel.addUsersShown = false
+                        }
                     AddUsersView(
                         loadedUserIds: viewModel.participants.map(\.id),
                         onUserTap: viewModel.addUserTapped(_:)
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/Composer/AttachmentPickerTypeView.swift b/Sources/StreamChatSwiftUI/ChatChannel/Composer/AttachmentPickerTypeView.swift
@@ -56,6 +56,7 @@ public struct AttachmentPickerTypeView: View {
                         pickerType: .media,
                         selected: attachmentPickerType
                     )
+                    .accessibilityLabel(Text(L10n.Composer.Picker.showAll))
                     .accessibilityIdentifier("PickerTypeButtonMedia")
                 }
 
@@ -65,6 +66,7 @@ public struct AttachmentPickerTypeView: View {
                         pickerType: .instantCommands,
                         selected: attachmentPickerType
                     )
+                    .accessibilityLabel(Text(L10n.Composer.Suggestions.Commands.header))
                     .accessibilityIdentifier("PickerTypeButtonCommands")
                 }
             case .collapsed:
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/Composer/AttachmentPickerView.swift b/Sources/StreamChatSwiftUI/ChatChannel/Composer/AttachmentPickerView.swift
@@ -159,6 +159,7 @@ public struct AttachmentSourcePickerView: View {
                 isSelected: selected == .files,
                 onTap: onTap
             )
+            .accessibilityLabel(L10n.Composer.Picker.file)
             .accessibilityIdentifier("attachmentPickerFiles")
 
             AttachmentPickerButton(
@@ -176,6 +177,7 @@ public struct AttachmentSourcePickerView: View {
                     isSelected: selected == .polls,
                     onTap: onTap
                 )
+                .accessibilityLabel(L10n.Composer.Polls.createPoll)
                 .accessibilityIdentifier("attachmentPickerPolls")
             }
 
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/Composer/SendMessageButton.swift b/Sources/StreamChatSwiftUI/ChatChannel/Composer/SendMessageButton.swift
@@ -31,7 +31,7 @@ public struct SendMessageButton: View {
                 )
         }
         .disabled(!enabled)
-        .accessibilityAddTraits(.isButton)
+        .accessibilityLabel(Text(L10n.Composer.Placeholder.message))
         .accessibilityIdentifier("SendMessageButton")
     }
 
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/Composer/TrailingComposerView.swift b/Sources/StreamChatSwiftUI/ChatChannel/Composer/TrailingComposerView.swift
@@ -85,5 +85,12 @@ public struct VoiceRecordingButton: View {
                         }
                     }
             )
+            .accessibilityRemoveTraits(.isImage)
+            .accessibilityAddTraits(.isButton)
+            .accessibilityLabel(Text(L10n.Composer.AudioRecording.start))
+            .accessibilityAction {
+                viewModel.recordingState = .recording(.zero)
+                viewModel.startRecording()
+            }
     }
 }
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/Composer/VoiceRecording/RecordingView.swift b/Sources/StreamChatSwiftUI/ChatChannel/Composer/VoiceRecording/RecordingView.swift
@@ -20,6 +20,7 @@ struct RecordingView: View {
         HStack {
             Image(systemName: "mic")
                 .foregroundColor(.red)
+                .accessibilityHidden(true)
             RecordingDurationView(duration: audioRecordingInfo.duration)
             
             Spacer()
@@ -30,6 +31,7 @@ struct RecordingView: View {
             }
             .foregroundColor(Color(colors.textLowEmphasis))
             .opacity(opacityForSlideToCancel)
+            .accessibilityHidden(true)
             
             Spacer()
             
@@ -38,6 +40,7 @@ struct RecordingView: View {
             } label: {
                 Image(systemName: "mic")
             }
+            .accessibilityLabel(Text(L10n.Composer.AudioRecording.stop))
         }
         .padding(.all, 12)
         .overlay(
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/MessageList/AsyncVoiceMessages/VoiceRecordingContainerView.swift b/Sources/StreamChatSwiftUI/ChatChannel/MessageList/AsyncVoiceMessages/VoiceRecordingContainerView.swift
@@ -215,6 +215,7 @@ struct VoiceRecordingView: View {
                     .resizable()
                     .aspectRatio(contentMode: .fit)
                     .frame(height: 40)
+                    .accessibilityHidden(true)
             }
         }
         .onReceive(handler.$context, perform: { value in
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/MessageList/FileAttachmentView.swift b/Sources/StreamChatSwiftUI/ChatChannel/MessageList/FileAttachmentView.swift
@@ -97,6 +97,9 @@ public struct FileAttachmentView: View {
             .onTapGesture {
                 fullScreenShown = true
             }
+            .accessibilityAction {
+                fullScreenShown = true
+            }
 
             Spacer()
         }
@@ -134,6 +137,7 @@ public struct FileAttachmentDisplayView: View {
                 .resizable()
                 .aspectRatio(contentMode: .fit)
                 .frame(width: 34, height: 40)
+                .accessibilityHidden(true)
             VStack(alignment: .leading, spacing: 8) {
                 Text(title)
                     .font(fonts.bodyBold)
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/MessageList/GiphyBadgeView.swift b/Sources/StreamChatSwiftUI/ChatChannel/MessageList/GiphyBadgeView.swift
@@ -14,6 +14,7 @@ public struct GiphyBadgeView: View {
         BottomLeftView {
             HStack(spacing: 4) {
                 Image(uiImage: images.commandGiphy)
+                    .accessibilityHidden(true)
                 Text(L10n.Message.GiphyAttachment.title)
                     .font(fonts.bodyBold)
                     .foregroundColor(Color(colors.staticColorText))
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/MessageList/ImageAttachmentView.swift b/Sources/StreamChatSwiftUI/ChatChannel/MessageList/ImageAttachmentView.swift
@@ -371,6 +371,11 @@ struct LazyLoadingImage: View {
                                     imageTapped(index ?? 0)
                                 }
                         )
+                        .accessibilityLabel(L10n.Message.Attachment.accessibilityLabel((index ?? 0) + 1))
+                        .accessibilityAddTraits(source.type == .video ? .startsMediaSession : .isImage)
+                        .accessibilityAction {
+                            imageTapped(index ?? 0)
+                        }
                 }
             } else if error != nil {
                 Color(.secondarySystemBackground)
@@ -383,6 +388,7 @@ struct LazyLoadingImage: View {
             
             if source.type == .video && width > 64 && source.uploadingState == nil {
                 VideoPlayIcon()
+                    .accessibilityHidden(true)
             }
         }
         .onAppear {
@@ -414,6 +420,7 @@ struct LazyLoadingImage: View {
             .allowsHitTesting(false)
             .scaleEffect(1.0001) // Needed because of SwiftUI sometimes incorrectly displaying landscape images.
             .clipped()
+            .accessibilityHidden(true)
     }
 }
 
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListHelperViews.swift b/Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListHelperViews.swift
@@ -124,10 +124,14 @@ public struct MessageReadIndicatorView: View {
             .customizable()
             .foregroundColor(!readUsers.isEmpty ? colors.tintColor : Color(colors.textLowEmphasis))
             .frame(height: 16)
+            .accessibilityLabel(
+                Text(
+                    readUsers.isEmpty ? L10n.Message.ReadStatus.seenByNoOne : L10n.Message.ReadStatus.seenByOthers
+                )
+            )
             .accessibilityIdentifier("readIndicatorCheckmark")
         }
-        .accessibilityElement(children: .combine)
-        .accessibilityLabel(Text(L10n.Message.Cell.Read.count(readUsers.count)))
+        .accessibilityElement(children: .contain)
         .accessibilityIdentifier("MessageReadIndicatorView")
     }
     
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListView.swift b/Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListView.swift
@@ -527,6 +527,7 @@ public struct DateIndicatorView: View {
                 .padding(.all, 8)
             Spacer()
         }
+        .accessibilityAddTraits(.isHeader)
     }
 }
 
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/MessageList/QuotedMessageView.swift b/Sources/StreamChatSwiftUI/ChatChannel/MessageList/QuotedMessageView.swift
@@ -47,6 +47,9 @@ struct QuotedMessageViewContainer<Factory: ViewFactory>: View {
         .onTapGesture(perform: {
             scrolledId = quotedMessage.messageId
         })
+        .accessibilityAction {
+            scrolledId = quotedMessage.messageId
+        }
         .accessibilityIdentifier("QuotedMessageViewContainer")
     }
 }
diff --git a/Sources/StreamChatSwiftUI/Generated/L10n.swift b/Sources/StreamChatSwiftUI/Generated/L10n.swift
@@ -194,6 +194,12 @@ internal enum L10n {
   }
 
   internal enum Composer {
+    internal enum AudioRecording {
+      /// Start recording audio message
+      internal static var start: String { L10n.tr("Localizable", "composer.audio-recording.start") }
+      /// Stop recording audio message
+      internal static var stop: String { L10n.tr("Localizable", "composer.audio-recording.stop") }
+    }
     internal enum Checkmark {
       /// Also send in channel
       internal static var channelReply: String { L10n.tr("Localizable", "composer.checkmark.channel-reply") }
@@ -231,6 +237,8 @@ internal enum L10n {
       internal static var file: String { L10n.tr("Localizable", "composer.picker.file") }
       /// Photo or Video
       internal static var media: String { L10n.tr("Localizable", "composer.picker.media") }
+      /// Attachment pickers
+      internal static var showAll: String { L10n.tr("Localizable", "composer.picker.show-all") }
       /// Choose attachment type: 
       internal static var title: String { L10n.tr("Localizable", "composer.picker.title") }
     }
@@ -394,6 +402,12 @@ internal enum L10n {
         internal static var confirmationMessage: String { L10n.tr("Localizable", "message.actions.user-unblock.confirmation-message") }
       }
     }
+    internal enum Attachment {
+      /// Attachment %d
+      internal static func accessibilityLabel(_ p1: Int) -> String {
+        return L10n.tr("Localizable", "message.attachment.accessibility-label", p1)
+      }
+    }
     internal enum Bounce {
       /// Message was bounced
       internal static var title: String { L10n.tr("Localizable", "message.bounce.title") }
@@ -409,12 +423,6 @@ internal enum L10n {
       }
       /// unknown
       internal static var unknownPin: String { L10n.tr("Localizable", "message.cell.unknownPin") }
-      internal enum Read {
-        /// Plural format key: "%#@seen@"
-        internal static func count(_ p1: Int) -> String {
-          return L10n.tr("Localizable", "message.cell.read.count", p1)
-        }
-      }
     }
     internal enum FileAttachment {
       /// Error occured while previewing the file.
@@ -482,6 +490,12 @@ internal enum L10n {
       /// You
       internal static var currentUser: String { L10n.tr("Localizable", "message.reactions.currentUser") }
     }
+    internal enum ReadStatus {
+      /// Seen by no one
+      internal static var seenByNoOne: String { L10n.tr("Localizable", "message.read-status.seen-by-no-one") }
+      /// Seen by others
+      internal static var seenByOthers: String { L10n.tr("Localizable", "message.read-status.seen-by-others") }
+    }
     internal enum Search {
       /// Cancel
       internal static var cancel: String { L10n.tr("Localizable", "message.search.cancel") }
diff --git a/Sources/StreamChatSwiftUI/Resources/en.lproj/Localizable.strings b/Sources/StreamChatSwiftUI/Resources/en.lproj/Localizable.strings
@@ -26,6 +26,10 @@
 
 "channel.header.info.title" = "Channel info";
 
+"message.attachment.accessibility-label" = "Attachment %d";
+"message.read-status.seen-by-others" = "Seen by others";
+"message.read-status.seen-by-no-one" = "Seen by no one";
+
 "message.actions.inline-reply" = "Reply";
 "message.actions.thread-reply" = "Thread Reply";
 "message.actions.edit" = "Edit Message";
@@ -114,6 +118,7 @@
 "composer.picker.file" = "File";
 "composer.picker.media" = "Photo or Video";
 "composer.picker.cancel" = "Cancel";
+"composer.picker.show-all" = "Attachment pickers";
 "composer.files.add-more" = "Add more files";
 "composer.images.no-access-library" = "You have not granted access to the photo library.";
 "composer.images.access-settings" = "Change in Settings";
@@ -133,6 +138,8 @@
 "composer.polls.multiple-answers" = "Multiple answers";
 "composer.polls.suggest-option" = "Suggest an option";
 "composer.polls.type-number-from-1-and-10" = "Type a number from 1 and 10";
+"composer.audio-recording.start" = "Start recording audio message";
+"composer.audio-recording.stop" = "Stop recording audio message";
 
 "composer.commands.giphy" = "Giphy";
 "composer.commands.mute" = "Mute";
diff --git a/Sources/StreamChatSwiftUI/Resources/en.lproj/Localizable.stringsdict b/Sources/StreamChatSwiftUI/Resources/en.lproj/Localizable.stringsdict
@@ -144,23 +144,5 @@
 			<string>%d Thread Replies</string>
 		</dict>
 	</dict>
-	<key>message.cell.read.count</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@seen@</string>
-		<key>seen</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>zero</key>
-			<string>Seen by no-one</string>
-			<key>one</key>
-			<string>Seen by %d</string>
-			<key>other</key>
-			<string>Seen by %d</string>
-		</dict>
-	</dict>
 </dict>
 </plist>
diff --git a/StreamChatSwiftUITests/Infrastructure/TestTools/ChatClient_Mock.swift b/StreamChatSwiftUITests/Infrastructure/TestTools/ChatClient_Mock.swift
@@ -34,8 +34,12 @@ public extension ChatClient {
                 databaseContainerBuilder: {
                     DatabaseContainer_Spy(
                         kind: $0,
+                        shouldFlushOnStart: $1,
+                        shouldResetEphemeralValuesOnStart: $2,
                         bundle: Bundle(for: StreamChatTestCase.self),
-                        chatClientConfig: $1
+                        localCachingSettings: $3,
+                        deletedMessagesVisibility: $4,
+                        shouldShowShadowedMessages: $5
                     )
                 },
                 authenticationRepositoryBuilder: AuthenticationRepository_Mock.init

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ public struct AttachmentPickerTypeView: View {`
`56`	`56`	`pickerType: .media,`
`57`	`57`	`selected: attachmentPickerType`
`58`	`58`	`)`
	`59`	`+ .accessibilityLabel(Text(L10n.Composer.Picker.showAll))`
`59`	`60`	`.accessibilityIdentifier("PickerTypeButtonMedia")`
`60`	`61`	`}`
`61`	`62`
`@@ -65,6 +66,7 @@ public struct AttachmentPickerTypeView: View {`
`65`	`66`	`pickerType: .instantCommands,`
`66`	`67`	`selected: attachmentPickerType`
`67`	`68`	`)`
	`69`	`+ .accessibilityLabel(Text(L10n.Composer.Suggestions.Commands.header))`
`68`	`70`	`.accessibilityIdentifier("PickerTypeButtonCommands")`
`69`	`71`	`}`
`70`	`72`	`case .collapsed:`
Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,7 @@ public struct AttachmentSourcePickerView: View {`
`159`	`159`	`isSelected: selected == .files,`
`160`	`160`	`onTap: onTap`
`161`	`161`	`)`
	`162`	`+ .accessibilityLabel(L10n.Composer.Picker.file)`
`162`	`163`	`.accessibilityIdentifier("attachmentPickerFiles")`
`163`	`164`
`164`	`165`	`AttachmentPickerButton(`
`@@ -176,6 +177,7 @@ public struct AttachmentSourcePickerView: View {`
`176`	`177`	`isSelected: selected == .polls,`
`177`	`178`	`onTap: onTap`
`178`	`179`	`)`
	`180`	`+ .accessibilityLabel(L10n.Composer.Polls.createPoll)`
`179`	`181`	`.accessibilityIdentifier("attachmentPickerPolls")`
`180`	`182`	`}`
`181`	`183`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public struct SendMessageButton: View {`
`31`	`31`	`)`
`32`	`32`	`}`
`33`	`33`	`.disabled(!enabled)`
`34`		`- .accessibilityAddTraits(.isButton)`
	`34`	`+ .accessibilityLabel(Text(L10n.Composer.Placeholder.message))`
`35`	`35`	`.accessibilityIdentifier("SendMessageButton")`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -85,5 +85,12 @@ public struct VoiceRecordingButton: View {`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`)`
	`88`	`+ .accessibilityRemoveTraits(.isImage)`
	`89`	`+ .accessibilityAddTraits(.isButton)`
	`90`	`+ .accessibilityLabel(Text(L10n.Composer.AudioRecording.start))`
	`91`	`+ .accessibilityAction {`
	`92`	`+ viewModel.recordingState = .recording(.zero)`
	`93`	`+ viewModel.startRecording()`
	`94`	`+ }`
`88`	`95`	`}`
`89`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ struct RecordingView: View {`
`20`	`20`	`HStack {`
`21`	`21`	`Image(systemName: "mic")`
`22`	`22`	`.foregroundColor(.red)`
	`23`	`+ .accessibilityHidden(true)`
`23`	`24`	`RecordingDurationView(duration: audioRecordingInfo.duration)`
`24`	`25`
`25`	`26`	`Spacer()`
`@@ -30,6 +31,7 @@ struct RecordingView: View {`
`30`	`31`	`}`
`31`	`32`	`.foregroundColor(Color(colors.textLowEmphasis))`
`32`	`33`	`.opacity(opacityForSlideToCancel)`
	`34`	`+ .accessibilityHidden(true)`
`33`	`35`
`34`	`36`	`Spacer()`
`35`	`37`
`@@ -38,6 +40,7 @@ struct RecordingView: View {`
`38`	`40`	`} label: {`
`39`	`41`	`Image(systemName: "mic")`
`40`	`42`	`}`
	`43`	`+ .accessibilityLabel(Text(L10n.Composer.AudioRecording.stop))`
`41`	`44`	`}`
`42`	`45`	`.padding(.all, 12)`
`43`	`46`	`.overlay(`
Original file line number	Diff line number	Diff line change
`@@ -215,6 +215,7 @@ struct VoiceRecordingView: View {`
`215`	`215`	`.resizable()`
`216`	`216`	`.aspectRatio(contentMode: .fit)`
`217`	`217`	`.frame(height: 40)`
	`218`	`+ .accessibilityHidden(true)`
`218`	`219`	`}`
`219`	`220`	`}`
`220`	`221`	`.onReceive(handler.$context, perform: { value in`
Original file line number	Diff line number	Diff line change
`@@ -371,6 +371,11 @@ struct LazyLoadingImage: View {`
`371`	`371`	`imageTapped(index ?? 0)`
`372`	`372`	`}`
`373`	`373`	`)`
	`374`	`+ .accessibilityLabel(L10n.Message.Attachment.accessibilityLabel((index ?? 0) + 1))`
	`375`	`+ .accessibilityAddTraits(source.type == .video ? .startsMediaSession : .isImage)`
	`376`	`+ .accessibilityAction {`
	`377`	`+ imageTapped(index ?? 0)`
	`378`	`+ }`
`374`	`379`	`}`
`375`	`380`	`} else if error != nil {`
`376`	`381`	`Color(.secondarySystemBackground)`
`@@ -383,6 +388,7 @@ struct LazyLoadingImage: View {`
`383`	`388`
`384`	`389`	`if source.type == .video && width > 64 && source.uploadingState == nil {`
`385`	`390`	`VideoPlayIcon()`
	`391`	`+ .accessibilityHidden(true)`
`386`	`392`	`}`
`387`	`393`	`}`
`388`	`394`	`.onAppear {`
`@@ -414,6 +420,7 @@ struct LazyLoadingImage: View {`
`414`	`420`	`.allowsHitTesting(false)`
`415`	`421`	`.scaleEffect(1.0001) // Needed because of SwiftUI sometimes incorrectly displaying landscape images.`
`416`	`422`	`.clipped()`
	`423`	`+ .accessibilityHidden(true)`
`417`	`424`	`}`
`418`	`425`	`}`
`419`	`426`