zelo72/mastodon-ios
2
2
Fork 1
mirror of https://github.com/mastodon/mastodon-ios synced 2025-04-11 22:58:02 +02:00
Code Issues 20 Releases Wiki Activity

IOS-97: Improve labelling of username field on Create Account screen (#970)

Browse Source
This commit is contained in:
Marcus Kida 2023-03-15 14:52:49 +01:00 committed by GitHub
parent cd4cd66f61
commit 71a72d2581
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Mastodon/Scene/Onboarding/Register/MastodonRegisterView.swift
View File

@ -27,16 +27,19 @@ struct MastodonRegisterView: View {
.modifier(FormTextFieldModifier(validateState: viewModel.displayNameValidateState))
HStack {
Text("@")
.accessibilityHidden(true)
TextField(L10n.Scene.Register.Input.Username.placeholder.localizedCapitalized, text: $viewModel.username)
.textContentType(.username)
.autocapitalization(.none)
.disableAutocorrection(true)
.keyboardType(.asciiCapable)
.accessibilityLabel(viewModel.accessibilityLabelUsernameField)
Text("@\(viewModel.domain)")
.lineLimit(1)
.truncationMode(.middle)
.measureWidth { usernameRightViewWidth = $0 }
.frame(width: min(300.0, usernameRightViewWidth), alignment: .trailing)
.accessibilityHidden(true)
}
.modifier(FormTextFieldModifier(validateState: viewModel.usernameValidateState))
.environment(\.layoutDirection, .leftToRight) // force LTR

7
Mastodon/Scene/Onboarding/Register/MastodonRegisterViewModel.swift
View File

@ -285,3 +285,10 @@ extension MastodonRegisterViewModel {
return attributeString
}
}
extension MastodonRegisterViewModel {
var accessibilityLabelUsernameField: String {
let username = username.isEmpty ? L10n.Scene.Register.Input.Username.placeholder : username
return "@\(username)@\(domain)"
}
}