From 05eb059caf887085cc1708c69725423bdad68e5c Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Fri, 19 May 2023 15:41:44 +1000
Subject: [PATCH] modify & add accessibility ids and labels

---
 .../Message Cells/InfoMessageCell.swift            |  2 +-
 ...readDisappearingMessagesSettingsViewModel.swift |  5 +++--
 .../Views & Modals/ConversationTitleView.swift     | 14 +++++++++-----
 .../Views & Modals/SessionLabelCarouselView.swift  |  5 +++--
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/Session/Conversations/Message Cells/InfoMessageCell.swift b/Session/Conversations/Message Cells/InfoMessageCell.swift
index 47fb22cd1..43e849c93 100644
--- a/Session/Conversations/Message Cells/InfoMessageCell.swift	
+++ b/Session/Conversations/Message Cells/InfoMessageCell.swift	
@@ -70,7 +70,7 @@ final class InfoMessageCell: MessageCell {
     ) {
         guard cellViewModel.variant.isInfoMessage else { return }
         
-        self.accessibilityIdentifier = "Configuration message"
+        self.accessibilityIdentifier = "Control message"
         self.isAccessibilityElement = true
         self.viewModel = cellViewModel
         
diff --git a/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift b/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
index c1327d539..9d60d6b6f 100644
--- a/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
+++ b/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
@@ -106,6 +106,7 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel<ThreadD
                     title: "DISAPPERING_MESSAGES_SAVE_TITLE".localized(),
                     isEnabled: true,
                     accessibilityIdentifier: "Set button",
+                    accessibilityLabel: "Set button",
                     minWidth: 110,
                     onTap: {
                         self?.saveChanges()
@@ -133,8 +134,8 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel<ThreadD
                                         isSelected: { (self?.currentSelection.value.isEnabled == false) }
                                     ),
                                     accessibility: Accessibility(
-                                        identifier: "Off option",
-                                        label: "Off option"
+                                        identifier: "Disable disappearing messages (Off option)",
+                                        label: "Disable disappearing messages (Off option)"
                                     ),
                                     onTap: {
                                         let updatedConfig: DisappearingMessagesConfiguration = currentSelection
diff --git a/Session/Conversations/Views & Modals/ConversationTitleView.swift b/Session/Conversations/Views & Modals/ConversationTitleView.swift
index 32a623244..952735593 100644
--- a/Session/Conversations/Views & Modals/ConversationTitleView.swift	
+++ b/Session/Conversations/Views & Modals/ConversationTitleView.swift	
@@ -29,6 +29,7 @@ final class ConversationTitleView: UIView {
     private lazy var titleLabel: UILabel = {
         let result: UILabel = UILabel()
         result.accessibilityIdentifier = "Conversation header name"
+        result.accessibilityLabel = "Conversation header name"
         result.isAccessibilityElement = true
         result.font = .boldSystemFont(ofSize: Values.mediumFontSize)
         result.themeTextColor = .textPrimary
@@ -161,7 +162,7 @@ final class ConversationTitleView: UIView {
                 labelInfos.append(
                     SessionLabelCarouselView.LabelInfo(
                         attributedText: notificationSettingsLabelString,
-                        accessibilityIdentifier: nil,
+                        accessibility: nil, // TODO: Add accessibility
                         type: .notificationSettings
                     )
                 )
@@ -183,7 +184,7 @@ final class ConversationTitleView: UIView {
                 labelInfos.append(
                     SessionLabelCarouselView.LabelInfo(
                         attributedText: notificationSettingsLabelString,
-                        accessibilityIdentifier: nil,
+                        accessibility: nil, // TODO: Add accessibility
                         type: .notificationSettings
                     )
                 )
@@ -199,7 +200,7 @@ final class ConversationTitleView: UIView {
                                 attributedText: NSAttributedString(
                                     string: "\(userCount) member\(userCount == 1 ? "" : "s")"
                                 ),
-                                accessibilityIdentifier: nil,
+                                accessibility: nil, // TODO: Add accessibility
                                 type: .userCount
                             )
                         )
@@ -210,7 +211,7 @@ final class ConversationTitleView: UIView {
                                 attributedText: NSAttributedString(
                                     string: "\(userCount) active member\(userCount == 1 ? "" : "s")"
                                 ),
-                                accessibilityIdentifier: nil,
+                                accessibility: nil, // TODO: Add accessibility
                                 type: .userCount
                             )
                         )
@@ -247,7 +248,10 @@ final class ConversationTitleView: UIView {
                 labelInfos.append(
                     SessionLabelCarouselView.LabelInfo(
                         attributedText: disappearingMessageSettingLabelString,
-                        accessibilityIdentifier: "Disappearing messages type and time",
+                        accessibility: Accessibility(
+                            identifier: "Disappearing messages type and time",
+                            label: "Disappearing messages type and time"
+                        ),
                         type: .disappearingMessageSetting
                     )
                 )
diff --git a/Session/Conversations/Views & Modals/SessionLabelCarouselView.swift b/Session/Conversations/Views & Modals/SessionLabelCarouselView.swift
index d24c3e474..a10f5d7a8 100644
--- a/Session/Conversations/Views & Modals/SessionLabelCarouselView.swift	
+++ b/Session/Conversations/Views & Modals/SessionLabelCarouselView.swift	
@@ -23,7 +23,7 @@ final class SessionLabelCarouselView: UIView, UIScrollViewDelegate {
     
     public struct LabelInfo {
         let attributedText: NSAttributedString
-        let accessibilityIdentifier: String?
+        let accessibility: Accessibility?
         let type: LabelType
     }
     
@@ -139,7 +139,8 @@ final class SessionLabelCarouselView: UIView, UIScrollViewDelegate {
             label.themeTextColor = .textPrimary
             label.lineBreakMode = .byTruncatingTail
             label.attributedText = $0.attributedText
-            label.accessibilityIdentifier = $0.accessibilityIdentifier
+            label.accessibilityIdentifier = $0.accessibility?.identifier
+            label.accessibilityLabel = $0.accessibility?.label
             label.isAccessibilityElement = true
             wrapper.addSubview(label)
             label.center(in: wrapper)