Validation message arabic Translated

lib/l10n/intl_ar.arb

@@ -98,7 +98,7 @@
   "failed_to_update_password": "",
   "password_update_successfully": "تم تحديث كلمة المرور بنجاح.",
   "new_password_not_same_as_old": "كلمة المرور الجديدة يجب ألا تكون نفس كلمة المرور القديمة",
-  "password_between_8_to_40": "يجب أن تتراوح كلمة المرور بين 8 و64 حرفًا",
+  "password_between_8_to_40": "يجب أن تتراوح كلمة المرور بين 8 و40 حرفًا",
   "new_password_required": "كلمة المرور الجديدة مطلوبة",
   "old_password_is_required": "كلمة المرور القديمة مطلوبة",
   "confirm_password_is_required": "تأكيد كلمة المرور مطلوب",

lib/l10n/intl_en.arb

@@ -99,7 +99,7 @@
   "failed_to_update_password": "",
   "password_update_successfully": "Password updated successfully.",
   "new_password_not_same_as_old": "New password must not be the same as the old password",
-  "password_between_8_to_40": "Password must be between 8 and 64 characters",
+  "password_between_8_to_40": "Password must be between 8 and 40 characters",
   "new_password_required": "New password is required",
   "old_password_is_required": "Old password is required",
   "confirm_password_is_required": "Confirm password is required",

lib/presentation/Screens/auth_verification/create_new_pw.dart

@@ -220,14 +220,7 @@ class _CreateNewPwState extends ConsumerState<CreateNewPw> {
               children: [
                 GestureDetector(
                   onTap: () {
-
+                    context.pop();
-                    if (widget.keyParam == 'editProfile') {
-                      context.go('/editProfile');
-                    }else
-                    {
-                      context.go('/profile/${widget.userId}');
-                    }
-
                   },
                   child: Container(
                     margin: EdgeInsets.only(top: 10,left: 1,bottom: 16,right: 1), // Add margin for positioning
@@ -249,7 +242,13 @@ class _CreateNewPwState extends ConsumerState<CreateNewPw> {
                       pathColorWhenOn: Colors.grey.shade300,
                       pathColorWhenOff: Colors.grey.shade300,
                       onTap: () {
+                        final formState = _formKey.currentState;
                         ref.read(localeProvider.notifier).toggleLocale();
+                        Future.delayed(Duration(milliseconds: 100), () {
+                          if (formState?.validate() == false) {
+                            formState?.validate();
+                          }
+                        });
                       },
                     );
                   },
@@ -658,7 +657,7 @@ class _CreateNewPwState extends ConsumerState<CreateNewPw> {
           SizedBox(height: 10),
           ElevatedButton(
             onPressed: () async {
-              context.go('/');
+              context.go('/login');
             },
             style: ButtonStyle(
               shape: WidgetStatePropertyAll(
@@ -697,6 +696,14 @@ class _CreateNewPwState extends ConsumerState<CreateNewPw> {
                     'Login',
                     'تسجيل الدخول',
                   ),
+                  style:  TextStyle(
+                    fontFamily: context.translate(
+                      'Roboto',
+                      'Roboto',
+                    ),
+                    fontSize: 17,
+                    fontWeight: FontWeight.w500,
+                  ),
                 ),
                 6.horizontalSpace,
                 const Icon(Icons.chevron_right_outlined,color:Colors.white),

lib/presentation/Screens/auth_verification/registration.dart

@@ -7,12 +7,13 @@ import 'package:go_router/go_router.dart';
 import 'package:pocketbase/pocketbase.dart';
 import 'package:uae_stat/config/my_theme.dart';
 import 'package:uae_stat/domain/use_cases/language.dart';
+import 'package:uae_stat/infrastructure/services/img_asset_paths/banner_asset_path.dart';
 import 'package:uae_stat/infrastructure/services/img_asset_paths/icons/misc_icon_asset_path.dart';
 import 'package:uae_stat/presentation/Screens/profilepage.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
-import '../../components/my_toggle.dart';
+import 'package:uae_stat/presentation/components/my_toggle.dart';
 import '../../routes/auth_routes/login_route.dart';
 
 class RegisterScreen extends ConsumerStatefulWidget {
@@ -120,10 +121,10 @@ class _RegisterScreenState extends ConsumerState<RegisterScreen> {
     if (value == null || value.isEmpty) {
       return context.translate('Required', 'مطلوب');
     } else if (value.length > 40) {
-      return 'Must not exceed 40 characters';
+      return AppLocalizations.of(context)!.only40charac;
     } else if (!RegExp(r"^[a-zA-Z0-9'\-\u0627\u0639~\u00C0-\u00FF]+$")
         .hasMatch(value)) {
-      return 'Invalid Characters';
+      return AppLocalizations.of(context)!.invalid_characters;
     }
     return null;
   }
@@ -138,7 +139,7 @@ class _RegisterScreenState extends ConsumerState<RegisterScreen> {
     if (value == null || value.isEmpty) {
       return context.translate('Required', 'مطلوب');
     } else if (!RegExp(emailRegex).hasMatch(value)) {
-      return 'Invalid Email';
+      return AppLocalizations.of(context)!.invalid_email;
     }
     return null;
   }
@@ -157,38 +158,38 @@ class _RegisterScreenState extends ConsumerState<RegisterScreen> {
     if (value == null || value.isEmpty) {
       return context.translate('Required', 'مطلوب');
     } else if (value.length < 8) {
-      return 'Password must be at least 8characters';
+      return AppLocalizations.of(context)!.only8charac;
     }
 
     // Check the length constraint
-    if (value.length < 8 || value.length > 64) {
+    if (value.length < 8 || value.length > 40) {
-      return 'Password must be between 8 and 64 characters';
+      return AppLocalizations.of(context)!.password_between_8_to_40;
     }
 
     // Check the regular expression
     if (!regex.hasMatch(value)) {
-      return 'Password contains invalid characters';
+      return AppLocalizations.of(context)!.password_invalid;
     }
 
     // Track missing constraints
     List<String> missingConstraints = [];
 
     if (!hasUppercase.hasMatch(value)) {
-      missingConstraints.add('uppercase letter');
+      missingConstraints.add(context.translate('uppercase letter','حرف كبير'));
     }
     if (!hasLowercase.hasMatch(value)) {
-      missingConstraints.add('lowercase letter');
+      missingConstraints.add(context.translate('lowercase letter','حرف صغير'));
     }
     if (!hasDigit.hasMatch(value)) {
-      missingConstraints.add('numeric digit');
+      missingConstraints.add(context.translate('numeric digit','رقم'));
     }
     if (!hasSpecialCharacter.hasMatch(value)) {
-      missingConstraints.add('special character');
+      missingConstraints.add(context.translate('special character','رمز خاص'));
     }
 
     // If there are missing constraints, return a consolidated message
     if (missingConstraints.isNotEmpty) {
-      return 'At least one ${missingConstraints.join(', ')}';
+      return context.translate('At least one ${missingConstraints.join(', ')}','${missingConstraints.join(', ')}على الأقل واحد ');
     }
 
     _password = value; // Store the password for confirm password validation
@@ -203,11 +204,12 @@ class _RegisterScreenState extends ConsumerState<RegisterScreen> {
     if (value == null || value.isEmpty) {
       return context.translate('Required', 'مطلوب');
     } else if (value.length < 8 || value.length > 40) {
-      return 'Password must be at least 8characters';
+      return AppLocalizations.of(context)!.password_between_8_to_40;
     } else if (!regex.hasMatch(value)) {
-      return 'Password contains invalid characters';
+      return AppLocalizations.of(context)!.password_invalid;
     } else if (value != _password) {
-      return 'Passwords do not match';
+      return AppLocalizations.of(context)!.password_match;
+      ;
     }
 
     return null;
@@ -261,7 +263,7 @@ class _RegisterScreenState extends ConsumerState<RegisterScreen> {
           // Check if the error is due to an invalid or already used email
           if (e
               .toString()
-              .contains('The email is invalid or already in use.')) {
+              .contains(AppLocalizations.of(context)!.email_invalid)) {
             showDialog(
               context: context,
               builder: (context) {
@@ -321,6 +323,11 @@ class _RegisterScreenState extends ConsumerState<RegisterScreen> {
     }
   }
 
+  final fcscBanner = Image.asset(
+    BannerAssetPath.fcsc,
+    height: 40,
+  );
+
   @override
   Widget build(BuildContext context) {
     double screenheight = MediaQuery.of(context).size.height;
@@ -376,7 +383,13 @@ class _RegisterScreenState extends ConsumerState<RegisterScreen> {
                           pathColorWhenOn: Colors.grey.shade300,
                           pathColorWhenOff: Colors.grey.shade300,
                           onTap: () {
+                            final formState = _formKey.currentState;
                             ref.read(localeProvider.notifier).toggleLocale();
+                            Future.delayed(Duration(milliseconds: 100), () {
+                              if (formState?.validate() == false) {
+                                formState?.validate();
+                              }
+                            });
                           },
                         );
                       },
@@ -1224,17 +1237,19 @@ class _RegisterScreenState extends ConsumerState<RegisterScreen> {
                             height: 10,
                           ),
                           Center(
-                              child: Container(
+                              // child: Container(
-                                height: screenheight / 16,
+                              //   height: screenheight / 16,
-                                width: screenwidth / 3,
+                              //   width: screenwidth / 3,
-                                decoration: BoxDecoration(
+                              //   decoration: BoxDecoration(
-                                  image: DecorationImage(
+                              //     image: DecorationImage(
-                                    image: AssetImage(
+                              //       image: AssetImage(
-                                        "assets/splash_screen/logo.png"), // Background image asset
+                              //           "assets/splash_screen/logo.png"), // Background image asset
-                                    fit: BoxFit.fill,
+                              //       fit: BoxFit.fill,
-                                  ),
+                              //     ),
-                                ),
+                              //   ),
-                              )),
+                              // )
+                            child: fcscBanner,
+                          ),
                           SizedBox(
                             height: 20,
                           ),

lib/presentation/Screens/profilepage.dart

@@ -273,7 +273,7 @@ class _ProfileScreenState extends ConsumerState<ProfileScreen> {
   // Function to validate the DOB field
   String? _validateDob(String? value) {
     if (value == null || value.isEmpty) {
-      return 'Required';
+      return context.translate('Required', 'مطلوب');
     }
 
     final DateTime selectedDate = _selectedDate!;
@@ -281,14 +281,14 @@ class _ProfileScreenState extends ConsumerState<ProfileScreen> {
 
     // Check if the selected date is in the future
     if (selectedDate.isAfter(today)) {
-      return 'Date of birth cannot be in the future';
+      return context.translate('Date of birth cannot be in the future','لا يمكن أن يكون تاريخ الميلاد في المستقبل');
     }
     return null;
   }
 
   String? _validateDropdown(String? value) {
     if (value == null || value.isEmpty) {
-      return 'Required';
+      return context.translate('Required', 'مطلوب');
     }
     return null;
   }
@@ -657,7 +657,7 @@ class _ProfileScreenState extends ConsumerState<ProfileScreen> {
                       enabled: true,
                       validator: (value) {
                         if (value == null || value.isEmpty) {
-                          return 'Required';
+                          return context.translate('Required', 'مطلوب');
                         }
 
                         //RegExp(r"^[a-zA-Z\s]+$");
@@ -665,7 +665,7 @@ class _ProfileScreenState extends ConsumerState<ProfileScreen> {
                             r"^[a-zA-Z0-9'\-\u0627\u0639~\u00C0-\u00FF\s]+$");
 
                         if (!nameRegex.hasMatch(value)) {
-                          return 'Invalid Characters';
+                          return AppLocalizations.of(context)!.invalid_characters;
                         }
                         return null;
                       },
@@ -912,7 +912,7 @@ class _ProfileScreenState extends ConsumerState<ProfileScreen> {
                           Padding(
                             padding: const EdgeInsets.only(left: 10.0),
                             child: Text(
-                              'Required',
+                             context.translate('Required', 'مطلوب'),
                               style: TextStyle(
                                 color: Color(0xFFb22222),
                                 fontSize: 12,
@@ -928,7 +928,7 @@ class _ProfileScreenState extends ConsumerState<ProfileScreen> {
                           final userId = widget.userId;
                           final email = _emailController.text;
 
-                          context.go('/createNewPw/$userId/$email');
+                          context.push('/createNewPw/$userId/$email');
                         },
                         child: Text(
                           AppLocalizations.of(context)!.change_password,

lib/presentation/routes/auth_routes/login_route.dart

@@ -24,6 +24,8 @@ import 'package:uae_stat/presentation/routes/bottom_bar_routes/tab_routes/home_r
 import 'package:http/http.dart' as http;
 import '../../Screens/auth_verification/registration.dart';
 import 'package:pocketbase/pocketbase.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
 
 import '../../components/indicators/locale_provider.dart';
 import '../../components/my_toggle.dart';
@@ -451,7 +453,7 @@ class LoginRoute extends HookConsumerWidget {
                   ),
                   fontSize: locale?.languageCode == 'ar' ? 12: 18,
                   fontWeight: FontWeight.w500,
-                )
+                ),
             ),
             6.horizontalSpace,
             const Icon(
@@ -473,10 +475,14 @@ class LoginRoute extends HookConsumerWidget {
             ),
 
             validator: (value) {
+              final emailRegex =
+                  r'^[a-zA-Z0-9àèìòùÀÈÌÒÙéàç~!#$%^&*()_+=-{}|;,.?<>]+@[a-zA-Z0-9àèìòùÀÈÌÒÙéàç~!#$%^&*()_+=-{}|;,.?<>]+\.[a-zA-Z]{2,}$';
               if (value == null || value.isEmpty) {
                 return context.translate('Required', 'مطلوب');
               }
-              return FieldValidator.email()(value);
+              else if (!RegExp(emailRegex).hasMatch(value)) {
+                return AppLocalizations.of(context)!.invalid_email;
+              } return null;
             },
             imgPath: MiscIconAssetPath.person,
             controller: emailCtl,
@@ -487,7 +493,7 @@ class LoginRoute extends HookConsumerWidget {
               if (text == null || text.isEmpty) {
                 return context.translate('Required', 'مطلوب');
               } else if (text.length < 8) {
-                return 'The password must be at least 8 characters';
+                return AppLocalizations.of(context)!.only8charac;
               }
               return FieldValidator.password(minLength: 8)(text);
             },
@@ -668,7 +674,13 @@ class LoginRoute extends HookConsumerWidget {
                       pathColorWhenOn: Colors.grey.shade300,
                       pathColorWhenOff: Colors.grey.shade300,
                       onTap: () {
+                        final formState = formKey.currentState;
                         ref.read(localeProvider.notifier).toggleLocale();
+                        Future.delayed(Duration(milliseconds: 100), () {
+                          if (formState?.validate() == false) {
+                            formState?.validate();
+                          }
+                        });
                       },
                     ),
                   ),

lib/presentation/routes/drawer_routes/Drawer Items/bookmark.dart

@@ -140,90 +140,96 @@ class _BookMarkState extends ConsumerState<BookMark> {
   }
 
   /// Show confirmation dialog before removing bookmark
-  // void showRemoveBookmarkDialog(id) {
+  void showRemoveBookmarkDialog(id) {
-  //   double myheight = MediaQuery.of(context).size.height;
+    double myheight = MediaQuery.of(context).size.height;
-  //   showDialog(
+    showDialog(
-  //     context: context,
+      context: context,
-  //     barrierDismissible: false, // User must tap button to dismiss dialog
+      barrierDismissible: false, // User must tap button to dismiss dialog
-  //     builder: (context) => AlertDialog(
+      builder: (context) => AlertDialog(
-  //       shape: RoundedRectangleBorder(
+        shape: RoundedRectangleBorder(
-  //         borderRadius: BorderRadius.circular(5.0), // Rounded corners
+          borderRadius: BorderRadius.circular(5.0), // Rounded corners
-  //       ),
+        ),
-  //       contentPadding: EdgeInsets.zero,
+        contentPadding: EdgeInsets.zero,
-  //       content: Stack(
+        content: Stack(
-  //         children: [
+          children: [
-  //           Padding(
+            Padding(
-  //             padding: const EdgeInsets.all(10.0),
+              padding: const EdgeInsets.all(10.0),
-  //             child: Column(
+              child: Column(
-  //               mainAxisSize: MainAxisSize.min,
+                mainAxisSize: MainAxisSize.min,
-  //               children: [
+                children: [
-  //                 SizedBox(
+                  SizedBox(
-  //                   height: myheight / 30,
+                    height: myheight / 30,
-  //                 ),
+                  ),
-  //                 Text(
+                  Text(
-  //                   context.translate(
+                    context.translate(
-  //                       'Are you sure you want to remove this bookmark?',
+                        'Are you sure you want to remove this bookmark?',
-  //                       'هل أنت متأكد أنك تريد إزالة هذه الإشارة المرجعية؟'),
+                        'هل أنت متأكد أنك تريد إزالة هذه الإشارة المرجعية؟'),
-  //                   textAlign: TextAlign.center,
+                    textAlign: TextAlign.center,
-  //                   style: TextStyle(
+                    style: TextStyle(
-  //                     fontSize: 18,
+                      fontSize: 18,
-  //                     color: Color(0xFF898C81),
+                      color: Color(0xFF898C81),
-  //                   ),
+                    ),
-  //                 )
+                  )
-  //               ],
+                ],
-  //             ),
+              ),
-  //           ),
+            ),
-  //         ],
+          ],
-  //       ),
+        ),
-  //       actions: [
+        actions: [
-  //         SizedBox(height: 20),
+          SizedBox(height: 20),
-  //         SizedBox(
+          Row(
-  //           width: 100, // Set the desired width
+            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-  //           child: TextButton(
+            children: [
-  //             onPressed: () => Navigator.pop(context),
+              SizedBox(
-  //             style: TextButton.styleFrom(
+                width: 100, // Set the desired width
-  //               shape: RoundedRectangleBorder(
+                child: TextButton(
-  //                 borderRadius: BorderRadius.circular(
+                  onPressed: () => Navigator.pop(context),
-  //                     10.0), // Adjust the radius as needed
+                  style: TextButton.styleFrom(
-  //               ),
+                    shape: RoundedRectangleBorder(
-  //               side: BorderSide(
+                      borderRadius: BorderRadius.circular(
-  //                 color: Color(0xFFAA8E83), // Set the outline color
+                          10.0), // Adjust the radius as needed
-  //                 width: 1, // Set the border width
+                    ),
-  //               ),
+                    side: BorderSide(
-  //             ),
+                      color: Color(0xFFAA8E83), // Set the outline color
-  //             child: Text(
+                      width: 1, // Set the border width
-  //               context.translate('No', 'لا'),
+                    ),
-  //               style: TextStyle(
+                  ),
-  //                 color: Color(0xFFAA8E83),
+                  child: Text(
-  //                 fontSize: 16,
+                    context.translate('No', 'لا'),
-  //               ),
+                    style: TextStyle(
-  //             ),
+                      color: Color(0xFFAA8E83),
-  //           ),
+                      fontSize: 16,
-  //         ),
+                    ),
-  //         SizedBox(
+                  ),
-  //           width: 100, // Set the desired width
+                ),
-  //           child: TextButton(
+              ),
-  //             onPressed: () {
+              SizedBox(
-  //               Navigator.pop(context);
+                width: 100, // Set the desired width
-  //               removeBookmark(id); // Close dialog
+                child: TextButton(
-  //             },
+                  onPressed: () {
-  //             style: TextButton.styleFrom(
+                    Navigator.pop(context);
-  //               backgroundColor: Color(0xFFAA8E83), // Set background color
+                    removeBookmark(id); // Close dialog
-  //               foregroundColor: Colors.white,
+                  },
-  //               shape: RoundedRectangleBorder(
+                  style: TextButton.styleFrom(
-  //                 borderRadius: BorderRadius.circular(10.0), // Set text color
+                    backgroundColor: Color(0xFFAA8E83), // Set background color
-  //               ),
+                    foregroundColor: Colors.white,
-  //             ),
+                    shape: RoundedRectangleBorder(
-  //             child: Text(
+                      borderRadius: BorderRadius.circular(10.0), // Set text color
-  //               context.translate('Yes', 'نعم'),
+                    ),
-  //               style: TextStyle(color: Colors.white, fontSize: 16),
+                  ),
-  //             ),
+                  child: Text(
-  //           ),
+                    context.translate('Yes', 'نعم'),
-  //         ),
+                    style: TextStyle(color: Colors.white, fontSize: 16),
-  //       ],
+                  ),
-  //     ),
+                ),
-  //   );
+              ),
-  // }
+            ],
+          )
+
+        ],
+      ),
+    );
+  }
 
   String colorToHex(Color color) {
     return '0xFF${color.red.toRadixString(16).padLeft(2, '0').toUpperCase()}'
@@ -322,19 +328,31 @@ class _BookMarkState extends ConsumerState<BookMark> {
                           ),
                         ),
                       ),
+                      // GestureDetector(
+                      //   onTap: () {
+                      //     debugPrint("Icon clicked in: ${data['title']}");
+                      //     removeBookmark(data['id']);
+                      //     ScaffoldMessenger.of(context).showSnackBar(
+                      //       SnackBar(
+                      //         content: Text(
+                      //           'The bookmark is removed successfully',
+                      //         ),
+                      //         backgroundColor: Colors.green,
+                      //         duration: Duration(seconds: 2),
+                      //       ),
+                      //     );
+                      //   },
+                      //   child: const Icon(
+                      //     Icons.delete,
+                      //     color: Colors.black,
+                      //     size: 20,
+                      //   ),
+                      // ),
+
                       GestureDetector(
                         onTap: () {
                           debugPrint("Icon clicked in: ${data['title']}");
-                          removeBookmark(data['id']);
+                          showRemoveBookmarkDialog(data['id']);
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            SnackBar(
-                              content: Text(
-                                'The bookmark is removed successfully',
-                              ),
-                              backgroundColor: Colors.green,
-                              duration: Duration(seconds: 2),
-                            ),
-                          );
                         },
                         child: const Icon(
                           Icons.bookmarks_rounded,
@@ -342,18 +360,6 @@ class _BookMarkState extends ConsumerState<BookMark> {
                           size: 20,
                         ),
                       ),
-
-                      // GestureDetector(
-                      //   onTap: () {
-                      //     debugPrint("Icon clicked in: ${data['title']}");
-                      //     // showRemoveBookmarkDialog(data['id']);
-                      //   },
-                      //   child: const Icon(
-                      //     Icons.bookmarks_rounded,
-                      //     color: Colors.black,
-                      //     size: 20,
-                      //   ),
-                      // ),
                     ],
                   ),
                   Text(

lib/presentation/routes/drawer_routes/Drawer Items/edit_profile.dart

@@ -13,6 +13,7 @@ import 'package:pocketbase/pocketbase.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:uae_stat/config/my_theme.dart';
+import 'package:uae_stat/domain/use_cases/language.dart';
 import 'package:uae_stat/infrastructure/services/img_asset_paths/icons/misc_icon_asset_path.dart';
 import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
 
@@ -298,7 +299,7 @@ class _EditProfileState extends State<EditProfile> {
   // Function to validate the DOB field
   String? _validateDob(String? value) {
     if (value == null || value.isEmpty) {
-      return 'Required';
+      return context.translate('Required', 'مطلوب');
     }
 
     final DateTime selectedDate = _selectedDate!;
@@ -306,14 +307,14 @@ class _EditProfileState extends State<EditProfile> {
 
     // Check if the selected date is in the future
     if (selectedDate.isAfter(today)) {
-      return 'Date of birth cannot be in the future';
+      return context.translate('Date of birth cannot be in the future','لا يمكن أن يكون تاريخ الميلاد في المستقبل');
     }
     return null;
   }
 
   String? _validateDropdown(String? value) {
     if (value == null || value.isEmpty) {
-      return 'Required';
+      return context.translate('Required', 'مطلوب');
     }
     return null;
   }
@@ -689,7 +690,7 @@ class _EditProfileState extends State<EditProfile> {
                                     enabled: false,
                                     validator: (value) {
                                       if (value == null || value.isEmpty) {
-                                        return 'Required';
+                                        return context.translate('Required', 'مطلوب');
                                       }
 
                                       //RegExp(r"^[a-zA-Z\s]+$");
@@ -697,7 +698,7 @@ class _EditProfileState extends State<EditProfile> {
                                         r"^[a-zA-Z0-9'\-\u0627\u0639~\u00C0-\u00FF\s]+$",
                                       );
                                       if (!nameRegex.hasMatch(value)) {
-                                        return 'Invalid Characters';
+                                        return AppLocalizations.of(context)!.invalid_characters;
                                       }
                                       return null;
                                     },
@@ -956,7 +957,7 @@ class _EditProfileState extends State<EditProfile> {
                                     child: GestureDetector(
                                       onTap: () {
                                         final email = _emailController.text;
-                                        context.go(
+                                        context.push(
                                             '/createNewPw/$userId/$email?key=editProfile');
                                       },
                                       child: Text(

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/AboutTheApp/AboutFCSC.dart

@@ -3,18 +3,11 @@ import 'package:uae_stat/domain/use_cases/language.dart';
 
 import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
 
-import 'package:uae_stat/infrastructure/services/img_asset_paths/banner_asset_path.dart';
-
 class aboutFCSC extends StatelessWidget {
   const aboutFCSC({super.key});
 
   @override
   Widget build(BuildContext context) {
-    final fcscBanner = Image.asset(
-      BannerAssetPath.fcsc,
-      height: 56,
-      alignment: Alignment.center,
-    );
     return BaseScaffold(
       showDivider: true,
       showBackButton: true,
@@ -86,15 +79,10 @@ class aboutFCSC extends StatelessWidget {
                 ],
               ),
             ),
-            SizedBox(height: MediaQuery.of(context).size.height*0.15),
-            Align(
-              alignment: Alignment.bottomCenter,
-              child: fcscBanner,
-            ),
             SizedBox(
-              height: 25,
+              height: 20,
             ),
-          ]),
+          ],),
         ),
       ),
     );

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/AboutTheApp/getStarted.dart

@@ -3,18 +3,12 @@ import 'package:uae_stat/domain/use_cases/language.dart';
 
 import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
 
-import 'package:uae_stat/infrastructure/services/img_asset_paths/banner_asset_path.dart';
 
 class GetStarted extends StatelessWidget {
   const GetStarted({super.key});
 
   @override
   Widget build(BuildContext context) {
-    final fcscBanner = Image.asset(
-      BannerAssetPath.fcsc,
-      height: 56,
-      alignment: Alignment.center,
-    );
     return Theme(
       data: ThemeData(
         fontFamily: 'Roboto', // Set default font family for this page
@@ -84,12 +78,7 @@ class GetStarted extends StatelessWidget {
                 SizedBox(
                   height:MediaQuery.of(context).size.height * 0.12,
                 ),
-                Align(
+                SizedBox(height: 20,),
-                  alignment: Alignment.bottomCenter,
-                  child: fcscBanner,
-                ),
-                SizedBox(height: 25,),
-
               ],
             ),
           ),

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/AppFeatures.dart

@@ -6,11 +6,7 @@ import '../../../custom_drawer_routes.dart';
 
 class AppFeatures extends StatelessWidget {
   AppFeatures({super.key});
-  final fcscBanner = Image.asset(
+
-    BannerAssetPath.fcsc,
-    height: 56,
-    alignment: Alignment.center,
-  );
   @override
   Widget build(BuildContext context) {
     return Theme(
@@ -205,12 +201,7 @@ class AppFeatures extends StatelessWidget {
                     ],
                   ),
                 ),
-                SizedBox(height: 25,),
+                SizedBox(height: 20,),
-                Align(
-                  alignment: Alignment.bottomCenter,
-                  child: fcscBanner,
-                ),
-                SizedBox(height: 25,),
               ],
             ),
           ),

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/ChangeMyPassword.dart

@@ -1,16 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:uae_stat/domain/use_cases/language.dart';
-
+import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
-import '../../../../../../infrastructure/services/img_asset_paths/banner_asset_path.dart';
-import '../../../custom_drawer_routes.dart';
 
 class ChangeMyPassword extends StatelessWidget {
-  ChangeMyPassword({super.key});
+  const ChangeMyPassword({super.key});
-  final fcscBanner = Image.asset(
-    BannerAssetPath.fcsc,
-    height: 56,
-    alignment: Alignment.center,
-  );
   @override
   Widget build(BuildContext context) {
     return Theme(
@@ -116,7 +109,7 @@ class ChangeMyPassword extends StatelessWidget {
                                     style: TextStyle(
                                         fontWeight: FontWeight.w600,
                                         color: Color(0xFF414042),
-                                        fontFamily: 'Roboto'
+                                        fontFamily: 'Roboto',
                                     ),),
                                   TextSpan(text:context.translate(
                                   ' link at the bottom.',
@@ -295,9 +288,9 @@ class ChangeMyPassword extends StatelessWidget {
                                     style: TextStyle(
                                         fontWeight: FontWeight.w600,
                                         color: Color(0xFF414042),
-                                        fontFamily: 'Roboto'
+                                        fontFamily: 'Roboto',
                                     ),),
-                                  TextSpan(text: context.translate('button',''),)
+                                  TextSpan(text: context.translate('button',''),),
                                 ],
                               ),
                             ),
@@ -360,14 +353,7 @@ class ChangeMyPassword extends StatelessWidget {
                     ],
                   ),
                 ),
-
+                SizedBox(height: 20,),
-                SizedBox(height: 25,),
-                Align(
-                  alignment: Alignment.bottomCenter,
-                  child: fcscBanner,
-                ),
-                SizedBox(height: 25,),
-
               ],
 
             ),

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/EditMyProfile.dart

@@ -1,16 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:uae_stat/domain/use_cases/language.dart';
 
-import '../../../../../../infrastructure/services/img_asset_paths/banner_asset_path.dart';
+
-import '../../../custom_drawer_routes.dart';
+import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
 
 class EditMyProfile extends StatelessWidget {
-  EditMyProfile({super.key});
+  const EditMyProfile({super.key});
-  final fcscBanner = Image.asset(
+
-    BannerAssetPath.fcsc,
-    height: 56,
-    alignment: Alignment.center,
-  );
   @override
   Widget build(BuildContext context) {
     return Theme(
@@ -457,14 +453,7 @@ class EditMyProfile extends StatelessWidget {
                     ],
                   ),
                 ),
-
+                SizedBox(height: 20,),
-                SizedBox(height: 25,),
-                Align(
-                  alignment: Alignment.bottomCenter,
-                  child: fcscBanner,
-                ),
-                SizedBox(height: 25,),
-
               ],
 
             ),

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/howUseTheApp.dart

@@ -1,16 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:uae_stat/domain/use_cases/language.dart';
 
-import '../../../../../../infrastructure/services/img_asset_paths/banner_asset_path.dart';
+
-import '../../../custom_drawer_routes.dart';
+import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
 
 class HowUseTheApp extends StatelessWidget {
-  HowUseTheApp({super.key});
+ const HowUseTheApp({super.key});
-  final fcscBanner = Image.asset(
+
-    BannerAssetPath.fcsc,
-    height: 56,
-    alignment: Alignment.center,
-  );
   @override
   Widget build(BuildContext context) {
     return Theme(
@@ -203,14 +199,7 @@ class HowUseTheApp extends StatelessWidget {
                   ],
                 ),
                 SizedBox(
-                  height: 25,
+                  height: 20,
-                ),
-                Align(
-                  alignment: Alignment.bottomCenter,
-                  child: fcscBanner,
-                ),
-                SizedBox(
-                  height: 25,
                 ),
               ],
             ),

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/purpose.dart

@@ -1,16 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:uae_stat/domain/use_cases/language.dart';
 
-import '../../../../../../infrastructure/services/img_asset_paths/banner_asset_path.dart';
+import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
-import '../../../custom_drawer_routes.dart';
 
 class Purpose extends StatelessWidget {
-  Purpose({super.key});
+  const Purpose({super.key});
-  final fcscBanner = Image.asset(
-    BannerAssetPath.fcsc,
-    height: 56,
-    alignment: Alignment.center,
-  );
   @override
   Widget build(BuildContext context) {
     return Theme(
@@ -151,14 +145,7 @@ class Purpose extends StatelessWidget {
                   ],
                 ),
                 SizedBox(
-                  height: 40,
+                  height: 20,
-                ),
-                Align(
-                  alignment: Alignment.bottomCenter,
-                  child: fcscBanner,
-                ),
-                SizedBox(
-                  height: 25,
                 ),
               ],
             ),

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/stayUpdate.dart

@@ -1,16 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:uae_stat/domain/use_cases/language.dart';
 
-import '../../../../../../infrastructure/services/img_asset_paths/banner_asset_path.dart';
+import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
-import '../../../custom_drawer_routes.dart';
 
 class StayUpdate extends StatelessWidget {
-  StayUpdate({super.key});
+ const StayUpdate({super.key});
-  final fcscBanner = Image.asset(
+
-    BannerAssetPath.fcsc,
-    height: 56,
-    alignment: Alignment.center,
-  );
   @override
   Widget build(BuildContext context) {
     return Theme(
@@ -91,14 +86,7 @@ class StayUpdate extends StatelessWidget {
                   ],
                 ),
                 SizedBox(
-                  height: 150,
+                  height: 20,
-                ),
-                Align(
-                  alignment: Alignment.bottomCenter,
-                  child: fcscBanner,
-                ),
-                SizedBox(
-                  height: 25,
                 ),
               ],
             ),

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/useTheApp.dart

@@ -1,16 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:uae_stat/domain/use_cases/language.dart';
-
+import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
-import '../../../../../../infrastructure/services/img_asset_paths/banner_asset_path.dart';
-import '../../../custom_drawer_routes.dart';
 
 class WhoUseTheApp extends StatelessWidget {
-  WhoUseTheApp({super.key});
+ const WhoUseTheApp({super.key});
-  final fcscBanner = Image.asset(
+
-    BannerAssetPath.fcsc,
-    height: 56,
-    alignment: Alignment.center,
-  );
   @override
   Widget build(BuildContext context) {
     return Theme(
@@ -141,15 +135,9 @@ class WhoUseTheApp extends StatelessWidget {
                     ),
                   ],
                 ),
+
                 SizedBox(
-                  height: 50,
+                  height: 20,
-                ),
-                Align(
-                  alignment: Alignment.bottomCenter,
-                  child: fcscBanner,
-                ),
-                SizedBox(
-                  height: 25,
                 ),
               ],
             ),

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/aboutApp.dart

@@ -3,18 +3,12 @@ import 'package:go_router/go_router.dart';
 import 'package:uae_stat/domain/use_cases/language.dart';
 import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
 
-import 'package:uae_stat/infrastructure/services/img_asset_paths/banner_asset_path.dart';
 
 class aboutTheApp extends StatelessWidget {
   const aboutTheApp({super.key});
 
   @override
   Widget build(BuildContext context) {
-    final fcscBanner = Image.asset(
-      BannerAssetPath.fcsc,
-      height: 56,
-      alignment: Alignment.center,
-    );
     return BaseScaffold(
       showDivider: true,
       showBackButton: true,
@@ -67,7 +61,7 @@ class aboutTheApp extends StatelessWidget {
                 border: Border(
                   bottom: BorderSide(
                       color: Colors.grey.shade300,
-                      width: 0.5), // Grey bottom line
+                      width: 0.5,), // Grey bottom line
                 ),
               ),
               child: ListTile(
@@ -87,17 +81,12 @@ class aboutTheApp extends StatelessWidget {
                 trailing: Icon(Icons.keyboard_arrow_right),
                 shape: Border(
                   bottom: BorderSide(
-                      color: Colors.black, width: 3), // Grey bottom line
+                      color: Colors.black, width: 3,), // Grey bottom line
                 ),
               ),
             ),
-            Spacer(),
-            Align(
-              alignment: Alignment.bottomCenter,
-              child: fcscBanner,
-            ),
             SizedBox(
-              height: 25,
+              height: 20,
             ),
           ],
         ),

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/faq_page.dart

@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:uae_stat/domain/use_cases/language.dart';
-import 'package:uae_stat/infrastructure/services/img_asset_paths/banner_asset_path.dart';
-
 import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
 
 class FAQPage extends StatefulWidget {
@@ -12,11 +10,7 @@ class FAQPage extends StatefulWidget {
 }
 
 class _FAQPageState extends State<FAQPage> {
-  final fcscBanner = Image.asset(
+
-    BannerAssetPath.fcsc,
-    height: 56,
-    alignment: Alignment.center,
-  );
   @override
   Widget build(BuildContext context) {
     return BaseScaffold(
@@ -44,14 +38,7 @@ class _FAQPageState extends State<FAQPage> {
             radius: Radius.circular(10),
             interactive: true,
             child: SingleChildScrollView(
-              child: Column(
+              child: QuestionAnswerScrollView(),
-                children: [
-                  QuestionAnswerScrollView(),
-                  SizedBox(height: 25,),
-                  fcscBanner,
-                  SizedBox(height: 25,),
-                ],
-              ),
             ),
           ),
         ),
@@ -83,24 +70,24 @@ class QuestionAnswerScrollView extends StatelessWidget {
                 text:
                     'Yes, the app is strictly for registered and approved users. To access the data:\n\n',
                 style: TextStyle(
-                    color: Colors.grey, fontSize: 16, fontFamily: 'Roboto'),
+                    color: Colors.grey, fontSize: 16, fontFamily: 'Roboto',),
               ),
               TextSpan(
                 text:
                     '  1. You need to sign up using the Register Now option on the login screen.\n',
                 style: TextStyle(
-                    color: Colors.grey, fontSize: 16, fontFamily: 'Roboto'),
+                    color: Colors.grey, fontSize: 16, fontFamily: 'Roboto',),
               ),
               TextSpan(
                 text: '  2. Your registration must be approved by the admin.\n',
                 style: TextStyle(
-                    color: Colors.grey, fontSize: 16, fontFamily: 'Roboto'),
+                    color: Colors.grey, fontSize: 16, fontFamily: 'Roboto',),
               ),
               TextSpan(
                 text:
                     "  3. Once approved, you can log in to access the app's features and datasets.\n\nGuest access is not available for this application.\n ",
                 style: TextStyle(
-                    color: Colors.grey, fontSize: 16, fontFamily: 'Roboto'),
+                    color: Colors.grey, fontSize: 16, fontFamily: 'Roboto',),
               ),
             ],
           ),
@@ -112,24 +99,24 @@ class QuestionAnswerScrollView extends StatelessWidget {
                 text:
                 'نعم، التطبيق مخصص فقط للمستخدمين المسجلين والمعتمدين. للوصول إلى البيانات:\n\n',
                 style: TextStyle(
-                    color: Colors.grey, fontSize: 16, fontFamily: 'Roboto'),
+                    color: Colors.grey, fontSize: 16, fontFamily: 'Roboto',),
               ),
               TextSpan(
                 text:
                 '  1. يجب عليك التسجيل باستخدام خيار "التسجيل الآن" في شاشة تسجيل الدخول.\n',
                 style: TextStyle(
-                    color: Colors.grey, fontSize: 16, fontFamily: 'Roboto'),
+                    color: Colors.grey, fontSize: 16, fontFamily: 'Roboto',),
               ),
               TextSpan(
                 text: '  2. يجب أن يتم الموافقة على تسجيلك من قبل المسؤول.\n',
                 style: TextStyle(
-                    color: Colors.grey, fontSize: 16, fontFamily: 'Roboto'),
+                    color: Colors.grey, fontSize: 16, fontFamily: 'Roboto',),
               ),
               TextSpan(
                 text:
-                "  بعد الموافقة، يمكنك تسجيل الدخول للوصول إلى ميزات التطبيق وبياناته.\n\n لا يتوفر الوصول للزوار في هذا التطبيق.\n",
+                '  بعد الموافقة، يمكنك تسجيل الدخول للوصول إلى ميزات التطبيق وبياناته.\n\n لا يتوفر الوصول للزوار في هذا التطبيق.\n',
                 style: TextStyle(
-                    color: Colors.grey, fontSize: 16, fontFamily: 'Roboto'),
+                    color: Colors.grey, fontSize: 16, fontFamily: 'Roboto',),
               ),
             ],
           ),
@@ -140,7 +127,7 @@ class QuestionAnswerScrollView extends StatelessWidget {
         'question-ar': 'كيف يمكنني التنقل عبر التطبيق؟',
         'answer':
             '• Use the main categories on the homepage (e.g., Economy, Environment) to access subcategories and detailed KPIs.\n• Drill down into specific metrics or graphical views by tapping on a KPI.\n• Access additional features like Bookmarks or Profile through the navigation bar.\n',
-        'answer-ar': '•استخدم الفئات الرئيسية الموجودة على الصفحة الرئيسية (مثل: الاقتصاد، البيئة) للوصول إلى الفئات الفرعية ومؤشرات الأداء الرئيسية التفصيلية •\n\ قم بالتعمق في مؤشرات معينة أو عرض الرسوم البيانية من خلال النقر على مؤشر الأداء الرئيسي (KPI). \n •  للوصول إلى ميزات إضافية مثل الإشارات المرجعية أو الملف الشخصي، استخدم شريط التنقل.\n',
+        'answer-ar': '•استخدم الفئات الرئيسية الموجودة على الصفحة الرئيسية (مثل: الاقتصاد، البيئة) للوصول إلى الفئات الفرعية ومؤشرات الأداء الرئيسية التفصيلية •\n قم بالتعمق في مؤشرات معينة أو عرض الرسوم البيانية من خلال النقر على مؤشر الأداء الرئيسي (KPI). \n •  للوصول إلى ميزات إضافية مثل الإشارات المرجعية أو الملف الشخصي، استخدم شريط التنقل.\n',
       },
       {
         'question': 'What types of data are available?',

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/features.dart

@@ -11,11 +11,7 @@ class UsingFeatures extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final fcscBanner = Image.asset(
+
-      BannerAssetPath.fcsc,
-      height: 56,
-      alignment: Alignment.center,
-    );
     return BaseScaffold(
       showDivider: true,
       showBackButton: true,
@@ -237,14 +233,6 @@ class UsingFeatures extends StatelessWidget {
                 ),
               ),
             ),
-            Spacer(),
-            Align(
-              alignment: Alignment.bottomCenter,
-              child: fcscBanner,
-            ),
-            SizedBox(
-              height: 30,
-            ),
           ],
         ),
       ),