Align accessibility IDs with elementX android (#567)

* Rename onboarding and login user/pass accessibility ids.

* Refactor remaining server change accessibility IDs

* Avoid accessibilityIdentifier spreading to all decorations on the textBox.

Required because otherwise there are multiple items tagged with the accessibilityId
which means we can't click on "the" item.

* Move all accessibility identifiers to `AccessibilityIdentifiers.swft`
- use same naming convention on all of them
- remove the unused ones
- fix build errors in integration tests and invalid identifiers (still broken until autodiscovery lands on rosa)

---------

Co-authored-by: Stefan Ceriu <stefanc@matrix.org>

ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginScreen.swift

@@ -77,23 +77,21 @@ struct LoginScreen: View {
             
             TextField(ElementL10n.loginSigninUsernameHint, text: $context.username)
                 .focused($isUsernameFocused)
-                .textFieldStyle(.elementInput())
+                .textFieldStyle(.elementInput(accessibilityIdentifier: A11yIdentifiers.loginScreen.emailUsername))
                 .disableAutocorrection(true)
                 .textContentType(.username)
                 .autocapitalization(.none)
                 .submitLabel(.next)
                 .onChange(of: isUsernameFocused, perform: usernameFocusChanged)
                 .onSubmit { isPasswordFocused = true }
-                .accessibilityIdentifier("usernameTextField")
                 .padding(.bottom, 20)
             
             SecureField(ElementL10n.loginSignupPasswordHint, text: $context.password)
                 .focused($isPasswordFocused)
-                .textFieldStyle(.elementInput())
+                .textFieldStyle(.elementInput(accessibilityIdentifier: A11yIdentifiers.loginScreen.password))
                 .textContentType(.password)
                 .submitLabel(.done)
                 .onSubmit(submit)
-                .accessibilityIdentifier("passwordTextField")
             
             Spacer().frame(height: 32)
 
@@ -102,7 +100,7 @@ struct LoginScreen: View {
             }
             .buttonStyle(.elementAction(.xLarge))
             .disabled(!context.viewState.canSubmit)
-            .accessibilityIdentifier("nextButton")
+            .accessibilityIdentifier(A11yIdentifiers.loginScreen.continue)
         }
     }
 
@@ -112,7 +110,7 @@ struct LoginScreen: View {
             Text(ElementL10n.loginContinue)
         }
         .buttonStyle(.elementAction(.xLarge))
-        .accessibilityIdentifier("oidcButton")
+        .accessibilityIdentifier(A11yIdentifiers.loginScreen.oidc)
     }
     
     /// Text shown if neither password or OIDC login is supported.
@@ -122,7 +120,7 @@ struct LoginScreen: View {
             .multilineTextAlignment(.center)
             .foregroundColor(.element.primaryContent)
             .frame(maxWidth: .infinity)
-            .accessibilityIdentifier("unsupportedServerText")
+            .accessibilityIdentifier(A11yIdentifiers.loginScreen.unsupportedServer)
     }
     
     /// Parses the username for a homeserver.

ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginServerInfoSection.swift

@@ -51,7 +51,7 @@ struct LoginServerInfoSection: View {
                 }
                 .background(RoundedRectangle(cornerRadius: 14).fill(Color.element.system))
             }
-            .accessibilityIdentifier("editServerButton")
+            .accessibilityIdentifier(A11yIdentifiers.loginScreen.changeServer)
         }
     }
 }

ElementX/Sources/Screens/Authentication/ServerSelection/View/ServerSelectionScreen.swift

@@ -62,21 +62,21 @@ struct ServerSelectionScreen: View {
             TextField(ElementL10n.ftueAuthChooseServerEntryHint, text: $context.homeserverAddress)
                 .textFieldStyle(.elementInput(labelText: ElementL10n.hsUrl,
                                               footerText: context.viewState.footerMessage,
-                                              isError: context.viewState.isShowingFooterError))
+                                              isError: context.viewState.isShowingFooterError,
+                                              accessibilityIdentifier: A11yIdentifiers.changeServerScreen.server))
                 .keyboardType(.URL)
                 .autocapitalization(.none)
                 .disableAutocorrection(true)
                 .onChange(of: context.homeserverAddress) { _ in context.send(viewAction: .clearFooterError) }
                 .submitLabel(.done)
                 .onSubmit(submit)
-                .accessibilityIdentifier("addressTextField")
             
             Button(action: submit) {
                 Text(context.viewState.buttonTitle)
             }
             .buttonStyle(.elementAction(.xLarge))
             .disabled(context.viewState.hasValidationError)
-            .accessibilityIdentifier("confirmButton")
+            .accessibilityIdentifier(A11yIdentifiers.changeServerScreen.continue)
         }
     }
     
@@ -87,7 +87,7 @@ struct ServerSelectionScreen: View {
                 Button { context.send(viewAction: .dismiss) } label: {
                     Text(ElementL10n.actionCancel)
                 }
-                .accessibilityIdentifier("dismissButton")
+                .accessibilityIdentifier(A11yIdentifiers.changeServerScreen.dismiss)
             }
         }
     }

ElementX/Sources/Screens/Authentication/SoftLogout/View/SoftLogoutScreen.swift

@@ -58,20 +58,19 @@ struct SoftLogoutScreen: View {
                 .font(.element.title2Bold)
                 .multilineTextAlignment(.leading)
                 .foregroundColor(.element.primaryContent)
-                .accessibilityIdentifier("titleLabel")
+                .accessibilityIdentifier(A11yIdentifiers.softLogoutScreen.title)
 
             Text(ElementL10n.softLogoutSigninNotice(context.viewState.credentials.homeserverName, context.viewState.credentials.userDisplayName, context.viewState.credentials.userId))
                 .font(.element.body)
                 .multilineTextAlignment(.leading)
                 .foregroundColor(.element.primaryContent)
-                .accessibilityIdentifier("messageLabel1")
+                .accessibilityIdentifier(A11yIdentifiers.softLogoutScreen.message)
 
             if context.viewState.showRecoverEncryptionKeysMessage {
                 Text(ElementL10n.softLogoutSigninE2eWarningNotice)
                     .font(.element.body)
                     .multilineTextAlignment(.leading)
                     .foregroundColor(.element.primaryContent)
-                    .accessibilityIdentifier("messageLabel2")
             }
         }
     }
@@ -85,7 +84,7 @@ struct SoftLogoutScreen: View {
                 .textContentType(.password)
                 .submitLabel(.done)
                 .onSubmit(submit)
-                .accessibilityIdentifier("passwordTextField")
+                .accessibilityIdentifier(A11yIdentifiers.softLogoutScreen.password)
 
             Button { context.send(viewAction: .forgotPassword) } label: {
                 Text(ElementL10n.ftueAuthForgotPassword)
@@ -93,14 +92,14 @@ struct SoftLogoutScreen: View {
             }
             .frame(maxWidth: .infinity, alignment: .trailing)
             .padding(.bottom, 8)
-            .accessibilityIdentifier("forgotPasswordButton")
+            .accessibilityIdentifier(A11yIdentifiers.softLogoutScreen.forgotPassword)
 
             Button(action: submit) {
                 Text(ElementL10n.loginSignupSubmit)
             }
             .buttonStyle(.elementAction(.xLarge))
             .disabled(!context.viewState.canSubmit)
-            .accessibilityIdentifier("nextButton")
+            .accessibilityIdentifier(A11yIdentifiers.softLogoutScreen.next)
         }
     }
 
@@ -110,7 +109,6 @@ struct SoftLogoutScreen: View {
             Text(ElementL10n.loginContinue)
         }
         .buttonStyle(.elementAction(.xLarge))
-        .accessibilityIdentifier("oidcButton")
     }
 
     /// Text shown if neither password or OIDC login is supported.
@@ -120,7 +118,6 @@ struct SoftLogoutScreen: View {
             .multilineTextAlignment(.center)
             .foregroundColor(.element.primaryContent)
             .frame(maxWidth: .infinity)
-            .accessibilityIdentifier("unsupportedServerText")
     }
 
     /// The text field and submit button where the user enters an email address.
@@ -130,20 +127,20 @@ struct SoftLogoutScreen: View {
                 .font(.element.title2Bold)
                 .multilineTextAlignment(.leading)
                 .foregroundColor(.element.primaryContent)
-                .accessibilityIdentifier("clearDataTitleLabel")
+                .accessibilityIdentifier(A11yIdentifiers.softLogoutScreen.clearDataTitle)
 
             Text(ElementL10n.softLogoutClearDataNotice)
                 .font(.element.body)
                 .multilineTextAlignment(.leading)
                 .foregroundColor(.element.primaryContent)
-                .accessibilityIdentifier("clearDataMessageLabel")
+                .accessibilityIdentifier(A11yIdentifiers.softLogoutScreen.clearDataMessage)
                 .padding(.bottom, 12)
 
             Button(action: clearData) {
                 Text(ElementL10n.softLogoutClearDataSubmit)
             }
             .buttonStyle(.elementAction(.xLarge, color: .element.alert))
-            .accessibilityIdentifier("clearDataButton")
+            .accessibilityIdentifier(A11yIdentifiers.softLogoutScreen.clearData)
             .alert(ElementL10n.softLogoutClearDataDialogTitle,
                    isPresented: $showingClearDataConfirmation) {
                 Button(ElementL10n.actionSignOut,