From 15a0eccaf22e4a8b27dc4577086ecff91c2b832d Mon Sep 17 00:00:00 2001
From: Morgan Pretty <morgan.t.pretty@gmail.com>
Date: Thu, 16 Mar 2023 11:57:13 +1100
Subject: [PATCH] Added more accessibility info to the name field

---
 Session/Settings/SettingsViewModel.swift             | 10 ++++++++++
 Session/Shared/Views/SessionCell+AccessoryView.swift |  1 +
 2 files changed, 11 insertions(+)

diff --git a/Session/Settings/SettingsViewModel.swift b/Session/Settings/SettingsViewModel.swift
index 290e2085a..4fcbb9245 100644
--- a/Session/Settings/SettingsViewModel.swift
+++ b/Session/Settings/SettingsViewModel.swift
@@ -254,6 +254,9 @@ class SettingsViewModel: SessionTableViewModel<SettingsViewModel.NavButton, Sett
                                 customPadding: SessionCell.Padding(bottom: Values.smallSpacing),
                                 backgroundStyle: .noBackground
                             ),
+                            accessibility: SessionCell.Accessibility(
+                                label: "Profile picture"
+                            ),
                             onTap: {
                                 self?.updateProfilePicture(
                                     hasCustomImage: ProfileManager.hasProfileImageData(
@@ -275,6 +278,10 @@ class SettingsViewModel: SessionTableViewModel<SettingsViewModel.NavButton, Sett
                                 customPadding: SessionCell.Padding(top: Values.smallSpacing),
                                 backgroundStyle: .noBackground
                             ),
+                            accessibility: SessionCell.Accessibility(
+                                identifier: "Username",
+                                label: profile.displayName()
+                            ),
                             onTap: { self?.setIsEditing(true) }
                         )
                     ]
@@ -293,6 +300,9 @@ class SettingsViewModel: SessionTableViewModel<SettingsViewModel.NavButton, Sett
                             styling: SessionCell.StyleInfo(
                                 customPadding: SessionCell.Padding(bottom: Values.smallSpacing),
                                 backgroundStyle: .noBackground
+                            ),
+                            accessibility: SessionCell.Accessibility(
+                                label: "Session ID"
                             )
                         ),
                         SessionCell.Info(
diff --git a/Session/Shared/Views/SessionCell+AccessoryView.swift b/Session/Shared/Views/SessionCell+AccessoryView.swift
index 18cee967b..0aac489bd 100644
--- a/Session/Shared/Views/SessionCell+AccessoryView.swift
+++ b/Session/Shared/Views/SessionCell+AccessoryView.swift
@@ -471,6 +471,7 @@ extension SessionCell {
                     
                     profilePictureView.accessibilityIdentifier = accessibility?.identifier
                     profilePictureView.accessibilityLabel = accessibility?.label
+                    profilePictureView.isAccessibilityElement = (accessibility != nil)
                     profilePictureView.update(
                         publicKey: profileId,
                         threadVariant: threadVariant,