Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App

# Conflicts:
#	lib/pages/DrawerPages/notifications/notification_details_page.dart

lib/config/config.dart

@@ -359,7 +359,7 @@ var CAN_PAY_FOR_FOR_WALKIN_APPOINTMENT = 'Services/Doctors.svc/REST/CanPayForWal
 var CHANNEL = 3;
 var GENERAL_ID = 'Cs2020@2016\$2958';
 var IP_ADDRESS = '10.20.10.20';
-var VERSION_ID = 20.5;
+var VERSION_ID = 20.7;
 var SETUP_ID = '91877';
 var LANGUAGE = 2;
 // var  PATIENT_OUT_SA = 0;

lib/pages/DrawerPages/notifications/notification_details_page.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:flutter_screenshot_blocker/flutter_screenshot_blocker.dart';
 import 'package:hmg_patient_app/core/model/notifications/get_notifications_response_model.dart';
 import 'package:hmg_patient_app/core/viewModels/notifications_view_model.dart';
 import 'package:hmg_patient_app/core/viewModels/project_view_model.dart';
@@ -71,7 +72,16 @@ class _NotificationsDetailsPageState extends State<NotificationsDetailsPage> {
     ProjectViewModel projectViewModel = Provider.of(context);
     NotificationViewModel notificationViewModel = Provider.of(context);
     notificationViewModel.markAsRead(widget.notification.id);
-    return AppScaffold(
+    return ScreenshotBlockerWidget(
+      blockScreenshots: true,       // makes this widget appear black in screenshots
+      detectScreenshots: true,      // listen for screenshot attempts
+      onScreenshotDetected: (event) {
+        // event.type → 'screenshot_taken' or 'screenshot_blocked'
+        // ScaffoldMessenger.of(context).showSnackBar(
+        //   SnackBar(content: Text('Screenshots are not allowed!')),
+        // );
+      },
+      child: AppScaffold(
         isShowAppBar: true,
         showNewAppBar: true,
         showNewAppBarTitle: true,
@@ -159,6 +169,7 @@ class _NotificationsDetailsPageState extends State<NotificationsDetailsPage> {
             // ),
           ],
         ),
+      ),
     );
   }
 }

lib/pages/livecare/livecare_type_select.dart

@@ -103,7 +103,7 @@ class _LiveCareTypeSelectState extends State<LiveCareTypeSelect> {
                 children: [
                   _loginOptionButton(TranslationBase.of(context).livecareOption1, 'assets/images/new/Live_Care.svg', 1),
                   _loginOptionButton(TranslationBase.of(context).livecareOption4, 'assets/images/new/book appointment.svg', 2),
-                  _loginOptionButton(TranslationBase.of(context).pharmaLiveCare, 'assets/images/new/pharma.svg', 3, isEnable: projectViewModel.havePrivilege(99)),
+                  // _loginOptionButton(TranslationBase.of(context).pharmaLiveCare, 'assets/images/new/pharma.svg', 3, isEnable: projectViewModel.havePrivilege(99)),
                 ],
               ),
               SizedBox(

lib/pages/livecare/widgets/LiveCarePendingRequest.dart

@@ -108,7 +108,7 @@ class _LiveCarePendingRequestState extends State<LiveCarePendingRequest> {
                 mHeight(12.0),
                 Container(
                   child: DefaultButton(TranslationBase.of(context).callLiveCareSupport, () {
-                    launchUrl(Uri.parse("tel://" + "011 525 9553"));
+                    launchUrl(Uri.parse("tel://" + "966 11 525 9553"));
                     // cancelLiveCareRequest();
                   }),
                 ),

lib/pages/login/confirm-login.dart

@@ -180,7 +180,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
                                     // user!.editedOn != null
                                     //     ? DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(user!.editedOn!))
                                     //     :
-                                    user!.createdOn != null ? DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(user!.createdOn!)) : '--',
+                                    (user!.createdOn != null || user!.createdOn != "null") ? DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(user!.createdOn!)) : '--',
                                     style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.48),
                                   ),
                                 ],

lib/services/authentication/auth_provider.dart

@@ -158,6 +158,8 @@ class AuthProvider with ChangeNotifier {
       print(imei);
       Map<String, dynamic> request = {};
       request['IMEI'] = imei;
+      // request['IMEI'] = "c1wqiJvLQJyqDTUss_gEEY:APA91bGZL1Cw-rraPTZjtPYJbh_tTDPZ0SEUaHOb1W14R4nl9tCMYobhwmjTHx8xvtwqY0b25NxaLb7-hQIj1rBdblmffhc9FnofZi6DNOFhvachv2G_Km4";
+      // request['IMEI'] = "fIIkruERSt6sBze-ZAe5EL:APA91bH9aIVR6vrICryFJv_MTwsAvyoL48jIHyGnTiN9ZYf-B9cg-d-9zKaFWR54dO9htemHtkgqsOauzAHi265DM6tiuapxTegrsS0s7g4ivZXVfkX1ELM";
       request['LanguageID'] = languageID;
 
       await BaseAppClient().post(SELECT_DEVICE_IMEI, onSuccess: (dynamic response, int statusCode) async {

pubspec.yaml

@@ -1,8 +1,8 @@
 name: hmg_patient_app
 description: A new Flutter application.
 
-#version: 4.6.033+1
+#version: 4.6.035+1
-version: 4.6.0988+40500988
+version: 4.6.0990+40500990
 
 environment:
   #  sdk: ">=3.0.0 <3.13.0"
@@ -145,6 +145,7 @@ dependencies:
   #  vital_sign_camera:
   #   path: ./packages/vital_sign_camera
   readmore: ^3.0.0
+  flutter_screenshot_blocker: ^1.0.4
 
 dependency_overrides:
   intl: ^0.20.2