Merge branch 'refs/heads/master' into offers_discounts

lib/core/api_consts.dart

@@ -310,7 +310,7 @@ class ApiConsts {
   static String pomsPaymentResult(int orderId) => '$pomsBaseUrl/api/v1/mobile/orders/$orderId/payment-result';
 
   // ************     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

@@ -998,7 +998,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/features/contact_us/contact_us_view_model.dart

@@ -15,6 +15,19 @@ import 'package:hmg_patient_app_new/services/error_handler_service.dart';
 import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart';
 import 'package:permission_handler/permission_handler.dart';
 
+/// Class to store feedback attachment data
+class FeedbackAttachment {
+  final String base64String;
+  final File file;
+  final String fileName;
+
+  FeedbackAttachment({
+    required this.base64String,
+    required this.file,
+    required this.fileName,
+  });
+}
+
 class ContactUsViewModel extends ChangeNotifier {
   ContactUsRepo contactUsRepo;
   ErrorHandlerService errorHandlerService;
@@ -35,7 +48,7 @@ class ContactUsViewModel extends ChangeNotifier {
 
   String? chatRequestID;
 
-  List<String> feedbackAttachmentList = [];
+  List<FeedbackAttachment> feedbackAttachmentList = [];
 
   List<COCItem> cocItemsList = [];
   bool isCOCItemsListLoading = false;
@@ -168,13 +181,20 @@ class ContactUsViewModel extends ChangeNotifier {
     notifyListeners();
   }
 
-  addFeedbackAttachment(String attachmentPath) {
+  addFeedbackAttachment(String base64String, File file) {
-    feedbackAttachmentList.add(attachmentPath);
+    // Extract filename from file path
+    final fileName = file.path.split('/').last;
+    
+    feedbackAttachmentList.add(FeedbackAttachment(
+      base64String: base64String,
+      file: file,
+      fileName: fileName,
+    ));
     notifyListeners();
   }
 
-  removeFeedbackAttachment(String attachmentPath) {
+  removeFeedbackAttachment(FeedbackAttachment attachment) {
-    feedbackAttachmentList.remove(attachmentPath);
+    feedbackAttachmentList.remove(attachment);
     notifyListeners();
   }
 
@@ -282,7 +302,7 @@ class ContactUsViewModel extends ChangeNotifier {
 
   Future<void> insertCOCItem({required String subject, required String message, Function(dynamic)? onSuccess, Function(String)? onError}) async {
     RequestInsertCOCItem requestInsertCOCItem = RequestInsertCOCItem();
-    requestInsertCOCItem.attachment = feedbackAttachmentList.isNotEmpty ? feedbackAttachmentList.first : "";
+    requestInsertCOCItem.attachment = feedbackAttachmentList.isNotEmpty ? feedbackAttachmentList.first.base64String : "";
     requestInsertCOCItem.title = subject;
     requestInsertCOCItem.details = message;
     requestInsertCOCItem.cOCTypeName = selectedFeedbackType.id.toString();
@@ -291,7 +311,7 @@ class ContactUsViewModel extends ChangeNotifier {
     requestInsertCOCItem.isUserLoggedIn = true;
     requestInsertCOCItem.projectID = 0;
     requestInsertCOCItem.patientName = "${appState.getAuthenticatedUser()!.firstName!} ${appState.getAuthenticatedUser()!.lastName!}";
-    requestInsertCOCItem.fileName = "Image 1";
+    requestInsertCOCItem.fileName = feedbackAttachmentList.isNotEmpty ? feedbackAttachmentList.first.fileName : "";
     requestInsertCOCItem.appVersion = ApiConsts.appVersionID;
     requestInsertCOCItem.uILanguage = appState.isArabic() ? "ar" : "en";
     requestInsertCOCItem.browserInfo = Platform.localHostname;

lib/presentation/contact_us/feedback_page.dart

@@ -354,11 +354,10 @@ class FeedbackPage extends StatelessWidget {
               ImageOptions.showImageOptionsNew(
                 context,
                 true,
-                (String image, file) {
+                (String base64Image, file) {
-                  print(image);
+                  // base64Image: The base64-encoded image string
-                  print(file);
+                  // file: The File object
-                  // Navigator.pop(context);
+                  contactUsViewModel.addFeedbackAttachment(base64Image, file);
-                  contactUsViewModel.addFeedbackAttachment(image);
                 },
               );
             },
@@ -385,13 +384,16 @@ class FeedbackPage extends StatelessWidget {
                   child: ListView.builder(
                     padding: EdgeInsets.all(16.h),
                     shrinkWrap: true,
+                    physics: NeverScrollableScrollPhysics(),
                     itemCount: contactUsViewModel.feedbackAttachmentList.length,
                     itemBuilder: (BuildContext context, int index) {
+                      final attachment = contactUsViewModel.feedbackAttachmentList[index];
                       return Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
-                          Row(
+                          Expanded(
+                            child: Row(
                               crossAxisAlignment: CrossAxisAlignment.start,
                               children: [
                                 Icon(
@@ -399,11 +401,14 @@ class FeedbackPage extends StatelessWidget {
                                   color: Color(0xff2B353E),
                                 ),
                                 SizedBox(width: 8.w),
-                              "Image ${index + 1}".toText14().paddingOnly(bottom: 8.h),
+                                Expanded(
+                                  child: attachment.fileName.toText14().paddingOnly(bottom: 8.h),
+                                ),
                               ],
                             ),
+                          ),
                           Utils.buildSvgWithAssets(icon: AppAssets.cancel_circle_icon).onPress(() {
-                            contactUsViewModel.removeFeedbackAttachment(contactUsViewModel.feedbackAttachmentList[index]);
+                            contactUsViewModel.removeFeedbackAttachment(attachment);
                           }),
                         ],
                       );

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/attachment_options.dart

@@ -48,7 +48,8 @@ class AttachmentOptions extends StatelessWidget {
         ).onPress(() async {
           await onGalleryTap();
         }),
-        if (!showFilesOption) SizedBox(height: 16.h),
+        // if (!showFilesOption) commented because the ui issue.
+          SizedBox(height: 16.h),
         if (showFilesOption)
           checkInOptionCard(
             appState,