Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan

* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  Updates & fixes
  updates
  updates
  Push notification changes & updates

assets/langs/ar-SA.json

@@ -123,7 +123,7 @@
   "forgotFileNoTitle": "نسيت الملف الطبي",
   "enterNationalId": "يرجى إدخال رقم الهاتف المحمول ورقم الهوية",
   "profileInfo": "يرجى إدخال معلومات الملف الشخصي",
-  "submit": "بحث",
+  "submit": "تأكيد",
   "forgotDesc": "أدخل رقم الهاتف المحمول لاستلام رقم الملف الطبي عبر الرسائل القصيرة",
   "dob": "تاريخ الميلاد",
   "hijriDate": "التاريخ الهجري",
@@ -1390,7 +1390,6 @@
   "medicalFiles": "الملفات الطبية",
   "addANewFamilyMember": "اضافة",
   "viewInvoiceDetails": "عرض تفاصيل الفاتورة",
-  "outPatient": "مريض خارجي",
   "invoiceDetails": "تفاصيل الفاتورة",
   "sendingEmailPleaseWait": "جاري إرسال ال<D8A7><D984>ريد الإلكتروني، يرجى الانتظار...",
   "emailSentSuccessfullyMessage": "تم إرسال البريد الإلكتروني بنجاح.",
@@ -1946,7 +1945,7 @@
   "transactions": "المعاملات",
   "pharmacy": "الصيدلية",
   "visitsOrders": "الزيارات/الطلبات",
-  "earned": "حصل",
+  "earned": "مكتسب",
   "getParkingQR": "الحصول على رمز الاستجابة السريعة لوقوف السيارات",
   "cannotOpenThisFile": "لا يمكن فتح هذا الملف",
   "refundDetails": "تفاصيل الاسترداد",

lib/core/api_consts.dart

@@ -5,7 +5,7 @@ import 'package:hmg_patient_app_new/core/enums.dart';
 class ApiConsts {
   static const maxSmallScreen = 660;
 
-  static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.prod;
+  static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.uat;
 
   // static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT
 
@@ -301,7 +301,7 @@ class ApiConsts {
   static String googleCloudStorageENTranslationFileBaseURL = "https://storage.googleapis.com/hmg-patientapp-translations";
 
   // ************     static values for Api   ****************
-  static final double appVersionID = 21.6;
+  static final double appVersionID = 21.7;
 
   // static final double appVersionID = 50.7;
   static final int appChannelId = 3;

lib/core/services/turnstile_service.dart

@@ -18,6 +18,10 @@ class TurnstileService {
     // Initialize an instance of invisible Cloudflare Turnstile with your site key
     final turnstile = CloudflareTurnstile.invisible(
       siteKey: _siteKey,
+      onTimeout: () {},
+      options: TurnstileOptions(
+        retryInterval: const Duration(milliseconds: 2000),
+      ),
     );
 
     try {

lib/core/utils/push_notification_handler.dart

@@ -19,7 +19,12 @@ import 'package:hmg_patient_app_new/core/api/api_client.dart';
 import 'package:hmg_patient_app_new/core/api_consts.dart';
 import 'package:hmg_patient_app_new/core/cache_consts.dart';
 import 'package:hmg_patient_app_new/core/dependencies.dart';
+import 'package:hmg_patient_app_new/core/utils/date_util.dart';
 import 'package:hmg_patient_app_new/core/utils/utils.dart';
+import 'package:hmg_patient_app_new/features/notifications/models/resp_models/notification_response_model.dart';
+import 'package:hmg_patient_app_new/presentation/notifications/notification_details_page.dart';
+import 'package:hmg_patient_app_new/services/navigation_service.dart';
+import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:uuid/uuid.dart';
 
@@ -523,6 +528,26 @@ class PushNotificationHandler {
       _incomingCall(remoteMessage.data);
       // showCallkitIncoming();
     } else {
+      NotificationResponseModel notification = NotificationResponseModel();
+
+      notification.createdOn = DateUtil.convertDateToString(DateTime.now());
+      notification.isSentOn = DateUtil.convertDateToString(DateTime.now());
+      notification.messageTypeData = remoteMessage.data['picture'];
+      notification.messageType = notification.messageTypeData != null && notification.messageTypeData!.isNotEmpty ? "image" : "";
+      notification.message = remoteMessage.data['message'];
+      notification.notificationType = remoteMessage.data["NotificationType"].toString();
+      if (remoteMessage.data["NotificationType"] == "2") {
+        notification.videoURL = remoteMessage.data["VideoUrl"];
+      }
+
+      Navigator.of(getIt.get<NavigationService>().navigatorKey.currentContext!).push(
+        CustomPageRoute(
+          page: NotificationDetailsPage(
+            notification: notification,
+          ),
+        ),
+      );
+
       // GetNotificationsResponseModel notification = new GetNotificationsResponseModel();
       //
       // notification.createdOn = DateUtil.convertDateToString(DateTime.now());

lib/features/authentication/authentication_view_model.dart

@@ -3,6 +3,7 @@ import 'dart:developer';
 import 'dart:io';
 
 import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart' show rootBundle;
 import 'package:get_it/get_it.dart';
@@ -979,6 +980,7 @@ class AuthenticationViewModel extends ChangeNotifier {
     // TODO: GET APP SMS SIGNATURE HERE
     request.sMSSignature = await getSignature();
 
+    if(!kDebugMode) {
       // Get Turnstile token if configured
       final turnstileToken = await _turnstileService.getTurnstileToken();
       if (turnstileToken != null) {
@@ -986,6 +988,7 @@ class AuthenticationViewModel extends ChangeNotifier {
       } else {
         request.turnstileToken = "";
       }
+    }
 
     if (isNeedLoading) {
       LoaderBottomSheet.showLoader();
@@ -998,7 +1001,10 @@ class AuthenticationViewModel extends ChangeNotifier {
         sendActivationCodeReq: request, isRegister: checkIsUserComingForRegister(request: payload), languageID: 'er', isFormFamilyFile: isFormFamilyFile);
 
     resultEither.fold(
-      (failure) async => await _errorHandlerService.handleError(failure: failure),
+      (failure) async {
+        LoaderBottomSheet.hideLoader();
+        await _errorHandlerService.handleError(failure: failure);
+      },
       (apiResponse) async {
         if (isFormFamilyFile) {
           if (apiResponse.data['PatientShareRequestID'] != null && apiResponse.data['PatientShareRequestID'] == 0 && apiResponse.messageStatus == 1) {

lib/presentation/appointments/widgets/appointment_doctor_card.dart

@@ -127,9 +127,9 @@ class AppointmentDoctorCard extends StatelessWidget {
                         runSpacing: 6.h,
                         children: [
                           AppCustomChipWidget(
-                            labelText: (patientAppointmentHistoryResponseModel.clinicName!.length > 20
+                            labelText: ((patientAppointmentHistoryResponseModel.clinicName ?? "").length > 20
-                                ? '${patientAppointmentHistoryResponseModel.clinicName!.substring(0, 20)}...'
+                                ? '${(patientAppointmentHistoryResponseModel.clinicName ?? "").substring(0, 20)}...'
-                                : patientAppointmentHistoryResponseModel.clinicName!),
+                                : (patientAppointmentHistoryResponseModel.clinicName ?? "")),
                             labelPadding: EdgeInsetsDirectional.only(start: 4.w, end: 4.w),
                           ),
                           AppCustomChipWidget(

lib/presentation/habib_wallet/habib_wallet_page.dart

@@ -89,7 +89,7 @@ class _HabibWalletState extends State<HabibWalletPage> {
                                 "${appState.getAuthenticatedUser()!.firstName!} ${appState.getAuthenticatedUser()!.lastName!}"
                                     .toText19(isBold: true, color: Colors.white),
                                 "${LocaleKeys.fileno.tr(context: context)}: ${appState.getAuthenticatedUser()!.patientId!}"
-                                    .toText14(isBold: true, color: AppColors.greyTextColor, isEnglishOnly: true),
+                                    .toText14(isBold: true, color: AppColors.greyTextColor),
                               ],
                             ).expanded,
                             Utils.buildSvgWithAssets(icon: AppAssets.habiblogo, width: 24.h, height: 24.h, applyThemeColor: false),

lib/presentation/home/lakum_wallet_details.dart

@@ -17,6 +17,7 @@ import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart';
 import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
 import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
+import 'dart:ui' as ui;
 
 class LakumWalletDetails extends StatelessWidget {
   const LakumWalletDetails({super.key});
@@ -239,10 +240,10 @@ class LakumWalletDetails extends StatelessWidget {
     return CustomButton(
       height: 46.h,
       icon: AppAssets.redeem_icon,
-      iconColor: AppColors.whiteColor,
+      iconColor: AppColors.textColor,
       iconSize: 24.h,
       backgroundColor: AppColors.habibPharmacyColor,
-      textColor: AppColors.whiteColor,
+      textColor: AppColors.textColor,
       text: LocaleKeys.redeem.tr(context: context),
       borderWidth: 0.w,
       fontWeight: FontWeight.w600,
@@ -350,7 +351,10 @@ class LakumWalletDetails extends StatelessWidget {
                 maxlines: 2,
               ),
               SizedBox(height: 2.h),
-              formattedDate.toText12(color: AppColors.greyTextColor),
+              Directionality(
+                textDirection: ui.TextDirection.ltr,
+                child: formattedDate.toText12(color: AppColors.greyTextColor),
+              ),
             ],
           ),
         ),
@@ -363,10 +367,10 @@ class LakumWalletDetails extends StatelessWidget {
               isBold: true,
               color: transactionColor,
             ),
-            if (transaction.amount != null && transaction.amount! > 0)
+            // if (transaction.amount != null && transaction.amount! > 0)
-              "${transaction.amount?.toStringAsFixed(2) ?? "0.00"} SAR".toText11(
+            //   "${transaction.amount?.toStringAsFixed(2) ?? "0.00"} SAR".toText11(
-                color: AppColors.greyTextColor,
+            //     color: AppColors.greyTextColor,
-              ),
+            //   ),
           ],
         ),
       ],

lib/presentation/notifications/notification_details_page.dart

@@ -1,11 +1,13 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenshot_blocker/flutter_screenshot_blocker.dart';
+import 'package:hmg_patient_app_new/core/dependencies.dart';
 import 'package:hmg_patient_app_new/core/utils/date_util.dart';
 import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
 import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
 import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
 import 'package:hmg_patient_app_new/features/notifications/models/resp_models/notification_response_model.dart';
+import 'package:hmg_patient_app_new/features/notifications/notifications_view_model.dart';
 import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
 import 'package:hmg_patient_app_new/widgets/appbar/collapsing_list_view.dart';
@@ -21,6 +23,7 @@ class NotificationDetailsPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    getIt.get<NotificationsViewModel>().markAsRead(notificationID: notification.id ?? 0);
     return ScreenshotBlockerWidget(
       blockScreenshots: true, // makes this widget appear black in screenshots
       detectScreenshots: true, // listen for screenshot attempts

lib/presentation/notifications/notifications_list_page.dart

@@ -108,9 +108,7 @@ class _NotificationsListPageState extends State<NotificationsListPage> {
                                       Expanded(
                                         child: notificationsVM.notificationsList[index].message!.toText16(
                                           isBold: (notificationsVM.notificationsList[index].isRead == false),
-                                                  weight: (notificationsVM.notificationsList[index].isRead == false)
+                                          weight: (notificationsVM.notificationsList[index].isRead == false) ? FontWeight.w600 : FontWeight.w400,
-                                                      ? FontWeight.w600
-                                                      : FontWeight.w400,
                                         ),
                                       ),
                                       SizedBox(width: 8.w),
@@ -144,11 +142,7 @@ class _NotificationsListPageState extends State<NotificationsListPage> {
                                             children: [
                                               Icon(Icons.access_time, size: 12.w, color: AppColors.textColor),
                                               SizedBox(width: 4.w),
-                                                      _formatTime(notificationsVM.notificationsList[index].isSentOn).toText10(
+                                              _formatTime(notificationsVM.notificationsList[index].isSentOn).toText10(weight: FontWeight.w600, color: AppColors.textColor, isEnglishOnly: true),
-                                                        weight: FontWeight.w600,
-                                                        color: AppColors.textColor,
-                                                        isEnglishOnly: true
-                                                      ),
                                             ],
                                           ),
                                         ),
@@ -168,11 +162,7 @@ class _NotificationsListPageState extends State<NotificationsListPage> {
                                             children: [
                                               Icon(Icons.calendar_today, size: 12.w, color: AppColors.textColor),
                                               SizedBox(width: 4.w),
-                                                      _formatDate(notificationsVM.notificationsList[index].isSentOn).toText10(
+                                              _formatDate(notificationsVM.notificationsList[index].isSentOn).toText10(weight: FontWeight.w600, color: AppColors.textColor, isEnglishOnly: true),
-                                                        weight: FontWeight.w600,
-                                                        color: AppColors.textColor,
-                                                        isEnglishOnly: true
-                                                      ),
                                             ],
                                           ),
                                         ),
@@ -191,8 +181,7 @@ class _NotificationsListPageState extends State<NotificationsListPage> {
                                     ],
                                   ),
                                   // Second row: Contains Image chip (if MessageType is "image")
-                                          if (notificationsVM.notificationsList[index].messageType != null &&
+                                  if (notificationsVM.notificationsList[index].messageType != null && notificationsVM.notificationsList[index].messageType!.toLowerCase() == "image")
-                                              notificationsVM.notificationsList[index].messageType!.toLowerCase() == "image")
                                     Padding(
                                       padding: EdgeInsets.only(top: 8.h),
                                       child: Row(

lib/widgets/common_bottom_sheet.dart

@@ -273,9 +273,9 @@ void showCommonBottomSheetWithoutHeight(
           if (navContext != null && Navigator.canPop(navContext)) {
             Navigator.of(navContext).pop();
           }
-          if (callBackFunc != null) {
+          // if (callBackFunc != null) {
-            callBackFunc();
+          //   callBackFunc();
-          }
+          // }
         });
       }
       return SafeArea(