From 2c56d9fcb240eb5e53822741b41fab30e147c8c3 Mon Sep 17 00:00:00 2001 From: aitorarana Date: Fri, 19 Dec 2025 12:43:03 +0100 Subject: [PATCH] Fix merge conflicts --- .../new_password/new_password_screen.dart | 2 +- .../request_recovery_screen.dart | 2 +- .../lib/src/inputs/textfields.dart | 8 +- .../lib/src/generated/i18n.dart | 76 +++++++------------ 4 files changed, 33 insertions(+), 55 deletions(-) diff --git a/modules/auth/lib/src/features/recover_password/presentation/new_password/new_password_screen.dart b/modules/auth/lib/src/features/recover_password/presentation/new_password/new_password_screen.dart index ca9ffc35..43e0dcf7 100644 --- a/modules/auth/lib/src/features/recover_password/presentation/new_password/new_password_screen.dart +++ b/modules/auth/lib/src/features/recover_password/presentation/new_password/new_password_screen.dart @@ -165,7 +165,7 @@ class NewPasswordScreen extends ConsumerWidget { ), Expanded(child: CustomTextField( hint: context.translate(I18n.phoneNumber), - numeric: true, + keyboardType: TextInputType.number, controller: viewModel.newPhoneNumberController, )) ] diff --git a/modules/auth/lib/src/features/recover_password/presentation/request_recovery/request_recovery_screen.dart b/modules/auth/lib/src/features/recover_password/presentation/request_recovery/request_recovery_screen.dart index 11d56d6b..b82e723c 100644 --- a/modules/auth/lib/src/features/recover_password/presentation/request_recovery/request_recovery_screen.dart +++ b/modules/auth/lib/src/features/recover_password/presentation/request_recovery/request_recovery_screen.dart @@ -69,7 +69,7 @@ class RequestRecoveryScreen extends ConsumerWidget { Expanded( child: CustomTextField( hint: context.translate(I18n.phoneNumber), - numeric: true, + keyboardType: TextInputType.number, controller: viewModel.phoneNumberController, ), ), diff --git a/packages/design_system/lib/src/inputs/textfields.dart b/packages/design_system/lib/src/inputs/textfields.dart index eacdec6f..62892a18 100644 --- a/packages/design_system/lib/src/inputs/textfields.dart +++ b/packages/design_system/lib/src/inputs/textfields.dart @@ -48,10 +48,10 @@ class CustomTextField extends StatelessWidget { ), ), TextFormField( - onFieldSubmitted: widget.onSubmitted, - textInputAction: widget.textInputAction, - controller: widget.controller, - keyboardType: widget.keyboardType, + onFieldSubmitted: onSubmitted, + textInputAction: textInputAction, + controller: controller, + keyboardType: keyboardType, obscureText: !(showPassword ?? true), enableSuggestions: (showPassword ?? true), autocorrect: !(showPassword ?? true), diff --git a/packages/sf_localizations/lib/src/generated/i18n.dart b/packages/sf_localizations/lib/src/generated/i18n.dart index 57fd3b8a..67cdf5d7 100755 --- a/packages/sf_localizations/lib/src/generated/i18n.dart +++ b/packages/sf_localizations/lib/src/generated/i18n.dart @@ -35,53 +35,31 @@ class I18n { static const String apple = "apple"; static const String dontHaveAccount = "dontHaveAccount"; static const String createOneNow = "createOneNow"; - static const example = 'example'; - static const onboardingTitle1 = 'onboardingTitle1'; - static const onboardingSubtitle1 = 'onboardingSubtitle1'; - static const onboardingTitle2 = 'onboardingTitle2'; - static const onboardingSubtitle2 = 'onboardingSubtitle2'; - static const onboardingTitle3 = 'onboardingTitle3'; - static const onboardingSubtitle3 = 'onboardingSubtitle3'; - static const start = 'start'; - static const next = 'next'; - static const skip = 'skip'; - static const linkPhoneTitle = 'linkPhoneTitle'; - static const linkPhoneSubtitle = 'linkPhoneSubtitle'; - static const mobilePhone = 'mobilePhone'; - static const phoneNumber = 'phoneNumber'; - static const selectYourCountry = 'selectYourCountry'; - static const errorMessagePhoneIsEmpty = 'errorMessagePhoneIsEmpty'; - static const connect = 'connect'; - static const verificationCodeSentTo = 'verificationCodeSentTo'; - static const enterCodeHere = 'enterCodeHere'; - static const enter = 'enter'; - static const didNotReceiveIt = 'didNotReceiveIt'; - static const tryAgain = 'tryAgain'; - static const recoverPasswordTitle = 'recoverPasswordTitle'; - static const recoverPasswordSubtitle = 'recoverPasswordSubtitle'; - static const send = 'send'; - static const back = 'back'; - static const email = 'email'; - static const errorMessageContactIsEmpty = 'errorMessageContactIsEmpty'; - static const emailSent = 'emailSent'; - static const smsSent = 'smsSent'; - static const checkEmail1 = 'checkEmail1'; - static const checkSms1 = 'checkSms1'; - static const checkEmail2 = 'checkEmail2'; - static const checkSms2 = 'checkSms2'; - static const resendEmail = 'resendEmail'; - static const resendSms = 'resendSms'; - static const continueKey = 'continueKey'; - static const newPassword = 'newPassword'; - static const repeatPassword = 'repeatPassword'; - static const passwordLength = 'passwordLength'; - static const passwordCapital = 'passwordCapital'; - static const passwordNumber = 'passwordNumber'; - static const passwordSpecial = 'passwordSpecial'; - static const accept = 'accept'; - static const errorMessageUnequalPasswords = 'errorMessageUnequalPasswords'; - static const errorMessagePasswordTooShort = 'errorMessagePasswordTooShort'; - static const errorMessagePasswordNoCapitals = 'errorMessagePasswordNoCapitals'; - static const errorMessagePasswordNoNumbers = 'errorMessagePasswordNoNumbers'; - static const errorMessagePasswordNoSpecialChars = 'errorMessagePasswordNoSpecialChars'; + static const String recoverPasswordTitle = 'recoverPasswordTitle'; + static const String recoverPasswordSubtitle = 'recoverPasswordSubtitle'; + static const String send = 'send'; + static const String back = 'back'; + static const String email = 'email'; + static const String errorMessageContactIsEmpty = 'errorMessageContactIsEmpty'; + static const String emailSent = 'emailSent'; + static const String smsSent = 'smsSent'; + static const String checkEmail1 = 'checkEmail1'; + static const String checkSms1 = 'checkSms1'; + static const String checkEmail2 = 'checkEmail2'; + static const String checkSms2 = 'checkSms2'; + static const String resendEmail = 'resendEmail'; + static const String resendSms = 'resendSms'; + static const String continueKey = 'continueKey'; + static const String newPassword = 'newPassword'; + static const String repeatPassword = 'repeatPassword'; + static const String passwordLength = 'passwordLength'; + static const String passwordCapital = 'passwordCapital'; + static const String passwordNumber = 'passwordNumber'; + static const String passwordSpecial = 'passwordSpecial'; + static const String accept = 'accept'; + static const String errorMessageUnequalPasswords = 'errorMessageUnequalPasswords'; + static const String errorMessagePasswordTooShort = 'errorMessagePasswordTooShort'; + static const String errorMessagePasswordNoCapitals = 'errorMessagePasswordNoCapitals'; + static const String errorMessagePasswordNoNumbers = 'errorMessagePasswordNoNumbers'; + static const String errorMessagePasswordNoSpecialChars = 'errorMessagePasswordNoSpecialChars'; }