From 8de803909605ca8550c24f77259405ccdda75fe3 Mon Sep 17 00:00:00 2001 From: Haroon Amjad <> Date: Sat, 7 Mar 2026 03:06:19 +0300 Subject: [PATCH] updates --- .../NewPatientAppKeyStore.jks | Bin 0 -> 2658 bytes android/app/src/main/AndroidManifest.xml | 8 +++++--- lib/core/api_consts.dart | 2 +- lib/core/utils/push_notification_handler.dart | 2 +- .../authentication_view_model.dart | 3 ++- .../models/patient_sickleave_response_model.dart | 2 +- .../home/widgets/large_service_card.dart | 1 + lib/services/dialog_service.dart | 5 +++-- lib/splashPage.dart | 1 + lib/widgets/buttons/custom_button.dart | 4 +++- pubspec.yaml | 2 +- 11 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 New Patient App android keystore/NewPatientAppKeyStore.jks diff --git a/New Patient App android keystore/NewPatientAppKeyStore.jks b/New Patient App android keystore/NewPatientAppKeyStore.jks new file mode 100644 index 0000000000000000000000000000000000000000..e50988ea1abefbad0bb17b540620f302d5d43851 GIT binary patch literal 2658 zcma);XE+;*8pjij7_}R#ghX4h8+#Mfp{S86fIlyD&9DLpB=~q zEGDrWf=Dd8ND|8ylEhf~UlLZwPvLi7_ zwSPu7q%;W9DL!JaVa>V@+{Jd|O>0wXocb0S7!X_xKp2t@%>3_*3@nTQBoxeojW-73 z&wzkZAg(Uks*mc?mVd=p>6DvS9ZZ2pprNA8zN3N-DCg?JPQJotyQe43{bG~eJ%;!w zI~6X$WTSJJ0vlbdWW~)ZCxsfII`0GhB8wJu40gzU^uK7w(UdX&-H{9HYV(m<4d=Z& zqEd+(CwY}CJKE22KUz2SQ2FM*QjYf}d}JASDEvh;!r>;`-0SYbnA)zTZq4Ngm)Yyh z0}cbKGNNI9bEgYJH`N+Drf>-xu}wL(3(2ON^AEF+X##G(Nn_7P%2ferkKWjpIYn&8 za&}=nSggGpxH3muQT1~ED?#t-4U@iW(*tKcVv~n=2V>H(o%_abE{H|J?bfHXQ#y-` zeIJhp&O7#SnK=mEnslKv;0Ah$I^SbynP7YrR4PY`oRRnC#wATOUs)00-ALz+13M#1t=?Z^v1|=4>`E4D&XWSBqr-#f#Jx9zS=h2G%@i~_Jj_H4%iGIkh}?a4SxT0LO*pC=opto8MvXyFZ=p0P_)+o}o7g@<4KUSwuc@~gRi5N=JExGi2 z{1cxUw&{auEw!sCQ-eEq=eU*MN4b@?ZMDqYma*LO-sOB%@cE-|xlsg0p}M}>Wx`}V zoA?o5^~4`eh$Mtf6pFqhDE4wnlY0{T+qG_FvSS=e1iJKjLetxEBOSs1q(wv9xef`U z7-^P&5-*KyXi>Zy?bQyMa!t}&j{Ch}(D)Kc?DlC%K*wcs{DYX04buQuO9BPqu(rdJ$>{U@+zKg1k&sG@u)E{Vex6Y5Zl-w*m%upsm?o8Mw`?gT`bKj} zw|&rZb8e5u!Iz;fnP!$Yvx+Z>(JD04*D~H~Ho8~dQAFkPkXZq!y_y!&_kh3dQjDiJ1^N6>Zo^3Uyym|hp&|fMlw`H0xd!3riVY5AE zW=!G750UO5`tq+DCSANChGws`V4by*dO*oq%mXL~7&x^-A?PrrqdGaGSi*HoWqzjE z8J#qV+if^DN2#tI;kpau-U~sCkXwiyfiY-^a?txKx}@Sdi%l>Fc%1wRu@My3f@NsG z!(V~UXRZ4X^XP@l5JMy|>h%)?-X?h4NP2D|ogIYmMlJNZH!_}9mnfjsLQ#hC5*1YS zmGV?6O=qXc9AaHz0;>eW>FUcuuv>Mas=?A;juY4CD*O+*sn@uWf-M4}+7Ab=F9;T< zT|<QW=ggr*Mfq-CR_wGmmX zgu_F^GHC0$V?&P!6c%uERd7e$cV3fHXL7O+v^$?2n(*?KYsM)nn^@ZbHEdi=58NHt zdT~sPDzfV9@V!e!td(HCV{EzpJz#wF-HxpYH97>CrpDJ|pofC8i*(_f)s#n6xi0%! zM~_pVIWc+4oRs+BXGHFWV^F!;ey+((Be`!wM_MUUAg>lqHMn(_+&p9cXdW5Dd<*V4 zOK~`j!>qm_R}f-aU$KOY?M8Y?VLLpkRDyN!yqQbr#nk4&;I5ajF0Ot zK`(B)k#+irFZ2T_+8%{TlRQ_h;%@Ra0>rJXm)$WXlWY>@V4dH9@am62b_?2l)7_`} zvn0^mwS-TL==}-1xmr!?@N=t)?|HDHX6%onp8FbET^Z9A6Ah6uUKTEe`UydP4bFo} zH`j#dydwri;xabq-O04k$mECsK@0GSs?XLan>Akd*$T=!w`QJkr?#-F$F<68NcD5H z{tVU89#XJ(dNXbM#Fj-VRFK{5%RQP6!cV>RsRCqKdc&?X-08I6V$c|7cyT5>F^u(3 zmJa*+q}TPMI$`Vbi_1gN81L*+zar_GX2HkRh$%*0+Vv{ z5_Km&zXi?x)qu)r>ta7&eEi$|FdQSyT{9joAEa}UYiNylzniJRE7+Ab|KZy?A8?&| zzV%wljU`y~9~a!Lv&`Gf&=yePK=)F|_+vWc&^6@XeI~ literal 0 HcmV?d00001 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"