diff --git a/New Patient App android keystore/NewPatientAppKeyStore.jks b/New Patient App android keystore/NewPatientAppKeyStore.jks new file mode 100644 index 00000000..e50988ea Binary files /dev/null and b/New Patient App android keystore/NewPatientAppKeyStore.jks differ diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 7267f0ac..0e77b6b6 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -49,7 +49,7 @@ - + @@ -62,7 +62,6 @@ - + = 33) { - // await FlutterCallkitIncoming.requestFullIntentPermission(); + await FlutterCallkitIncoming.requestFullIntentPermission(); } } } diff --git a/lib/features/authentication/authentication_view_model.dart b/lib/features/authentication/authentication_view_model.dart index fe025f93..6fc36191 100644 --- a/lib/features/authentication/authentication_view_model.dart +++ b/lib/features/authentication/authentication_view_model.dart @@ -1033,7 +1033,8 @@ class AuthenticationViewModel extends ChangeNotifier { label: LocaleKeys.notice.tr(), onOkPressed: () { _dialogService.showPhoneNumberPickerSheet( - label: "Where would you like to receive OTP?", + // label: "Where would you like to receive OTP?", + label: LocaleKeys.receiveOtpToast.tr(), message: "Please select from the below options to receive OTP.", onSMSPress: () { checkUserAuthentication(otpTypeEnum: OTPTypeEnum.sms); diff --git a/lib/features/medical_file/models/patient_sickleave_response_model.dart b/lib/features/medical_file/models/patient_sickleave_response_model.dart index 53c886f6..601bb598 100644 --- a/lib/features/medical_file/models/patient_sickleave_response_model.dart +++ b/lib/features/medical_file/models/patient_sickleave_response_model.dart @@ -122,7 +122,7 @@ class PatientSickLeavesResponseModel { patientName = json['PatientName']; projectName = json['ProjectName']; qR = json['QR']; - speciality = json['Speciality'].cast(); + // speciality = json['Speciality'].cast(); startDate = json['StartDate']; status = json['Status']; strRequestDate = json['StrRequestDate']; diff --git a/lib/presentation/home/widgets/large_service_card.dart b/lib/presentation/home/widgets/large_service_card.dart index e65eb1d8..7c86dd09 100644 --- a/lib/presentation/home/widgets/large_service_card.dart +++ b/lib/presentation/home/widgets/large_service_card.dart @@ -82,6 +82,7 @@ class LargeServiceCard extends StatelessWidget { icon: serviceCardData.icon, iconColor: serviceCardData.iconColor, fit: BoxFit.contain, + applyThemeColor: false, ), ), ), diff --git a/lib/services/dialog_service.dart b/lib/services/dialog_service.dart index 6347a389..c4dfb7c4 100644 --- a/lib/services/dialog_service.dart +++ b/lib/services/dialog_service.dart @@ -306,7 +306,7 @@ Widget showPhoneNumberPickerWidget({required BuildContext context, String? messa onPressed: onSMSPress, backgroundColor: AppColors.primaryRedColor, borderColor: AppColors.primaryRedBorderColor, - textColor: AppColors.whiteColor, + textColor: Colors.white, icon: AppAssets.message, ), ), @@ -325,11 +325,12 @@ Widget showPhoneNumberPickerWidget({required BuildContext context, String? messa child: CustomButton( text: LocaleKeys.sendOTPWHATSAPP.tr(context: context), onPressed: onWhatsappPress, - backgroundColor: Colors.white, + backgroundColor: AppColors.whiteColor, borderColor: AppColors.borderOnlyColor, textColor: AppColors.textColor, icon: AppAssets.whatsapp, iconColor: null, + applyThemeColor: false, ), ), ], diff --git a/lib/splashPage.dart b/lib/splashPage.dart index dc7a7c98..64518f30 100644 --- a/lib/splashPage.dart +++ b/lib/splashPage.dart @@ -101,6 +101,7 @@ class _SplashScreenState extends State { print('Call Canceled : ------->'); try { + FlutterCallkitIncoming.unsilenceEvents(); FlutterCallkitIncoming.onEvent.listen((event) async { switch (event!.event) { case Event.actionCallIncoming: diff --git a/lib/widgets/buttons/custom_button.dart b/lib/widgets/buttons/custom_button.dart index 8500ce8e..de3b598a 100644 --- a/lib/widgets/buttons/custom_button.dart +++ b/lib/widgets/buttons/custom_button.dart @@ -25,6 +25,7 @@ class CustomButton extends StatelessWidget { final double? iconSize; final TextOverflow? textOverflow; final BorderSide? borderSide; + final bool applyThemeColor; const CustomButton({ super.key, @@ -47,6 +48,7 @@ class CustomButton extends StatelessWidget { this.iconSize, this.textOverflow, this.borderSide, + this.applyThemeColor = true, }); @override @@ -76,7 +78,7 @@ class CustomButton extends StatelessWidget { if (icon != null) Padding( padding: text.isNotEmpty ? EdgeInsets.only(right: 4.w, left: 4.w) : EdgeInsets.zero, - child: Utils.buildSvgWithAssets(icon: icon!, iconColor: iconColor, isDisabled: isDisabled, width: iconS, height: iconS), + child: Utils.buildSvgWithAssets(icon: icon!, iconColor: iconColor, isDisabled: isDisabled, width: iconS, height: iconS, applyThemeColor: applyThemeColor), ), if (text.isNotEmpty) Text( diff --git a/pubspec.yaml b/pubspec.yaml index c4b1e51a..43969000 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: hmg_patient_app_new description: "New HMG Patient App" publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 0.0.1+4 +version: 0.0.11+8 environment: sdk: ">=3.6.0 <4.0.0"