assets/langs/ar-SA.json

@@ -817,12 +817,14 @@
   "news": "أخبار",
   "ready": "جاهز",
   "enterValidNationalId": "الرجاء إدخال رقم الهوية الوطنية أو رقم الملف الصحيح",
-  "enterValidPhoneNumber": "الرجاء إدخال رقم هاتف صالح"
+  "enterValidPhoneNumber": "الرجاء إدخال رقم هاتف صالح",
   "medicalCentersWithCount": "{count} مراكز طبية",
   "medicalCenters": "مراكز طبية",
   "hospitalsWithCount": "{count} مستشفيات",
   "selectRegion": "اختر المنطقة",
   "selectFacility": "اختر المرافق",
   "selectFacilitiesSubTitle": "يرجى اختيار المرفق للموعد",
-  "selectHospitalSubTitle": "يرجى اختيار المستشفى للموعد"
+  "selectHospitalSubTitle": "يرجى اختيار المستشفى للموعد",
+  "iAcceptThe" : "أوافق على",
+  "personalDetailsVerification": "التحقق من التفاصيل الشخصية",
 }

assets/langs/en-US.json

@@ -819,6 +819,9 @@
   "selectRegion": "Select Region",
   "selectFacility": "Select Facilities",
   "selectFacilitiesSubTitle": "Please select the facility for the appointment",
-  "selectHospitalSubTitle": "Please select the hospital for the appointment"
+  "selectHospitalSubTitle": "Please select the hospital for the appointment",
+  "news": "News",
+  "iAcceptThe" : "I Accept the",
+  "personalDetailsVerification": "Personal Details Verification"
 
 }

lib/core/api_consts.dart

@@ -723,7 +723,7 @@ const DEACTIVATE_ACCOUNT = 'Services/Patients.svc/REST/PatientAppleActivation_In
 class ApiConsts {
   static const maxSmallScreen = 660;
 
-  static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.uat;
+  static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.prod;
 
   // static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT
 

lib/core/app_state.dart

@@ -62,7 +62,7 @@ class AppState {
 
   SelectDeviceByImeiRespModelElement? _selectDeviceByImeiRespModelElement;
 
-  void setSelectDeviceByImeiRespModelElement(SelectDeviceByImeiRespModelElement value) {
+  void setSelectDeviceByImeiRespModelElement(SelectDeviceByImeiRespModelElement? value) {
     _selectDeviceByImeiRespModelElement = value;
   }
 

lib/extensions/string_extensions.dart

@@ -221,10 +221,15 @@ extension EmailValidator on String {
         style: TextStyle(height: 23 / 24, color: color ?? AppColors.blackColor, fontSize: 24.fSize, letterSpacing: -1, fontWeight: isBold ? FontWeight.bold : FontWeight.normal),
       );
 
-  Widget toText26({Color? color, bool isBold = false, double? height, bool isCenter = false}) => Text(
+  Widget toText26({Color? color, bool isBold = false, double? height, bool isCenter = false, FontWeight? weight, double? letterSpacing}) => Text(
         this,
         textAlign: isCenter ? TextAlign.center : null,
-        style: TextStyle(height: height ?? 23 / 26, color: color ?? AppColors.blackColor, fontSize: 26.fSize, letterSpacing: -1, fontWeight: isBold ? FontWeight.bold : FontWeight.normal),
+        style: TextStyle(
+            height: height ?? 23 / 26,
+            color: color ?? AppColors.blackColor,
+            fontSize: 26.fSize,
+            letterSpacing: letterSpacing ?? -1,
+            fontWeight: weight ?? (isBold ? FontWeight.bold : FontWeight.normal)),
       );
 
   Widget toText28({Color? color, bool isBold = false, double? height, bool isCenter = false}) => Text(

lib/features/authentication/authentication_view_model.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 import 'dart:developer';
+import 'dart:io';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/services.dart' show rootBundle;
 import 'package:flutter/material.dart';
@@ -36,6 +37,7 @@ import 'package:hmg_patient_app_new/services/localauth_service.dart';
 import 'package:hmg_patient_app_new/services/navigation_service.dart';
 import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart';
 import 'package:hmg_patient_app_new/widgets/bottomsheet/exception_bottom_sheet.dart';
+import 'package:sms_otp_auto_verify/sms_otp_auto_verify.dart';
 
 import 'models/request_models/get_user_mobile_device_data.dart';
 import 'models/request_models/insert_patient_mobile_deviceinfo.dart';
@@ -80,6 +82,8 @@ class AuthenticationViewModel extends ChangeNotifier {
   CalenderEnum calenderType = CalenderEnum.gregorian;
   LoginTypeEnum loginTypeEnum = LoginTypeEnum.sms;
 
+  final ValueNotifier<bool> otpScreenNotifier = ValueNotifier<bool>(false);
+
   //==================
 
   String errorMsg = '';
@@ -159,6 +163,10 @@ class AuthenticationViewModel extends ChangeNotifier {
     notifyListeners();
   }
 
+  void clearEmailInput() {
+    emailController.text = "";
+  }
+
   void onUAEUserCountrySelection(String? value) {
     pickedCountryByUAEUser = countriesList!.firstWhere((element) => element.name == value);
     notifyListeners();
@@ -355,7 +363,7 @@ class AuthenticationViewModel extends ChangeNotifier {
     );
 
     // TODO: GET APP SMS SIGNATURE HERE
-    request.sMSSignature = "enKTDcqbOVd";
+    request.sMSSignature =await getSignature();
 
     if (checkIsUserComingForRegister(request: payload)) {
       _appState.setUserRegistrationPayload = RegistrationDataModelPayload.fromJson(payload);
@@ -394,12 +402,8 @@ class AuthenticationViewModel extends ChangeNotifier {
     return isUserComingForRegister;
   }
 
-  Future<void> checkActivationCode({
-    required String? activationCode,
-    required OTPTypeEnum otpTypeEnum,
-    required Function(String? message) onWrongActivationCode,
-    Function()? onResendActivation,
-  }) async {
+  Future<void> checkActivationCode(
+      {required String? activationCode, required OTPTypeEnum otpTypeEnum, required Function(String? message) onWrongActivationCode, Function()? onResendActivation}) async {
     bool isForRegister = (_appState.getUserRegistrationPayload.healthId != null || _appState.getUserRegistrationPayload.patientOutSa == true || _appState.getUserRegistrationPayload.patientOutSa == 1);
 
     final request = RequestUtils.getCommonRequestWelcome(
@@ -422,6 +426,7 @@ class AuthenticationViewModel extends ChangeNotifier {
             countryCode: _appState.getSelectDeviceByImeiRespModelElement != null && _appState.getSelectDeviceByImeiRespModelElement!.outSa == true
                 ? CountryEnum.unitedArabEmirates.countryCode
                 : selectedCountrySignup.countryCode,
+            //TODO: Error Here IN Zip Code.
             loginType: loginTypeEnum.toInt)
         .toJson();
     LoaderBottomSheet.showLoader();
@@ -469,6 +474,7 @@ class AuthenticationViewModel extends ChangeNotifier {
               failure: failure,
               onUnHandledFailure: (failure) async {
                 LoaderBottomSheet.hideLoader();
+                otpScreenNotifier.value = true;
                 await _dialogService.showCommonBottomSheetWithoutH(message: failure.message, label: LocaleKeys.notice.tr(), onOkPressed: () {});
               },
               onMessageStatusFailure: (failure) async {
@@ -595,6 +601,7 @@ class AuthenticationViewModel extends ChangeNotifier {
   }
 
   Future<void> onWrongActivationCode({String? message}) async {
+    otpScreenNotifier.value = true;
     await _dialogService.showErrorBottomSheet(message: message ?? "Something went wrong. ", onOkPressed: () {});
   }
 
@@ -675,21 +682,27 @@ class AuthenticationViewModel extends ChangeNotifier {
   }
 
   Future<void> onRegistrationComplete() async {
-    LoaderBottomSheet.showLoader();
+    // LoaderBottomSheet.showLoader();
+    LoadingUtils.showFullScreenLoader(loadingText: "Setting up your medical file.\nMay take a moment.");
+
     var request = RequestUtils.getUserSignupCompletionRequest(fullName: nameController.text, emailAddress: emailController.text, gender: genderType, maritalStatus: maritalStatus);
     final resultEither = await _authenticationRepo.registerUser(registrationPayloadDataModelRequest: request);
     resultEither.fold((failure) async => await _errorHandlerService.handleError(failure: failure), (apiResponse) async {
       if (apiResponse.data is String) {
         //TODO: This Section Need to Be Testing.
+        LoadingUtils.hideFullScreenLoader();
         _dialogService.showExceptionBottomSheet(message: apiResponse.data, onOkPressed: () {}, onCancelPressed: () {});
         //TODO: Here We Need to Show a Dialog Of Something in the case of Fail With OK and Cancel and the Display Variable WIll be result.
       } else {
-        print(apiResponse.data as Map<String, dynamic>);
+        LoadingUtils.hideFullScreenLoader();
         if (apiResponse.data["MessageStatus"] == 1) {
-          LoaderBottomSheet.hideLoader();
+          LoadingUtils.showFullScreenLoader(isSuccessDialog: true);
           //TODO: Here We Need to Show a Dialog Of Something in the case of Success.
           await clearDefaultInputValues(); // This will Clear All Default Values Of User.
-          _navigationService.pushAndReplace(AppRoutes.loginScreen);
+          Future.delayed(Duration(seconds: 1), () {
+            LoadingUtils.hideFullScreenLoader();
+            _navigationService.pushAndReplace(AppRoutes.loginScreen);
+          });
         }
       }
     });
@@ -737,6 +750,8 @@ class AuthenticationViewModel extends ChangeNotifier {
     } else {
       //TODO: Here Hide Loader And Show TOAST
       //TODO: if (response['ErrorCode'] == '-986') Toast With OK, And Show response as Output.
+      LoaderBottomSheet.hideLoader();
+      _dialogService.showErrorBottomSheet(message: response['ErrorMessage']);
     }
   }
 
@@ -922,4 +937,12 @@ class AuthenticationViewModel extends ChangeNotifier {
       },
     );
   }
+  Future<String?> getSignature() async {
+    if (Platform.isAndroid) {
+      return await SmsVerification.getAppSignature();
+    } else {
+      return null;
+    }
+  }
+
 }

lib/features/authentication/widgets/otp_verification_screen.dart

@@ -7,8 +7,11 @@ import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';
 import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
 import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
+import 'package:hmg_patient_app_new/features/authentication/authentication_view_model.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
 import 'package:hmg_patient_app_new/widgets/appbar/app_bar_widget.dart';
+import 'package:sms_otp_auto_verify/sms_otp_auto_verify.dart';
+import 'package:provider/provider.dart';
 
 typedef OnDone = void Function(String text);
 
@@ -90,6 +93,7 @@ class OTPWidgetState extends State<OTPWidget> with SingleTickerProviderStateMixi
   int currentIndex = 0;
   List<String> strList = [];
   bool hasFocus = false;
+  AuthenticationViewModel? authVm;
 
   @override
   void didUpdateWidget(OTPWidget oldWidget) {
@@ -124,6 +128,7 @@ class OTPWidgetState extends State<OTPWidget> with SingleTickerProviderStateMixi
   @override
   void initState() {
     super.initState();
+    authVm = context.read<AuthenticationViewModel>();
     focusNode = widget.focusNode ?? FocusNode();
     _highlightAnimationController = AnimationController(vsync: this);
     _initTextController();
@@ -132,12 +137,15 @@ class OTPWidgetState extends State<OTPWidget> with SingleTickerProviderStateMixi
       widget.controller!.addListener(_controllerListener);
     }
     focusNode.addListener(_focusListener);
+    authVm?.otpScreenNotifier.addListener(_onOtpScreenNotifierChanged);
   }
 
   void _controllerListener() {
     if (mounted == true) {
       setState(() {
         _initTextController();
+        text = widget.controller?.text ?? "";
+        currentIndex = text.length;
       });
       var onTextChanged = widget.onTextChanged;
       if (onTextChanged != null) {
@@ -154,6 +162,41 @@ class OTPWidgetState extends State<OTPWidget> with SingleTickerProviderStateMixi
     }
   }
 
+  void onWrongOtpClear() {
+    if (mounted) {
+      setState(() {
+        text = "";
+        currentIndex = 0;
+        strList.clear();
+        _calculateStrList();
+      });
+
+      // Clear the controller if it exists
+      if (widget.controller != null) {
+        widget.controller!.clear();
+      }
+
+      // Remove focus from the input
+      if (focusNode.hasFocus) {
+        focusNode.unfocus();
+      }
+
+      // Optionally refocus after a short delay to allow user to re-enter OTP
+      Future.delayed(const Duration(milliseconds: 100), () {
+        if (mounted && widget.autoFocus) {
+          FocusScope.of(context).requestFocus(focusNode);
+        }
+      });
+    }
+  }
+
+  void _onOtpScreenNotifierChanged() {
+    if (authVm?.otpScreenNotifier.value == true) {
+      onWrongOtpClear();
+      authVm?.otpScreenNotifier.value = false;
+    }
+  }
+
   void _initTextController() {
     if (widget.controller == null) {
       return;
@@ -304,19 +347,17 @@ class OTPWidgetState extends State<OTPWidget> with SingleTickerProviderStateMixi
     );
   }
 
-
   Widget _buildPinCode(int i, BuildContext context) {
     Color pinBoxColor;
 
     if (widget.hasError) {
       pinBoxColor = widget.errorBorderColor;
     } else if (text.length == widget.maxLength) {
-      // Check for completion first, before individual box logic
       pinBoxColor = AppColors.successColor;
     } else if (i < text.length) {
-      pinBoxColor = AppColors.blackBgColor; // Custom color for filled boxes
+      pinBoxColor = AppColors.blackBgColor;
     } else {
-      pinBoxColor = widget.pinBoxColor; // Default white color
+      pinBoxColor = widget.pinBoxColor;
     }
 
     EdgeInsets insets;
@@ -355,7 +396,6 @@ class OTPWidgetState extends State<OTPWidget> with SingleTickerProviderStateMixi
     );
   }
 
-
   // Widget _buildPinCode(int i, BuildContext context) {
   //   Color pinBoxColor = widget.pinBoxColor;
   //
@@ -455,13 +495,14 @@ class _OTPVerificationScreenState extends State<OTPVerificationScreen> {
   Timer? _resendTimer;
   int _resendTime = 120;
   bool _isOtpComplete = false;
-  bool _isVerifying = false; // Flag to prevent multiple verification calls
+  bool _isVerifying = false;
 
   @override
   void initState() {
     super.initState();
     _otpController = TextEditingController();
     _startResendTimer();
+    checkSignature();
   }
 
   @override
@@ -495,6 +536,30 @@ class _OTPVerificationScreenState extends State<OTPVerificationScreen> {
     }
   }
 
+  void checkSignature() async {
+    SmsVerification.startListeningSms().then((message) {
+      final intRegex = RegExp(r'\d+', multiLine: true);
+      var otp = SmsVerification.getCode(message, intRegex);
+      if (otp != null && otp.length == _otpLength) {
+        autoFillOtp(otp); // Use autoFillOtp to update controller and UI
+      }
+      SmsVerification.stopListening();
+    });
+  }
+
+  void _onAutoOtpChanged(String value) {
+    setState(() {
+      _isOtpComplete = value.length == _otpLength;
+    });
+
+    if (_isOtpComplete && !_isVerifying) {
+      _isVerifying = true;
+      _verifyOtp(value);
+    } else if (!_isOtpComplete) {
+      _isVerifying = false;
+    }
+  }
+
   void _resendOtp() {
     if (_resendTime == 0) {
       setState(() {
@@ -504,7 +569,6 @@ class _OTPVerificationScreenState extends State<OTPVerificationScreen> {
       });
       _otpController.clear();
       _startResendTimer();
-      // autoFillOtp("1234");
       widget.onResendOTPPressed(widget.phoneNumber);
     }
   }
@@ -618,5 +682,7 @@ class _OTPVerificationScreenState extends State<OTPVerificationScreen> {
     if (otp.length != _otpLength) return;
     _isVerifying = false;
     _otpController.text = otp;
+    setState(() {});
+    _onOtpChanged(otp); // Ensure verification and color update
   }
 }

lib/generated/locale_keys.g.dart

@@ -812,6 +812,7 @@ abstract class  LocaleKeys {
   static const notNow = 'notNow';
   static const pendingActivation = 'pendingActivation';
   static const awaitingApproval = 'awaitingApproval';
+  static const news = 'news';
   static const ready = 'ready';
   static const enterValidNationalId = 'enterValidNationalId';
   static const enterValidPhoneNumber = 'enterValidPhoneNumber';
@@ -822,6 +823,7 @@ abstract class  LocaleKeys {
   static const selectFacility = 'selectFacility';
   static const selectFacilitiesSubTitle = 'selectFacilitiesSubTitle';
   static const selectHospitalSubTitle = 'selectHospitalSubTitle';
+  static const iAcceptThe = 'iAcceptThe';
+  static const personalDetailsVerification = 'personalDetailsVerification';
 
-  static const news = 'news';
 }

lib/presentation/authentication/login.dart

@@ -4,6 +4,8 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:hmg_patient_app_new/core/app_assets.dart';
+import 'package:hmg_patient_app_new/core/app_state.dart';
+import 'package:hmg_patient_app_new/core/dependencies.dart';
 import 'package:hmg_patient_app_new/core/enums.dart';
 import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
 import 'package:hmg_patient_app_new/core/utils/utils.dart';
@@ -153,6 +155,7 @@ class LoginScreenState extends State<LoginScreen> {
     required TextEditingController? phoneNumberController,
     required AuthenticationViewModel authViewModel,
   }) {
+    AppState appState = getIt<AppState>();
     context.showBottomSheet(
         isScrollControlled: true,
         isDismissible: false,
@@ -180,6 +183,8 @@ class LoginScreenState extends State<LoginScreen> {
                             onOkPress: () {
                               Navigator.of(context).pop();
                             })) {
+                          Navigator.of(context).pop();
+                          appState.setSelectDeviceByImeiRespModelElement(null);
                           await authViewModel.checkUserAuthentication(otpTypeEnum: OTPTypeEnum.sms);
                         }
                       },
@@ -209,6 +214,8 @@ class LoginScreenState extends State<LoginScreen> {
                             onOkPress: () {
                               Navigator.of(context).pop();
                             })) {
+                          Navigator.of(context).pop();
+                          appState.setSelectDeviceByImeiRespModelElement(null);
                           await authViewModel.checkUserAuthentication(otpTypeEnum: OTPTypeEnum.whatsapp);
                         }
                       },

lib/presentation/authentication/register.dart

@@ -2,6 +2,8 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:hmg_patient_app_new/core/app_assets.dart';
+import 'package:hmg_patient_app_new/core/app_state.dart';
+import 'package:hmg_patient_app_new/core/dependencies.dart';
 import 'package:hmg_patient_app_new/core/enums.dart';
 import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
 import 'package:hmg_patient_app_new/core/utils/utils.dart';
@@ -152,12 +154,36 @@ class _RegisterNew extends State<RegisterNew> {
                             },
                           ),
                           SizedBox(width: 12.h),
-                          Expanded(
-                            child: Text(
-                              LocaleKeys.iAcceptTermsConditions.tr(),
-                              style: context.dynamicTextStyle(fontSize: 14.fSize, fontWeight: FontWeight.w500, color: Color(0xFF2E3039)),
-                            ),
+                          Row(
+                            children: [
+                              Text(
+                                LocaleKeys.iAcceptThe.tr(),
+                                style: context.dynamicTextStyle(fontSize: 14.fSize, fontWeight: FontWeight.w500, color: Color(0xFF2E3039)),
+                              ),
+                              GestureDetector(
+                                onTap: () {
+                                  // Navigate to terms and conditions page
+                                  Navigator.of(context).pushNamed('/terms');
+                                },
+                                child: Text(
+                                  LocaleKeys.termsConditoins.tr(),
+                                  style: context.dynamicTextStyle(
+                                    fontSize: 14.fSize,
+                                    fontWeight: FontWeight.w500,
+                                    color: AppColors.primaryRedColor,
+                                    decoration: TextDecoration.underline,
+                                    decorationColor: AppColors.primaryRedBorderColor,
+                                  ),
+                                ),
+                              ),
+                            ],
                           ),
+                          // Expanded(
+                          //   child: Text(
+                          //     LocaleKeys.iAcceptTermsConditions.tr().split("the").first,
+                          //     style: context.dynamicTextStyle(fontSize: 14.fSize, fontWeight: FontWeight.w500, color: Color(0xFF2E3039)),
+                          //   ),
+                          // ),
                         ],
                       ),
                     ),
@@ -224,6 +250,7 @@ class _RegisterNew extends State<RegisterNew> {
   }
 
   void showRegisterModel({required BuildContext context, required AuthenticationViewModel authVM}) {
+    AppState appState = getIt.get<AppState>();
     showModalBottomSheet(
       context: context,
       isScrollControlled: true,
@@ -235,7 +262,7 @@ class _RegisterNew extends State<RegisterNew> {
         child: SingleChildScrollView(
           child: GenericBottomSheet(
             countryCode: authVM.selectedCountrySignup.countryCode,
-            initialPhoneNumber: "",
+            initialPhoneNumber: authVM.phoneNumberController.text,
             textController: authVM.phoneNumberController,
             isEnableCountryDropdown: false,
             onCountryChange: authVM.onCountryChange,
@@ -256,6 +283,7 @@ class _RegisterNew extends State<RegisterNew> {
                         Navigator.of(context).pop();
                       },
                     )) {
+                      appState.setSelectDeviceByImeiRespModelElement(null);
                       await authVM.onRegistrationStart(otpTypeEnum: OTPTypeEnum.sms);
                     }
                   },
@@ -280,15 +308,14 @@ class _RegisterNew extends State<RegisterNew> {
                 child: CustomButton(
                   text: LocaleKeys.sendOTPWHATSAPP.tr(),
                   onPressed: () async {
-                    // Dismiss keyboard before validation
                     FocusScope.of(context).unfocus();
-
                     if (ValidationUtils.isValidatePhone(
                       phoneNumber: authVM.phoneNumberController.text,
                       onOkPress: () {
                         Navigator.of(context).pop();
                       },
                     )) {
+                      appState.setSelectDeviceByImeiRespModelElement(null);
                       await authVM.onRegistrationStart(otpTypeEnum: OTPTypeEnum.whatsapp);
                     }
                   },

lib/presentation/authentication/register_step2.dart

@@ -44,20 +44,24 @@ class _RegisterNew extends State<RegisterNewStep2> {
   Widget build(BuildContext context) {
     AppState appState = getIt.get<AppState>();
     return Scaffold(
+      backgroundColor: AppColors.bgScaffoldColor,
       appBar: CustomAppBar(
         onBackPressed: () {
           Navigator.of(context).pop();
           // authVM!.clearDefaultInputValues();
+          authVM!.clearEmailInput();
         },
         onLanguageChanged: (lang) {},
         hideLogoAndLang: true,
       ),
       body: SingleChildScrollView(
         reverse: false,
-        padding: EdgeInsets.only(left: 24.h, right: 24.h, top: 24.h),
+        padding: EdgeInsets.only(left: 24.h, right: 24.h, top: 0.h),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: <Widget>[
+            LocaleKeys.personalDetailsVerification.tr().toText26(color: AppColors.textColor, weight: FontWeight.w600, letterSpacing: -2),
+            SizedBox(height: 24.h),
             Directionality(
               textDirection: Directionality.of(context),
               child: Container(
@@ -66,18 +70,20 @@ class _RegisterNew extends State<RegisterNewStep2> {
                 child: Column(
                   children: [
                     TextInputWidget(
-                            labelText: authVM!.isUserFromUAE() ? LocaleKeys.fullName.tr() : LocaleKeys.name.tr(),
-                            hintText: authVM!.isUserFromUAE() ? LocaleKeys.enterNameHere.tr() : ("${appState.getNHICUserData.firstNameEn!.toUpperCase()} ${appState.getNHICUserData.lastNameEn!.toUpperCase()}"),
-                            controller: authVM!.isUserFromUAE() ? authVM!.nameController : null,
-                            isEnable: true,
-                            prefix: null,
-                            isAllowRadius: false,
-                            isBorderAllowed: false,
-                            keyboardType: TextInputType.text,
-                            isAllowLeadingIcon: true,
-                            isReadOnly: authVM!.isUserFromUAE() ? false : true,
-                            leadingIcon: AppAssets.user_circle)
-                        .paddingSymmetrical(0.h, 16.h),
+                      labelText: authVM!.isUserFromUAE() ? LocaleKeys.fullName.tr() : LocaleKeys.name.tr(),
+                      hintText:
+                          authVM!.isUserFromUAE() ? LocaleKeys.enterNameHere.tr() : ("${appState.getNHICUserData.firstNameEn!.toUpperCase()} ${appState.getNHICUserData.lastNameEn!.toUpperCase()}"),
+                      controller: authVM!.isUserFromUAE() ? authVM!.nameController : null,
+                      isEnable: true,
+                      prefix: null,
+                      isAllowRadius: false,
+                      isBorderAllowed: false,
+                      keyboardType: TextInputType.text,
+                      isAllowLeadingIcon: true,
+                      isReadOnly: authVM!.isUserFromUAE() ? false : true,
+                      leadingIcon: AppAssets.user_circle,
+                      labelColor: AppColors.textColor,
+                    ).paddingSymmetrical(0.h, 16.h),
                     Divider(height: 1, color: AppColors.greyColor),
                     TextInputWidget(
                             labelText: LocaleKeys.nationalIdNumber.tr(),
@@ -89,6 +95,7 @@ class _RegisterNew extends State<RegisterNewStep2> {
                             isBorderAllowed: false,
                             isAllowLeadingIcon: true,
                             isReadOnly: true,
+                            labelColor: AppColors.textColor,
                             leadingIcon: AppAssets.student_card)
                         .paddingSymmetrical(0.h, 16.h),
                     Divider(height: 1, color: AppColors.greyColor),
@@ -108,6 +115,7 @@ class _RegisterNew extends State<RegisterNewStep2> {
                                 isBorderAllowed: false,
                                 hasSelectionCustomIcon: true,
                                 isAllowRadius: false,
+                                labelColor: AppColors.textColor,
                                 padding: const EdgeInsets.only(top: 8, bottom: 8, left: 0, right: 0),
                                 selectionCustomIcon: AppAssets.arrow_down,
                                 leadingIcon: AppAssets.user_full,
@@ -124,6 +132,7 @@ class _RegisterNew extends State<RegisterNewStep2> {
                                 isAllowLeadingIcon: true,
                                 isReadOnly: authVM!.isUserFromUAE() ? false : true,
                                 leadingIcon: AppAssets.user_full,
+                                labelColor: AppColors.textColor,
                                 onChange: (value) {})
                             .paddingSymmetrical(0.h, 16.h),
                     Divider(height: 1, color: AppColors.greyColor),
@@ -143,6 +152,7 @@ class _RegisterNew extends State<RegisterNewStep2> {
                                 isBorderAllowed: false,
                                 hasSelectionCustomIcon: true,
                                 isAllowRadius: false,
+                                labelColor: AppColors.textColor,
                                 padding: const EdgeInsets.only(top: 8, bottom: 8, left: 0, right: 0),
                                 selectionCustomIcon: AppAssets.arrow_down,
                                 leadingIcon: AppAssets.smart_phone,
@@ -160,6 +170,7 @@ class _RegisterNew extends State<RegisterNewStep2> {
                                 isBorderAllowed: false,
                                 isAllowLeadingIcon: true,
                                 isReadOnly: true,
+                                labelColor: AppColors.textColor,
                                 leadingIcon: AppAssets.smart_phone,
                                 onChange: (value) {})
                             .paddingSymmetrical(0.h, 16.h),
@@ -190,6 +201,7 @@ class _RegisterNew extends State<RegisterNewStep2> {
                                 onChange: authVM.onUAEUserCountrySelection,
                                 isBorderAllowed: false,
                                 hasSelectionCustomIcon: true,
+                                labelColor: AppColors.textColor,
                                 isAllowRadius: false,
                                 padding: const EdgeInsets.only(top: 8, bottom: 8, left: 0, right: 0),
                                 selectionCustomIcon: AppAssets.arrow_down,
@@ -208,6 +220,7 @@ class _RegisterNew extends State<RegisterNewStep2> {
                                 isBorderAllowed: false,
                                 isAllowLeadingIcon: true,
                                 isReadOnly: true,
+                                labelColor: AppColors.textColor,
                                 leadingIcon: AppAssets.globe,
                                 onChange: (value) {})
                             .paddingSymmetrical(0.h, 16.h),
@@ -224,6 +237,7 @@ class _RegisterNew extends State<RegisterNewStep2> {
                             isAllowRadius: false,
                             isBorderAllowed: false,
                             isAllowLeadingIcon: true,
+                            labelColor: AppColors.textColor,
                             isReadOnly: true,
                             leadingIcon: AppAssets.call)
                         .paddingSymmetrical(0.h, 16.h),
@@ -240,6 +254,7 @@ class _RegisterNew extends State<RegisterNewStep2> {
                       isBorderAllowed: false,
                       isAllowLeadingIcon: true,
                       isReadOnly: true,
+                      labelColor: AppColors.textColor,
                       leadingIcon: AppAssets.birthday_cake,
                       selectionType: null,
                     ).paddingSymmetrical(0.h, 16.h),
@@ -269,12 +284,12 @@ class _RegisterNew extends State<RegisterNewStep2> {
                 ),
                 Expanded(
                   child: CustomButton(
-                    backgroundColor: AppColors.lightGreenColor,
-                    borderColor: AppColors.lightGreenColor,
-                    textColor: AppColors.textGreenColor,
+                    backgroundColor: AppColors.primaryRedColor,
+                    borderColor: AppColors.primaryRedColor,
+                    textColor: AppColors.whiteColor,
                     text: LocaleKeys.confirm.tr(),
                     icon: AppAssets.confirm,
-                    iconColor: AppColors.textGreenColor,
+                    iconColor: AppColors.whiteColor,
                     onPressed: () {
                       if (appState.getUserRegistrationPayload.zipCode != CountryEnum.saudiArabia.countryCode) {
                         if (ValidationUtils.validateUaeRegistration(

lib/presentation/authentication/saved_login_screen.dart

@@ -12,6 +12,8 @@ import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
 import 'package:hmg_patient_app_new/features/authentication/authentication_view_model.dart';
 import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
 import 'package:hmg_patient_app_new/presentation/authentication/login.dart';
+import 'package:hmg_patient_app_new/presentation/home/landing_page.dart';
+import 'package:hmg_patient_app_new/presentation/home/navigation_screen.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
 import 'package:hmg_patient_app_new/widgets/appbar/app_bar_widget.dart';
 import 'package:hmg_patient_app_new/widgets/bottomsheet/generic_bottom_sheet.dart';
@@ -164,17 +166,16 @@ class _SavedLogin extends State<SavedLogin> {
                                               Padding(
                                                 padding: EdgeInsets.only(bottom: 10.h),
                                                 child: CustomButton(
-                                                  text: LocaleKeys.sendOTPSMS.tr(),
-                                                  onPressed: () {
-                                                    Navigator.of(context).pop();
-                                                    loginType = LoginTypeEnum.sms;
-                                                    authVm.checkUserAuthentication(otpTypeEnum: OTPTypeEnum.sms);
-                                                  },
-                                                  backgroundColor: AppColors.primaryRedColor,
-                                                  borderColor: AppColors.primaryRedBorderColor,
-                                                  textColor: AppColors.whiteColor,
-                                                  icon: AppAssets.sms,
-                                                ),
+                                                    text: LocaleKeys.sendOTPSMS.tr(),
+                                                    onPressed: () {
+                                                      Navigator.of(context).pop();
+                                                      loginType = LoginTypeEnum.sms;
+                                                      authVm.checkUserAuthentication(otpTypeEnum: OTPTypeEnum.sms);
+                                                    },
+                                                    backgroundColor: AppColors.primaryRedColor,
+                                                    borderColor: AppColors.primaryRedColor,
+                                                    textColor: AppColors.whiteColor,
+                                                    icon: AppAssets.sms),
                                               ),
                                               Row(
                                                 crossAxisAlignment: CrossAxisAlignment.center,
@@ -247,13 +248,13 @@ class _SavedLogin extends State<SavedLogin> {
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
                   Expanded(
-                    child: Container(
+                    child: SizedBox(
                       height: 56,
                       child: CustomButton(
                         text: LocaleKeys.guest.tr(),
                         onPressed: () {
                           Navigator.of(context).pushReplacement(
-                            MaterialPageRoute(builder: (BuildContext context) => LoginScreen()),
+                            MaterialPageRoute(builder: (BuildContext context) => LandingNavigation()),
                           );
                         },
                         backgroundColor: Color(0xffFEE9EA),
@@ -277,7 +278,7 @@ class _SavedLogin extends State<SavedLogin> {
                         text: LocaleKeys.switchAccount.tr(),
                         onPressed: () async {
                           await authVm.clearDefaultInputValues();
-                          Navigator.of(context).pushReplacement(
+                          Navigator.of(context).push(
                             MaterialPageRoute(builder: (BuildContext context) => LoginScreen()),
                           );
                         },

lib/services/navigation_service.dart

@@ -22,19 +22,9 @@ class NavigationService {
     navigatorKey.currentState?.pushReplacementNamed(routeName);
   }
 
-  Future<T?> pushToOtpScreen<T>({
-    required String phoneNumber,
-    required Function(int code) checkActivationCode,
-    required Function(String phoneNumber) onResendOTPPressed,
-  }) {
+  Future<T?> pushToOtpScreen<T>({required String phoneNumber, required Function(int code) checkActivationCode, required Function(String phoneNumber) onResendOTPPressed}) {
     return navigatorKey.currentState!.push(
-      MaterialPageRoute(
-        builder: (_) => OTPVerificationScreen(
-          phoneNumber: phoneNumber,
-          checkActivationCode: checkActivationCode,
-          onResendOTPPressed: onResendOTPPressed,
-        ),
-      ),
+      MaterialPageRoute(builder: (_) => OTPVerificationScreen(phoneNumber: phoneNumber, checkActivationCode: checkActivationCode, onResendOTPPressed: onResendOTPPressed)),
     );
   }
 

lib/widgets/dropdown/dropdown_widget.dart

@@ -18,29 +18,31 @@ class DropdownWidget extends StatelessWidget {
   final bool hasSelectionCustomIcon;
   final String? selectionCustomIcon;
   final String? leadingIcon;
+  final Color? labelColor;
 
-  const DropdownWidget({
-    Key? key,
-    required this.labelText,
-    required this.hintText,
-    required this.dropdownItems,
-    this.selectedValue,
-    this.onChange,
-    this.isEnable = true,
-    this.isBorderAllowed = true,
-    this.isAllowRadius = true,
-    this.padding,
-    this.hasSelectionCustomIcon = false,
-    this.selectionCustomIcon,
-    this.leadingIcon,
-  }) : super(key: key);
+  const DropdownWidget(
+      {Key? key,
+      required this.labelText,
+      required this.hintText,
+      required this.dropdownItems,
+      this.selectedValue,
+      this.onChange,
+      this.isEnable = true,
+      this.isBorderAllowed = true,
+      this.isAllowRadius = true,
+      this.padding,
+      this.hasSelectionCustomIcon = false,
+      this.selectionCustomIcon,
+      this.leadingIcon,
+      this.labelColor})
+      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     Widget content = Column(
       mainAxisSize: MainAxisSize.min,
       crossAxisAlignment: CrossAxisAlignment.start,
-      children: [_buildLabelText(), _buildDropdown(context)],
+      children: [_buildLabelText(labelColor), _buildDropdown(context)],
     );
 
     return Container(
@@ -75,13 +77,13 @@ class DropdownWidget extends StatelessWidget {
         child: Utils.buildSvgWithAssets(icon: leadingIcon!));
   }
 
-  Widget _buildLabelText() {
+  Widget _buildLabelText(Color? labelColor) {
     return Text(
       labelText,
       style: TextStyle(
         fontSize: 12.fSize,
         fontWeight: FontWeight.w500,
-        color: Color(0xff898A8D),
+        color: labelColor ?? Color(0xff898A8D),
         letterSpacing: -0.2,
         height: 18 / 12,
       ),

lib/widgets/input_widget.dart

@@ -41,39 +41,41 @@ class TextInputWidget extends StatelessWidget {
   final num? fontSize;
   final bool? isWalletAmountInput;
   final Widget? suffix;
+  final Color? labelColor;
 
   // final List<Country> countryList;
   // final Function(Country)? onCountryChange;
 
-  TextInputWidget({
-    super.key,
-    required this.labelText,
-    required this.hintText,
-    this.controller,
-    this.onChange,
-    this.onCalendarTypeChanged,
-    this.prefix,
-    this.isEnable = true,
-    this.isBorderAllowed = true,
-    this.isAllowRadius = true,
-    this.isReadOnly = false,
-    this.keyboardType = TextInputType.number,
-    this.focusNode,
-    this.autoFocus = false,
-    this.padding,
-    this.isAllowLeadingIcon = false,
-    this.leadingIcon,
-    this.isCountryDropDown = false,
-    this.hasError = false,
-    this.errorMessage,
-    this.onCountryChange,
-    this.selectionType,
-    this.fontSize = 14,
-    this.isWalletAmountInput = false,
-    this.suffix,
-    // this.countryList = const [],
-    // this.onCountryChange,
-  });
+  TextInputWidget(
+      {super.key,
+      required this.labelText,
+      required this.hintText,
+      this.controller,
+      this.onChange,
+      this.onCalendarTypeChanged,
+      this.prefix,
+      this.isEnable = true,
+      this.isBorderAllowed = true,
+      this.isAllowRadius = true,
+      this.isReadOnly = false,
+      this.keyboardType = TextInputType.number,
+      this.focusNode,
+      this.autoFocus = false,
+      this.padding,
+      this.isAllowLeadingIcon = false,
+      this.leadingIcon,
+      this.isCountryDropDown = false,
+      this.hasError = false,
+      this.errorMessage,
+      this.onCountryChange,
+      this.selectionType,
+      this.fontSize = 14,
+      this.isWalletAmountInput = false,
+      this.suffix,
+      this.labelColor
+      // this.countryList = const [],
+      // this.onCountryChange,
+      });
 
   final FocusNode _focusNode = FocusNode();
 
@@ -135,7 +137,7 @@ class TextInputWidget extends StatelessWidget {
                         mainAxisSize: MainAxisSize.min,
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
-                          _buildLabelText().paddingOnly(right: (appState.getLanguageCode() == "ar" ? 10 : 0)),
+                          _buildLabelText(labelColor).paddingOnly(right: (appState.getLanguageCode() == "ar" ? 10 : 0)),
                           _buildTextField(context),
                         ],
                       ),
@@ -206,13 +208,13 @@ class TextInputWidget extends StatelessWidget {
     );
   }
 
-  Widget _buildLabelText() {
+  Widget _buildLabelText(Color? labelColor) {
     return Text(
       labelText,
       style: TextStyle(
         fontSize: 12.fSize,
         fontWeight: FontWeight.w500,
-        color: AppColors.inputLabelTextColor,
+        color: labelColor ?? AppColors.inputLabelTextColor,
         letterSpacing: -0.2,
         height: 18 / 12,
       ),

pubspec.yaml

@@ -66,6 +66,7 @@ dependencies:
   firebase_analytics: ^11.5.1
   jiffy: ^6.4.3
   hijri_gregorian_calendar: ^0.1.1
+  sms_otp_auto_verify: ^2.2.0
 
   web: any
   flutter_staggered_animations: ^1.1.1