Improve voice over labels and navigation

Author: laevandus

DemoAppSwiftUI/ChannelHeader/CustomChannelHeader.swift

@@ -36,12 +36,15 @@ public struct CustomChannelHeader: ToolbarContent {
                     .background(colors.tintColor)
                     .clipShape(Circle())
             }
+            .accessibilityLabel(Text("New Channel"))
         }
         ToolbarItem(placement: .navigationBarLeading) {
             Button {
                 actionsPopupShown = true
             } label: {
                 StreamLazyImage(url: currentUserController.currentUser?.imageURL)
+                    .accessibilityLabel("Account Actions")
+                    .accessibilityAddTraits(.isButton)
             }
         }
     }

Sources/StreamChatSwiftUI/ChatChannel/ChannelHeader/ChatChannelHeaderViewModifier.swift

@@ -71,20 +71,23 @@ public struct DefaultChatChannelHeader: ToolbarContent {
                         .clipShape(Circle())
                         .offset(x: 8)
                 }
+                .accessibilityLabel(Text(L10n.Channel.Header.Info.title))
 
                 NavigationLink(isActive: $isActive) {
                     LazyView(ChatChannelInfoView(channel: channel, shownFromMessageList: true))
                 } label: {
                     EmptyView()
                 }
-
+                .accessibilityHidden(true)
+                
                 ChannelAvatarView(
                     avatar: headerImage,
                     showOnlineIndicator: onlineIndicatorShown,
                     size: CGSize(width: 36, height: 36)
                 )
                 .offset(x: 8)
                 .allowsHitTesting(false)
+                .accessibilityHidden(true)
             }
             .accessibilityIdentifier("ChannelAvatarView")
         }

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListHelperViews.swift

@@ -26,7 +26,7 @@ public struct MessageAuthorAndDateView: View {
             }
             Spacer()
         }
-        .accessibilityElement(children: .contain)
+        .accessibilityElement(children: .combine)
         .accessibilityIdentifier("MessageAuthorAndDateView")
     }
 }
@@ -80,11 +80,16 @@ struct MessageDateView: View {
         return text
     }
 
+    var accessibilityLabel: String {
+        L10n.Message.Cell.sentAt(text)
+    }
+    
     var body: some View {
         Text(text)
             .font(fonts.footnote)
             .foregroundColor(Color(colors.textLowEmphasis))
             .animation(nil)
+            .accessibilityLabel(Text(accessibilityLabel))
             .accessibilityIdentifier("MessageDateView")
     }
 }
@@ -121,7 +126,8 @@ public struct MessageReadIndicatorView: View {
             .frame(height: 16)
             .accessibilityIdentifier("readIndicatorCheckmark")
         }
-        .accessibilityElement(children: .contain)
+        .accessibilityElement(children: .combine)
+        .accessibilityLabel(Text(L10n.Message.Cell.Read.count(readUsers.count)))
         .accessibilityIdentifier("MessageReadIndicatorView")
     }
 
@@ -161,6 +167,7 @@ public struct MessagePinDetailsView: View {
             Image(uiImage: images.pin)
                 .customizable()
                 .frame(maxHeight: 12)
+                .accessibilityHidden(true)
             Text("\(L10n.Message.Cell.pinnedBy) \(message.pinDetails?.pinnedBy.name ?? L10n.Message.Cell.unknownPin)")
                 .font(fonts.footnote)
         }

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListView.swift

@@ -467,6 +467,7 @@ public struct ScrollToBottomButton: View {
                     .frame(width: buttonSize, height: buttonSize)
                     .modifier(ShadowViewModifier(cornerRadius: buttonSize / 2))
             }
+            .accessibilityLabel(Text(L10n.Channel.List.ScrollToBottom.title))
             .padding()
             .overlay(
                 unreadCount > 0 ?

Sources/StreamChatSwiftUI/ChatChannelList/MoreChannelActionsView.swift

@@ -164,12 +164,14 @@ public struct ChannelMemberView: View {
                 showOnlineIndicator: onlineIndicatorShown,
                 size: memberSize
             )
+            .accessibilityHidden(true)
 
             Text(name)
                 .font(fonts.footnoteBold)
                 .multilineTextAlignment(.center)
                 .lineLimit(2)
                 .frame(maxWidth: memberSize.width, maxHeight: 34, alignment: .top)
+                .accessibilityLabel(Text(name) + Text(onlineIndicatorShown ? ", \(L10n.Message.Title.online)" : ""))
         }
     }
 }

Sources/StreamChatSwiftUI/Generated/L10n.swift

@@ -76,6 +76,12 @@ internal enum L10n {
   }
 
   internal enum Channel {
+    internal enum Header {
+      internal enum Info {
+        /// Channel info
+        internal static var title: String { L10n.tr("Localizable", "channel.header.info.title") }
+      }
+    }
     internal enum Item {
       /// Audio
       internal static var audio: String { L10n.tr("Localizable", "channel.item.audio") }
@@ -112,6 +118,12 @@ internal enum L10n {
       /// Voice Message
       internal static var voiceMessage: String { L10n.tr("Localizable", "channel.item.voice-message") }
     }
+    internal enum List {
+      internal enum ScrollToBottom {
+        /// Scroll to bottom
+        internal static var title: String { L10n.tr("Localizable", "channel.list.scroll-to-bottom.title") }
+      }
+    }
     internal enum Name {
       /// and
       internal static var and: String { L10n.tr("Localizable", "channel.name.and") }
@@ -391,8 +403,18 @@ internal enum L10n {
       internal static var edited: String { L10n.tr("Localizable", "message.cell.edited") }
       /// Pinned by
       internal static var pinnedBy: String { L10n.tr("Localizable", "message.cell.pinnedBy") }
+      /// Sent at %@
+      internal static func sentAt(_ p1: Any) -> String {
+        return L10n.tr("Localizable", "message.cell.sent-at", String(describing: p1))
+      }
       /// 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.

Sources/StreamChatSwiftUI/Resources/en.lproj/Localizable.strings

@@ -18,10 +18,14 @@
 "channel.name.direct-message" = "user";
 "channel.name.group" = "group";
 
+"channel.list.scroll-to-bottom.title" = "Scroll to bottom";
+
 "channel.no-content.title" = "Let's start chatting";
 "channel.no-content.message" = "How about sending your first message to a friend?";
 "channel.no-content.start" = "Start a chat";
 
+"channel.header.info.title" = "Channel info";
+
 "message.actions.inline-reply" = "Reply";
 "message.actions.thread-reply" = "Thread Reply";
 "message.actions.edit" = "Edit Message";
@@ -54,6 +58,7 @@
 "message.cell.pinnedBy" = "Pinned by";
 "message.cell.unknownPin" = "unknown";
 "message.cell.edited" = "Edited";
+"message.cell.sent-at" = "Sent at %@";
 "message.reactions.currentUser" = "You";
 
 "message.polls.button.addComment" = "Add a Comment";

Sources/StreamChatSwiftUI/Resources/en.lproj/Localizable.stringsdict

@@ -144,5 +144,23 @@
 			<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>