SaveFamily/sf-app-platform
11
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Aitor Arana
2025-12-19 12:43:03 +01:00
parent efbdae81d4
commit 2c56d9fcb2
4 changed files with 33 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/auth/lib/src/features/recover_password/presentation/new_password/new_password_screen.dart
View File

@@ -165,7 +165,7 @@ class NewPasswordScreen extends ConsumerWidget {
), ),
Expanded(child: CustomTextField( Expanded(child: CustomTextField(
hint: context.translate(I18n.phoneNumber), hint: context.translate(I18n.phoneNumber),
numeric: true, keyboardType: TextInputType.number,
controller: viewModel.newPhoneNumberController, controller: viewModel.newPhoneNumberController,
)) ))
] ]

2
modules/auth/lib/src/features/recover_password/presentation/request_recovery/request_recovery_screen.dart
View File

@@ -69,7 +69,7 @@ class RequestRecoveryScreen extends ConsumerWidget {
Expanded( Expanded(
child: CustomTextField( child: CustomTextField(
hint: context.translate(I18n.phoneNumber), hint: context.translate(I18n.phoneNumber),
numeric: true, keyboardType: TextInputType.number,
controller: viewModel.phoneNumberController, controller: viewModel.phoneNumberController,
), ),
), ),

8
packages/design_system/lib/src/inputs/textfields.dart
View File

@@ -48,10 +48,10 @@ class CustomTextField extends StatelessWidget {
), ),
), ),
TextFormField( TextFormField(
onFieldSubmitted: widget.onSubmitted, onFieldSubmitted: onSubmitted,
textInputAction: widget.textInputAction, textInputAction: textInputAction,
controller: widget.controller, controller: controller,
keyboardType: widget.keyboardType, keyboardType: keyboardType,
obscureText: !(showPassword ?? true), obscureText: !(showPassword ?? true),
enableSuggestions: (showPassword ?? true), enableSuggestions: (showPassword ?? true),
autocorrect: !(showPassword ?? true), autocorrect: !(showPassword ?? true),

76
packages/sf_localizations/lib/src/generated/i18n.dart
View File

@@ -35,53 +35,31 @@ class I18n {
static const String apple = "apple"; static const String apple = "apple";
static const String dontHaveAccount = "dontHaveAccount"; static const String dontHaveAccount = "dontHaveAccount";
static const String createOneNow = "createOneNow"; static const String createOneNow = "createOneNow";
static const example = 'example'; static const String recoverPasswordTitle = 'recoverPasswordTitle';
static const onboardingTitle1 = 'onboardingTitle1'; static const String recoverPasswordSubtitle = 'recoverPasswordSubtitle';
static const onboardingSubtitle1 = 'onboardingSubtitle1'; static const String send = 'send';
static const onboardingTitle2 = 'onboardingTitle2'; static const String back = 'back';
static const onboardingSubtitle2 = 'onboardingSubtitle2'; static const String email = 'email';
static const onboardingTitle3 = 'onboardingTitle3'; static const String errorMessageContactIsEmpty = 'errorMessageContactIsEmpty';
static const onboardingSubtitle3 = 'onboardingSubtitle3'; static const String emailSent = 'emailSent';
static const start = 'start'; static const String smsSent = 'smsSent';
static const next = 'next'; static const String checkEmail1 = 'checkEmail1';
static const skip = 'skip'; static const String checkSms1 = 'checkSms1';
static const linkPhoneTitle = 'linkPhoneTitle'; static const String checkEmail2 = 'checkEmail2';
static const linkPhoneSubtitle = 'linkPhoneSubtitle'; static const String checkSms2 = 'checkSms2';
static const mobilePhone = 'mobilePhone'; static const String resendEmail = 'resendEmail';
static const phoneNumber = 'phoneNumber'; static const String resendSms = 'resendSms';
static const selectYourCountry = 'selectYourCountry'; static const String continueKey = 'continueKey';
static const errorMessagePhoneIsEmpty = 'errorMessagePhoneIsEmpty'; static const String newPassword = 'newPassword';
static const connect = 'connect'; static const String repeatPassword = 'repeatPassword';
static const verificationCodeSentTo = 'verificationCodeSentTo'; static const String passwordLength = 'passwordLength';
static const enterCodeHere = 'enterCodeHere'; static const String passwordCapital = 'passwordCapital';
static const enter = 'enter'; static const String passwordNumber = 'passwordNumber';
static const didNotReceiveIt = 'didNotReceiveIt'; static const String passwordSpecial = 'passwordSpecial';
static const tryAgain = 'tryAgain'; static const String accept = 'accept';
static const recoverPasswordTitle = 'recoverPasswordTitle'; static const String errorMessageUnequalPasswords = 'errorMessageUnequalPasswords';
static const recoverPasswordSubtitle = 'recoverPasswordSubtitle'; static const String errorMessagePasswordTooShort = 'errorMessagePasswordTooShort';
static const send = 'send'; static const String errorMessagePasswordNoCapitals = 'errorMessagePasswordNoCapitals';
static const back = 'back'; static const String errorMessagePasswordNoNumbers = 'errorMessagePasswordNoNumbers';
static const email = 'email'; static const String errorMessagePasswordNoSpecialChars = 'errorMessagePasswordNoSpecialChars';
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';
} }