otp screen & register Uae & resend Activation Code.

1 month ago · 3b1b51ef6f
parent 28a95959e0
commit 3b1b51ef6f
2 changed files with 96 additions and 92 deletions
--- a/lib/features/authentication/authentication_view_model.dart
+++ b/lib/features/authentication/authentication_view_model.dart
@ -57,7 +57,8 @@ class AuthenticationViewModel extends ChangeNotifier {
    required NavigationService navigationService,
    required CacheService cacheService,
    required LocalAuthService localAuthService,
-  })  : _navigationService = navigationService,
+  })
+      : _navigationService = navigationService,
        _dialogService = dialogService,
        _errorHandlerService = errorHandlerService,
        _appState = appState,
@ -202,13 +203,13 @@ class AuthenticationViewModel extends ChangeNotifier {
    final result = await _authenticationRepo.selectDeviceByImei(firebaseToken: firebaseToken);

    result.fold(
-      (failure) async {
+          (failure) async {
        // LoadingUtils.hideFullScreenLoader();
        // await _errorHandlerService.handleError(failure: failure);
        LoaderBottomSheet.hideLoader();
        _navigationService.pushPage(page: LoginScreen());
      },
-      (apiResponse) {
+          (apiResponse) {
        // LoadingUtils.hideFullScreenLoader();
        log("apiResponse: ${apiResponse.data.toString()}");
        log("messageStatus: ${apiResponse.messageStatus.toString()}");
@ -298,7 +299,8 @@ class AuthenticationViewModel extends ChangeNotifier {
    final result = await _authenticationRepo.checkPatientAuthentication(checkPatientAuthenticationReq: checkPatientAuthenticationReq);

    result.fold(
-      (failure) async => await _errorHandlerService.handleError(
+          (failure) async =>
+      await _errorHandlerService.handleError(
          failure: failure,
          onUnHandledFailure: (failure) async {
            LoaderBottomSheet.hideLoader();
@ -312,7 +314,7 @@ class AuthenticationViewModel extends ChangeNotifier {
                  _navigationService.pop();
                });
          }),
-      (apiResponse) async {
+          (apiResponse) async {
        if (apiResponse.messageStatus == 2) {
          LoaderBottomSheet.hideLoader();
          await _dialogService.showErrorBottomSheet(message: apiResponse.errorMessage ?? "ErrorEmpty", onOkPressed: () {});
@ -355,8 +357,8 @@ class AuthenticationViewModel extends ChangeNotifier {
      patientOutSA: isForRegister
          ? isPatientOutsideSA(request: payload)
          : selectedCountrySignup.countryCode == CountryEnum.saudiArabia
-              ? false
-              : true,
+          ? false
+          : true,
      payload: payload,
    );

@ -370,8 +372,8 @@ class AuthenticationViewModel extends ChangeNotifier {
    final resultEither = await _authenticationRepo.sendActivationCodeRepo(sendActivationCodeReq: request, isRegister: checkIsUserComingForRegister(request: payload), languageID: 'er');

    resultEither.fold(
-      (failure) async => await _errorHandlerService.handleError(failure: failure),
-      (apiResponse) async {
+          (failure) async => await _errorHandlerService.handleError(failure: failure),
+          (apiResponse) async {
        if (apiResponse.messageStatus == 2) {
          LoaderBottomSheet.hideLoader();
          await _dialogService.showCommonBottomSheetWithoutH(
@ -405,27 +407,27 @@ class AuthenticationViewModel extends ChangeNotifier {
    bool isForRegister = (_appState.getUserRegistrationPayload.healthId != null || _appState.getUserRegistrationPayload.patientOutSa == true || _appState.getUserRegistrationPayload.patientOutSa == 1);

    final request = RequestUtils.getCommonRequestWelcome(
-            phoneNumber: phoneNumberController.text,
-            otpTypeEnum: otpTypeEnum,
-            deviceToken: _appState.deviceToken,
-            // patientOutSA: _appState.getUserRegistrationPayload.projectOutSa == 1 ? true : false,
-            patientOutSA: isForRegister
-                ? _appState.getUserRegistrationPayload.projectOutSa == true
-                    ? true
-                    : false
-                : _appState.getSelectDeviceByImeiRespModelElement != null
-                    ? _appState.getSelectDeviceByImeiRespModelElement!.outSa!
-                    : selectedCountrySignup == CountryEnum.saudiArabia
-                        ? false
-                        : true,
-            loginTokenID: _appState.appAuthToken,
-            registeredData: isForRegister ? _appState.getUserRegistrationPayload : null,
-            nationIdText: nationalIdController.text,
-            countryCode: _appState.getSelectDeviceByImeiRespModelElement != null && _appState.getSelectDeviceByImeiRespModelElement!.outSa == true
-                ? CountryEnum.unitedArabEmirates.countryCode
-                : selectedCountrySignup.countryCode,
-            //TODO: Error Here IN Zip Code.
-            loginType: loginTypeEnum.toInt)
+        phoneNumber: phoneNumberController.text,
+        otpTypeEnum: otpTypeEnum,
+        deviceToken: _appState.deviceToken,
+        // patientOutSA: _appState.getUserRegistrationPayload.projectOutSa == 1 ? true : false,
+        patientOutSA: isForRegister
+            ? _appState.getUserRegistrationPayload.projectOutSa == true
+            ? true
+            : false
+            : _appState.getSelectDeviceByImeiRespModelElement != null
+            ? _appState.getSelectDeviceByImeiRespModelElement!.outSa!
+            : selectedCountrySignup == CountryEnum.saudiArabia
+            ? false
+            : true,
+        loginTokenID: _appState.appAuthToken,
+        registeredData: isForRegister ? _appState.getUserRegistrationPayload : null,
+        nationIdText: nationalIdController.text,
+        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();
    if (isForRegister) {
@ -441,7 +443,8 @@ class AuthenticationViewModel extends ChangeNotifier {
      LoaderBottomSheet.hideLoader();

      resultEither.fold(
-          (failure) async => await _errorHandlerService.handleError(
+              (failure) async =>
+          await _errorHandlerService.handleError(
              failure: failure,
              onUnHandledFailure: (failure) async {
                LoaderBottomSheet.hideLoader();
@ -468,7 +471,8 @@ class AuthenticationViewModel extends ChangeNotifier {
      final resultEither = await _authenticationRepo.checkActivationCodeRepo(newRequest: CheckActivationCodeRegisterReq.fromJson(request), activationCode: activationCode, isRegister: false);

      resultEither.fold(
-          (failure) async => await _errorHandlerService.handleError(
+              (failure) async =>
+          await _errorHandlerService.handleError(
              failure: failure,
              onUnHandledFailure: (failure) async {
                LoaderBottomSheet.hideLoader();
@ -652,15 +656,15 @@ class AuthenticationViewModel extends ChangeNotifier {
    bool isOutSidePatient = selectedCountrySignup.countryCode == CountryEnum.unitedArabEmirates.countryCode ? true : false;
    LoaderBottomSheet.showLoader();
    final request = await RequestUtils.getPatientAuthenticationRequest(
-            phoneNumber: phoneNumberController.text,
-            nationId: nationalIdController.text,
-            patientOutSA: isOutSidePatient,
-            otpTypeEnum: otpTypeEnum,
-            isForRegister: true,
-            patientId: 0,
-            zipCode: selectedCountrySignup.countryCode,
-            calenderType: calenderType,
-            dob: dob)
+        phoneNumber: phoneNumberController.text,
+        nationId: nationalIdController.text,
+        patientOutSA: isOutSidePatient,
+        otpTypeEnum: otpTypeEnum,
+        isForRegister: true,
+        patientId: 0,
+        zipCode: selectedCountrySignup.countryCode,
+        calenderType: calenderType,
+        dob: dob)
        .toJson();
    var nRequest = Map<String, dynamic>.from(request);

@ -796,22 +800,22 @@ class AuthenticationViewModel extends ChangeNotifier {
  Future<void> insertPatientIMEIData(int loginType) async {
    final resultEither = await _authenticationRepo.insertPatientIMEIData(
        patientIMEIDataRequest: PatientInsertDeviceImei(
-      imei: _appState.deviceToken,
-      deviceTypeId: _appState.getDeviceTypeID(),
-      patientId: _appState.getAuthenticatedUser()!.patientId!,
-      patientIdentificationNo: _appState.getAuthenticatedUser()!.patientIdentificationNo!,
-      identificationNo: _appState.getAuthenticatedUser()!.patientIdentificationNo!,
-      firstName: _appState.getAuthenticatedUser()!.firstName!,
-      lastName: _appState.getAuthenticatedUser()!.lastName!,
-      patientTypeId: _appState.getAuthenticatedUser()!.patientType,
-      mobileNo: _appState.getAuthenticatedUser()!.mobileNumber!,
-      logInTypeId: loginType,
-      patientOutSa: _appState.getAuthenticatedUser()!.outSa!,
-      outSa: _appState.getAuthenticatedUser()!.outSa == 1 ? true : false,
-      biometricEnabled: loginType == 1 || loginType == 2 ? false : true,
-      firstNameN: _appState.getAuthenticatedUser()!.firstNameN,
-      lastNameN: _appState.getAuthenticatedUser()!.lastNameN,
-    ).toJson());
+          imei: _appState.deviceToken,
+          deviceTypeId: _appState.getDeviceTypeID(),
+          patientId: _appState.getAuthenticatedUser()!.patientId!,
+          patientIdentificationNo: _appState.getAuthenticatedUser()!.patientIdentificationNo!,
+          identificationNo: _appState.getAuthenticatedUser()!.patientIdentificationNo!,
+          firstName: _appState.getAuthenticatedUser()!.firstName!,
+          lastName: _appState.getAuthenticatedUser()!.lastName!,
+          patientTypeId: _appState.getAuthenticatedUser()!.patientType,
+          mobileNo: _appState.getAuthenticatedUser()!.mobileNumber!,
+          logInTypeId: loginType,
+          patientOutSa: _appState.getAuthenticatedUser()!.outSa!,
+          outSa: _appState.getAuthenticatedUser()!.outSa == 1 ? true : false,
+          biometricEnabled: loginType == 1 || loginType == 2 ? false : true,
+          firstNameN: _appState.getAuthenticatedUser()!.firstNameN,
+          lastNameN: _appState.getAuthenticatedUser()!.lastNameN,
+        ).toJson());
    resultEither.fold((failure) async => await _errorHandlerService.handleError(failure: failure), (apiResponse) async {
      if (apiResponse.messageStatus == 1) {
        log("Insert IMEI Success");
@ -825,20 +829,20 @@ class AuthenticationViewModel extends ChangeNotifier {
  Future<void> insertPatientDeviceData(int loginType) async {
    final resultEither = await _authenticationRepo.insertPatientDeviceData(
        patientDeviceDataRequest: InsertPatientMobileDeviceInfo(
-                deviceToken: _appState.deviceToken,
-                deviceTypeId: _appState.getDeviceTypeID(),
-                patientId: _appState.getAuthenticatedUser()!.patientId!,
-                patientTypeId: _appState.getAuthenticatedUser()!.patientType,
-                patientOutSa: _appState.getAuthenticatedUser()!.outSa!,
-                loginType: loginType,
-                languageId: _appState.getLanguageID(),
-                latitude: _appState.userLat,
-                longitude: _appState.userLong,
-                voipToken: "",
-                deviceType: _appState.deviceTypeID,
-                patientMobileNumber: _appState.getAuthenticatedUser()!.mobileNumber,
-                nationalId: _appState.getAuthenticatedUser()!.patientIdentificationNo,
-                gender: _appState.getAuthenticatedUser()!.gender)
+            deviceToken: _appState.deviceToken,
+            deviceTypeId: _appState.getDeviceTypeID(),
+            patientId: _appState.getAuthenticatedUser()!.patientId!,
+            patientTypeId: _appState.getAuthenticatedUser()!.patientType,
+            patientOutSa: _appState.getAuthenticatedUser()!.outSa!,
+            loginType: loginType,
+            languageId: _appState.getLanguageID(),
+            latitude: _appState.userLat,
+            longitude: _appState.userLong,
+            voipToken: "",
+            deviceType: _appState.deviceTypeID,
+            patientMobileNumber: _appState.getAuthenticatedUser()!.mobileNumber,
+            nationalId: _appState.getAuthenticatedUser()!.patientIdentificationNo,
+            gender: _appState.getAuthenticatedUser()!.gender)
            .toJson());
    resultEither.fold((failure) async => await _errorHandlerService.handleError(failure: failure), (apiResponse) async {
      if (apiResponse.messageStatus == 1) {
@ -852,18 +856,18 @@ class AuthenticationViewModel extends ChangeNotifier {
  Future<void> getPatientDeviceData(int loginType) async {
    final resultEither = await _authenticationRepo.getPatientDeviceData(
        patientDeviceDataRequest: GetUserMobileDeviceData(
-                deviceToken: _appState.deviceToken,
-                deviceTypeId: _appState.getDeviceTypeID(),
-                patientId: _appState.getSelectDeviceByImeiRespModelElement!.patientId!,
-                patientType: _appState.getSelectDeviceByImeiRespModelElement!.patientType,
-                patientOutSa: _appState.getSelectDeviceByImeiRespModelElement!.outSa == true ? 1 : 0,
-                loginType: loginType,
-                languageId: _appState.getLanguageID(),
-                latitude: _appState.userLat,
-                longitude: _appState.userLong,
-                mobileNo: _appState.getSelectDeviceByImeiRespModelElement!.mobile!,
-                patientMobileNumber: int.parse(_appState.getSelectDeviceByImeiRespModelElement!.mobile!),
-                nationalId: _appState.getSelectDeviceByImeiRespModelElement!.identificationNo)
+            deviceToken: _appState.deviceToken,
+            deviceTypeId: _appState.getDeviceTypeID(),
+            patientId: _appState.getSelectDeviceByImeiRespModelElement!.patientId!,
+            patientType: _appState.getSelectDeviceByImeiRespModelElement!.patientType,
+            patientOutSa: _appState.getSelectDeviceByImeiRespModelElement!.outSa == true ? 1 : 0,
+            loginType: loginType,
+            languageId: _appState.getLanguageID(),
+            latitude: _appState.userLat,
+            longitude: _appState.userLong,
+            mobileNo: _appState.getSelectDeviceByImeiRespModelElement!.mobile!,
+            patientMobileNumber: int.parse(_appState.getSelectDeviceByImeiRespModelElement!.mobile!),
+            nationalId: _appState.getSelectDeviceByImeiRespModelElement!.identificationNo)
            .toJson());
    resultEither.fold((failure) async => await _errorHandlerService.handleError(failure: failure), (apiResponse) async {
      if (apiResponse.messageStatus == 1) {
@ -878,7 +882,7 @@ class AuthenticationViewModel extends ChangeNotifier {
            message: apiResponse.errorMessage ?? "",
            label: LocaleKeys.notice.tr(),
            onOkPressed: () {
-              _dialogService.showPhoneNumberPickerSheet(onSMSPress: () {
+              _dialogService.showPhoneNumberPickerSheet(label:"Where would you like to receive OTP?", message:"Please select from the below options to receive OTP.", onSMSPress: () {
                checkUserAuthentication(otpTypeEnum: OTPTypeEnum.sms);
              }, onWhatsappPress: () {
                checkUserAuthentication(otpTypeEnum: OTPTypeEnum.whatsapp);
@ -907,8 +911,8 @@ class AuthenticationViewModel extends ChangeNotifier {
    List<ProjectDetailListModel> projectDetailListModel = [];

    resultEither.fold(
-      (failure) async => await _errorHandlerService.handleError(failure: failure),
-      (apiResponse) async {
+          (failure) async => await _errorHandlerService.handleError(failure: failure),
+          (apiResponse) async {
        if (apiResponse.messageStatus == 2) {
          await _dialogService.showErrorBottomSheet(message: apiResponse.errorMessage ?? "ErrorEmpty");
        } else {
--- a/lib/widgets/common_bottom_sheet.dart
+++ b/lib/widgets/common_bottom_sheet.dart
@ -109,11 +109,11 @@ void showCommonBottomSheetWithoutHeight(
  required Widget child,
  required VoidCallback callBackFunc,
  String title = "",
-
-    bool isCloseButtonVisible = true,
-    bool isFullScreen = true,
-    bool isDismissible = true,
-    Widget? titleWidget,}) {
+  bool isCloseButtonVisible = true,
+  bool isFullScreen = true,
+  bool isDismissible = true,
+  Widget? titleWidget,
+}) {
  showModalBottomSheet<String>(
      sheetAnimationStyle: AnimationStyle(
        duration: Duration(milliseconds: 500), // Custom animation duration
@ -141,7 +141,7 @@ void showCommonBottomSheetWithoutHeight(
                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
                        crossAxisAlignment: CrossAxisAlignment.center,
                        children: [
-                          titleWidget ?? title.toText20(weight: FontWeight.w600),
+                          titleWidget ?? Expanded(child: title.toText20(weight: FontWeight.w600)),
                          Utils.buildSvgWithAssets(icon: AppAssets.close_bottom_sheet_icon, iconColor: Color(0xff2B353E)).onPress(() {
                            Navigator.of(context).pop();
                          }),