Skip to content

Commit

Permalink
Update FIDO PIN dialog UI
Browse files Browse the repository at this point in the history
  • Loading branch information
elibon99 committed Jan 22, 2025
1 parent 0866bf1 commit 8974371
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 36 deletions.
19 changes: 11 additions & 8 deletions lib/fido/views/pin_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ class _FidoPinDialogState extends ConsumerState<FidoPinDialog> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (hasPin) ...[
Text(l10n.p_enter_current_pin_or_reset_no_puk),
AppTextField(
key: currentPin,
controller: _currentPinController,
Expand All @@ -142,7 +141,7 @@ class _FidoPinDialogState extends ConsumerState<FidoPinDialog> {
: '', // Prevents dialog resizing
errorText: _currentIsWrong ? _currentPinError : null,
errorMaxLines: 3,
prefixIcon: const Icon(Symbols.pin),
icon: const Icon(Symbols.pin),
suffixIcon: IconButton(
icon: Icon(_isObscureCurrent
? Symbols.visibility
Expand Down Expand Up @@ -170,11 +169,9 @@ class _FidoPinDialogState extends ConsumerState<FidoPinDialog> {
}
},
).init(),
// Used to add more spacing
const SizedBox(height: 0),
],
Text(hasPinComplexity
? l10n.p_enter_new_fido2_pin_complexity_active(
minPinLength, maxPinLength, 2, '123456')
: l10n.p_enter_new_fido2_pin(minPinLength, maxPinLength)),
AppTextField(
key: newPin,
controller: _newPinController,
Expand All @@ -189,9 +186,15 @@ class _FidoPinDialogState extends ConsumerState<FidoPinDialog> {
border: const OutlineInputBorder(),
labelText: l10n.s_new_pin,
enabled: newPinEnabled,
helperText: hasPinComplexity
? l10n.p_new_fido2_pin_complexity_active_requirements(
minPinLength, maxPinLength, 2, '123456')
: l10n.p_new_fido2_pin_requirements(
minPinLength, maxPinLength),
helperMaxLines: 5,
errorText: _newIsWrong ? _newPinError : null,
errorMaxLines: 3,
prefixIcon: const Icon(Symbols.pin),
icon: const Icon(Symbols.pin),
suffixIcon: ExcludeFocusTraversal(
excluding: !newPinEnabled,
child: IconButton(
Expand Down Expand Up @@ -233,7 +236,7 @@ class _FidoPinDialogState extends ConsumerState<FidoPinDialog> {
decoration: AppInputDecoration(
border: const OutlineInputBorder(),
labelText: l10n.s_confirm_pin,
prefixIcon: const Icon(Symbols.pin),
icon: const Icon(Symbols.pin),
suffixIcon: ExcludeFocusTraversal(
excluding: !confirmPinEnabled,
child: IconButton(
Expand Down
8 changes: 4 additions & 4 deletions lib/l10n/app_de.arb
Original file line number Diff line number Diff line change
Expand Up @@ -311,15 +311,15 @@
"p_enter_current_pin_or_reset": "Gib deine aktuelle PIN ein. Falls du die PIN nicht kennst, musst du sie mit der PUK entsperren oder deinen YubiKey zurücksetzen.",
"p_enter_current_pin_or_reset_no_puk": "Gib deine aktuelle PIN ein. Falls du die PIN nicht kennst, musst du deinen YubiKey zurücksetzen.",
"p_enter_current_puk_or_reset": "Gib deine aktuelle PUK ein. Wenn du die PUK nicht kennst, musst du deinen YubiKey zurücksetzen.",
"p_enter_new_fido2_pin": "Gib deine neue PIN ein. Sie muss aus {min_length}-{max_length} Zeichen bestehen und kann Buchstaben, Ziffern und Sonderzeichen enthalten.",
"@p_enter_new_fido2_pin": {
"p_new_fido2_pin_requirements": null,
"@p_new_fido2_pin_requirements": {
"placeholders": {
"min_length": {},
"max_length": {}
}
},
"p_enter_new_fido2_pin_complexity_active": "Gib deine neue PIN ein. Sie muss aus {min_length}-{max_length} Zeichen bestehen, muss mindestens {unique_characters} unterschiedliche Zeichen enthalten und darf keine triviale PIN wie z.B. \"{common_pin}\" sein. Deine PIN kann Buchstaben, Ziffern und Sonderzeichen enthalten.",
"@p_enter_new_fido2_pin_complexity_active": {
"p_new_fido2_pin_complexity_active_requirements": null,
"@p_new_fido2_pin_complexity_active_requirements": {
"placeholders": {
"min_length": {},
"max_length": {},
Expand Down
8 changes: 4 additions & 4 deletions lib/l10n/app_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -311,15 +311,15 @@
"p_enter_current_pin_or_reset": "Enter your current PIN. If you don't know your PIN, you'll need to unblock it with the PUK or reset the YubiKey.",
"p_enter_current_pin_or_reset_no_puk": "Enter your current PIN. If you don't know your PIN, you'll need to reset the YubiKey.",
"p_enter_current_puk_or_reset": "Enter your current PUK. If you don't know your PUK, you'll need to reset the YubiKey.",
"p_enter_new_fido2_pin": "Enter your new PIN. A PIN must be {min_length}-{max_length} characters long and may contain letters, numbers and special characters.",
"@p_enter_new_fido2_pin": {
"p_new_fido2_pin_requirements": "A PIN must be {min_length}-{max_length} characters long and may contain letters, numbers and special characters.",
"@p_new_fido2_pin_requirements": {
"placeholders": {
"min_length": {},
"max_length": {}
}
},
"p_enter_new_fido2_pin_complexity_active": "Enter your new PIN. A PIN must be {min_length}-{max_length} characters long, contain at least {unique_characters} unique characters, and not be a commonly used PIN, like \"{common_pin}\". It may contain letters, numbers, and special characters.",
"@p_enter_new_fido2_pin_complexity_active": {
"p_new_fido2_pin_complexity_active_requirements": "A PIN must be {min_length}-{max_length} characters long, contain at least {unique_characters} unique characters, and not be a commonly used PIN, like \"{common_pin}\". It may contain letters, numbers, and special characters.",
"@p_new_fido2_pin_complexity_active_requirements": {
"placeholders": {
"min_length": {},
"max_length": {},
Expand Down
8 changes: 4 additions & 4 deletions lib/l10n/app_fr.arb
Original file line number Diff line number Diff line change
Expand Up @@ -311,15 +311,15 @@
"p_enter_current_pin_or_reset": "Saisissez votre PIN actuel. Vous ne connaissez pas votre PIN\u00a0? Débloquez-le avec le PUK ou réinitialisez la YubiKey.",
"p_enter_current_pin_or_reset_no_puk": "Saisissez votre PIN actuel. Vous ne connaissez pas votre PIN\u00a0? Réinitialisez la YubiKey.",
"p_enter_current_puk_or_reset": "Saisissez votre PUK actuel. Vous ne connaissez pas votre PUK\u00a0? Réinitialisez la YubiKey.",
"p_enter_new_fido2_pin": "Saisissez votre nouveau code PIN. Le code PIN doit être composé de {min_length}-{max_length} caractères et peut contenir des lettres, des chiffres et des caractères spéciaux.",
"@p_enter_new_fido2_pin": {
"p_new_fido2_pin_requirements": null,
"@p_new_fido2_pin_requirements": {
"placeholders": {
"min_length": {},
"max_length": {}
}
},
"p_enter_new_fido2_pin_complexity_active": "Saisissez votre nouveau code PIN. Le code PIN doit être composé de {min_length}-{max_length} caractères, contenir au moins {unique_characters} caractères uniques et ne pas être un code PIN couramment utilisé, comme \"{common_pin}\". Il peut contenir des lettres, des chiffres et des caractères spéciaux.",
"@p_enter_new_fido2_pin_complexity_active": {
"p_new_fido2_pin_complexity_active_requirements": null,
"@p_new_fido2_pin_complexity_active_requirements": {
"placeholders": {
"min_length": {},
"max_length": {},
Expand Down
8 changes: 4 additions & 4 deletions lib/l10n/app_ja.arb
Original file line number Diff line number Diff line change
Expand Up @@ -311,15 +311,15 @@
"p_enter_current_pin_or_reset": "現在のPINを入力してください。PINがわからない場合は、PUKでブロックを解除するか、YubiKeyをリセットする必要があります。",
"p_enter_current_pin_or_reset_no_puk": "現在のPINを入力してください。PINがわからない場合は、YubiKeyをリセットする必要があります。",
"p_enter_current_puk_or_reset": "現在のPUKを入力してください。PUKがわからない場合は、YubiKeyをリセットする必要があります。",
"p_enter_new_fido2_pin": "新しい PIN を入力してください。PIN は {min_length}-{max_length} 文字で、英数字と特殊文字を使用できます。",
"@p_enter_new_fido2_pin": {
"p_new_fido2_pin_requirements": null,
"@p_new_fido2_pin_requirements": {
"placeholders": {
"min_length": {},
"max_length": {}
}
},
"p_enter_new_fido2_pin_complexity_active": "新しいPINを入力してください。PINは {min_length}-{max_length} 文字で、少なくとも {unique_characters} のユニークな文字を含み、\"{common_pin}\"のような一般的に使用されているPINであってはなりません。文字、数字、特殊文字を含むことができます。",
"@p_enter_new_fido2_pin_complexity_active": {
"p_new_fido2_pin_complexity_active_requirements": null,
"@p_new_fido2_pin_complexity_active_requirements": {
"placeholders": {
"min_length": {},
"max_length": {},
Expand Down
8 changes: 4 additions & 4 deletions lib/l10n/app_pl.arb
Original file line number Diff line number Diff line change
Expand Up @@ -311,15 +311,15 @@
"p_enter_current_pin_or_reset": "Wpisz obecny kod PIN. Jeśli go nie pamiętasz, zresetuj klucz YubiKey lub odblokuj go za pomocą kodu PUK.",
"p_enter_current_pin_or_reset_no_puk": "Wpisz obecny kod PIN. Jeśli go nie pamiętasz, zresetuj klucz YubiKey.",
"p_enter_current_puk_or_reset": "Wpisz obecny kod PUK. Jeśli go nie pamiętasz, zresetuj klucz YubiKey.",
"p_enter_new_fido2_pin": "Wprowadź nowy kod PIN. Kod PIN musi mieć długość {min_length}-{max_length} znaków i może zawierać litery, cyfry i znaki specjalne.",
"@p_enter_new_fido2_pin": {
"p_new_fido2_pin_requirements": null,
"@p_new_fido2_pin_requirements": {
"placeholders": {
"min_length": {},
"max_length": {}
}
},
"p_enter_new_fido2_pin_complexity_active": "Wprowadź nowy kod PIN. Kod PIN musi mieć długość {min_length}-{max_length} znaków, zawierać co najmniej {unique_characters} unikalnych znaków i nie może być powszechnie używanym kodem PIN, takim jak \"{common_pin}\". Może zawierać litery, cyfry i znaki specjalne.",
"@p_enter_new_fido2_pin_complexity_active": {
"p_new_fido2_pin_complexity_active_requirements": null,
"@p_new_fido2_pin_complexity_active_requirements": {
"placeholders": {
"min_length": {},
"max_length": {},
Expand Down
8 changes: 4 additions & 4 deletions lib/l10n/app_sk.arb
Original file line number Diff line number Diff line change
Expand Up @@ -311,15 +311,15 @@
"p_enter_current_pin_or_reset": "Zadajte svoj aktuálny PIN kód. Ak nepoznáte svoj PIN, musíte ho odblokovať pomocou PUK alebo obnoviť YubiKey.",
"p_enter_current_pin_or_reset_no_puk": "Zadajte svoj aktuálny PIN kód. Ak nepoznáte svoj PIN kód, budete musieť YubiKey obnoviť.",
"p_enter_current_puk_or_reset": "Zadajte svoj aktuálny PUK. Ak svoj PUK nepoznáte, budete musieť YubiKey obnoviť.",
"p_enter_new_fido2_pin": "Zadajte nový PIN kód. PIN musí mať dĺžku {min_length}-{max_length} znakov a môže obsahovať písmená, číslice a špeciálne znaky.",
"@p_enter_new_fido2_pin": {
"p_new_fido2_pin_requirements": null,
"@p_new_fido2_pin_requirements": {
"placeholders": {
"min_length": {},
"max_length": {}
}
},
"p_enter_new_fido2_pin_complexity_active": "Zadajte nový PIN kód. PIN musí mať dĺžku {min_length}-{max_length} znakov, musí obsahovať aspoň {unique_characters} jedinečných znakov a nesmie to byť bežne používaný PIN, ako napríklad „{common_pin}“. Môže obsahovať písmená, číslice a špeciálne znaky.",
"@p_enter_new_fido2_pin_complexity_active": {
"p_new_fido2_pin_complexity_active_requirements": null,
"@p_new_fido2_pin_complexity_active_requirements": {
"placeholders": {
"min_length": {},
"max_length": {},
Expand Down
8 changes: 4 additions & 4 deletions lib/l10n/app_vi.arb
Original file line number Diff line number Diff line change
Expand Up @@ -311,15 +311,15 @@
"p_enter_current_pin_or_reset": "Nhập Mã PIN hiện tại của bạn. Nếu bạn không biết Mã PIN, bạn sẽ cần phải mở khóa bằng Mã PUK hoặc khôi phục cài đặt gốc YubiKey.",
"p_enter_current_pin_or_reset_no_puk": "Nhập Mã PIN hiện tại của bạn. Nếu bạn không biết Mã PIN, bạn sẽ cần phải khôi phục cài đặt gốc YubiKey.",
"p_enter_current_puk_or_reset": "Nhập Mã PUK hiện tại của bạn. Nếu bạn không biết Mã PUK, bạn sẽ cần phải khôi phục cài đặt gốc YubiKey.",
"p_enter_new_fido2_pin": "Nhập Mã PIN mới của bạn. Mã PIN phải có độ dài từ {min_length} đến {max_length} ký tự và có thể chứa chữ cái, số và ký tự đặc biệt.",
"@p_enter_new_fido2_pin": {
"p_new_fido2_pin_requirements": null,
"@p_new_fido2_pin_requirements": {
"placeholders": {
"min_length": {},
"max_length": {}
}
},
"p_enter_new_fido2_pin_complexity_active": "Nhập Mã PIN mới của bạn. Mã PIN phải có độ dài từ {min_length} đến {max_length} ký tự, chứa ít nhất {unique_characters} ký tự độc đáo, và không phải là Mã PIN thường dùng, như \"{common_pin}\". Nó có thể chứa chữ cái, số và ký tự đặc biệt.",
"@p_enter_new_fido2_pin_complexity_active": {
"p_new_fido2_pin_complexity_active_requirements": null,
"@p_new_fido2_pin_complexity_active_requirements": {
"placeholders": {
"min_length": {},
"max_length": {},
Expand Down

0 comments on commit 8974371

Please sign in to comment.