forgot password changes

assets/langs/ar-SA.json

@@ -88,7 +88,7 @@
   "atLeastOneNumeric": "رقم واحد على الأقل",
   "minimum8Characters": "8 أحرف على الأقل",
   "doNotAddRepeatingLetters": "لا تقم بإضافة أحرف متكررة",
-  "itShouldContainSpecialCharacter": "يجب أن يحتوي على طابع خاص",
+  "itShouldContainSpecialCharacter": "يجب لا يحتوي على أحرف خاصة",
   "confirmPasswordMustMatch": "يجب أن يتطابق تأكيد كلمة المرور",
   "sms": "رسالة قصيرة",
   "fingerPrint": "بصمة",

assets/langs/en-US.json

@@ -85,7 +85,7 @@
   "atLeastOneNumeric": "At least one numeric",
   "minimum8Characters": "Minimum 8 characters",
   "doNotAddRepeatingLetters": "Do not add repeating letters",
-  "itShouldContainSpecialCharacter": "It should contain special character",
+  "itShouldContainSpecialCharacter": "It should not contain special characters",
   "confirmPasswordMustMatch": "Confirm password must match",
   "sms": "SMS",
   "fingerPrint": "Fingerprint",

lib/generated/codegen_loader.g.dart

@@ -104,7 +104,7 @@ class CodegenLoader extends AssetLoader {
     "atLeastOneNumeric": "رقم واحد على الأقل",
     "minimum8Characters": "8 أحرف على الأقل",
     "doNotAddRepeatingLetters": "لا تقم بإضافة أحرف متكررة",
-    "itShouldContainSpecialCharacter": "يجب أن يحتوي على طابع خاص",
+    "itShouldContainSpecialCharacter": "يجب لا يحتوي على أحرف خاصة",
     "confirmPasswordMustMatch": "يجب أن يتطابق تأكيد كلمة المرور",
     "sms": "رسالة قصيرة",
     "fingerPrint": "بصمة",
@@ -639,7 +639,7 @@ class CodegenLoader extends AssetLoader {
     "atLeastOneNumeric": "At least one numeric",
     "minimum8Characters": "Minimum 8 characters",
     "doNotAddRepeatingLetters": "Do not add repeating letters",
-    "itShouldContainSpecialCharacter": "It should contain special character",
+    "itShouldContainSpecialCharacter": "It should not contain special character",
     "confirmPasswordMustMatch": "Confirm password must match",
     "sms": "SMS",
     "fingerPrint": "Fingerprint",

lib/ui/login/login_screen.dart

@@ -240,7 +240,7 @@ class _LoginScreenState extends State<LoginScreen> {
             Utils.hideLoading(context);
             await Navigator.pushNamed(context, AppRoutes.newPassword, arguments: username.text);
             Navigator.pop(context);
-            Navigator.pop(context);
+            // Navigator.pop(context);
           } catch (ex) {
             print(ex);
             _pinPutController.clear();
@@ -331,10 +331,12 @@ class _LoginScreenState extends State<LoginScreen> {
                         9.height,
                         Align(
                           alignment: Alignment.centerRight,
-                          child: LocaleKeys.forgotPassword.tr().toText12(isUnderLine: true, color: MyColors.textMixColor).onPress(() {
+                          child: LocaleKeys.forgotPassword.tr().toText12(isUnderLine: true, color: MyColors.textMixColor).onPress(
-                            Navigator.pushNamed(context, AppRoutes.forgotPassword);
+                            () {
-                            // performForgotPassword();
+                              // Navigator.pushNamed(context, AppRoutes.forgotPassword);
-                          }),
+                              performForgotPassword();
+                            },
+                          ),
                         ),
                         20.height,
                         // DefaultButton(

lib/ui/login/new_password_screen.dart

@@ -102,20 +102,20 @@ class _NewPasswordScreenState extends State<NewPasswordScreen> {
               passwordConstraintsUI(LocaleKeys.minimum8Characters.tr(), password.text.length >= 8),
               8.height,
               passwordConstraintsUI(LocaleKeys.doNotAddRepeatingLetters.tr(), checkRepeatedChars(password.text)),
-              // 8.height,
+              8.height,
-              // passwordConstraintsUI(LocaleKeys.itShouldContainSpecialCharacter.tr(), checkRegEx(r'[!@#$%^&*(),.?":{}|<>]')),
+              passwordConstraintsUI(LocaleKeys.itShouldContainSpecialCharacter.tr(), checkRegEx(r'^[a-zA-Z0-9]+$')),
               8.height,
               passwordConstraintsUI(LocaleKeys.confirmPasswordMustMatch.tr(), password.text.isNotEmpty && password.text == confirmPassword.text),
             ],
           ).expanded,
           DefaultButton(
-                  LocaleKeys.update.tr(),
+            LocaleKeys.update.tr(),
-                  (!isPasswordCompliant(password.text, 8))
+            (!isPasswordCompliant(password.text, 8))
-                      ? null
+                ? null
-                      : () async {
+                : () async {
-                          setNewPassword();
+                    setNewPassword();
-                        })
+                  },
-              .insideContainer
+          ).insideContainer
         ],
       ),
     );