Update to stores VersionID 9.6

ios/Runner.xcodeproj/project.pbxproj

@@ -212,7 +212,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
-				LastUpgradeCheck = 1500;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "The Chromium Authors";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -355,19 +355,23 @@
 				"${BUILT_PRODUCTS_DIR}/Try/Try.framework",
 				"${BUILT_PRODUCTS_DIR}/barcode_scan2/barcode_scan2.framework",
 				"${BUILT_PRODUCTS_DIR}/connectivity/connectivity.framework",
-				"${BUILT_PRODUCTS_DIR}/device_info/device_info.framework",
 				"${BUILT_PRODUCTS_DIR}/file_picker/file_picker.framework",
-				"${BUILT_PRODUCTS_DIR}/flutter_inappwebview/flutter_inappwebview.framework",
+				"${BUILT_PRODUCTS_DIR}/flutter_inappwebview_ios/flutter_inappwebview_ios.framework",
 				"${BUILT_PRODUCTS_DIR}/flutter_keyboard_visibility/flutter_keyboard_visibility.framework",
 				"${BUILT_PRODUCTS_DIR}/fluttertoast/fluttertoast.framework",
 				"${BUILT_PRODUCTS_DIR}/local_auth_ios/local_auth_ios.framework",
 				"${BUILT_PRODUCTS_DIR}/maps_launcher/maps_launcher.framework",
 				"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
 				"${BUILT_PRODUCTS_DIR}/path_provider_foundation/path_provider_foundation.framework",
+				"${BUILT_PRODUCTS_DIR}/pointer_interceptor_ios/pointer_interceptor_ios.framework",
 				"${BUILT_PRODUCTS_DIR}/shared_preferences_foundation/shared_preferences_foundation.framework",
 				"${BUILT_PRODUCTS_DIR}/speech_to_text/speech_to_text.framework",
 				"${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework",
 				"${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/ZoomVideoSDK/CptShare/CptShare.framework/CptShare",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/ZoomVideoSDK/ZoomVideoSDK/ZoomVideoSDK.framework/ZoomVideoSDK",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/ZoomVideoSDK/zm_annoter_dynamic/zm_annoter_dynamic.framework/zm_annoter_dynamic",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/ZoomVideoSDK/zoomcml/zoomcml.framework/zoomcml",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -392,19 +396,23 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Try.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/barcode_scan2.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_picker.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_inappwebview.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_inappwebview_ios.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_keyboard_visibility.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fluttertoast.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/local_auth_ios.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/maps_launcher.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_foundation.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/pointer_interceptor_ios.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_foundation.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/speech_to_text.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CptShare.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ZoomVideoSDK.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/zm_annoter_dynamic.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/zoomcml.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -453,6 +461,7 @@
 /* Begin XCBuildConfiguration section */
 		249021D3217E4FDB00AE95B9 /* Profile */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -505,13 +514,15 @@
 		};
 		249021D4217E4FDB00AE95B9 /* Profile */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = E333B59AA5538E0304102FD2 /* Pods-Runner.profile.xcconfig */;
+			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 3A359E86ZF;
 				ENABLE_BITCODE = NO;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
@@ -526,7 +537,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.3.99;
+				MARKETING_VERSION = 1.4.19;
 				PRODUCT_BUNDLE_IDENTIFIER = com.hmg.hmgDr;
 				PRODUCT_NAME = Runner;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -537,7 +548,7 @@
 		};
 		97C147031CF9000F007C117D /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9740EEB31CF90195004384FC /* Generated.xcconfig */;
+			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -595,6 +606,7 @@
 		};
 		97C147041CF9000F007C117D /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -649,13 +661,15 @@
 		};
 		97C147061CF9000F007C117D /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = C55D4AE245B71956447BA22F /* Pods-Runner.debug.xcconfig */;
+			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 3A359E86ZF;
 				ENABLE_BITCODE = NO;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
@@ -670,7 +684,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.3.99;
+				MARKETING_VERSION = 1.4.19;
 				PRODUCT_BUNDLE_IDENTIFIER = com.hmg.hmgDr;
 				PRODUCT_NAME = Runner;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -682,14 +696,16 @@
 		};
 		97C147071CF9000F007C117D /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = C8801C5E6B82B6CB497CA5C7 /* Pods-Runner.release.xcconfig */;
+			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerRelease.entitlements;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 3A359E86ZF;
 				ENABLE_BITCODE = NO;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
@@ -704,7 +720,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.3.99;
+				MARKETING_VERSION = 1.4.19;
 				PRODUCT_BUNDLE_IDENTIFIER = com.hmg.hmgDr;
 				PRODUCT_NAME = Runner;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

lib/config/config.dart

@@ -9,11 +9,11 @@ const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/';
 
 const DOCTOR_ROTATION = 'https://doctorrota.hmg.com/';
 
-const BASE_URL = 'https://hmgwebservices.com/';
+// const BASE_URL = 'https://hmgwebservices.com/';
 // const BASE_URL = 'http://10.20.200.111:1010/';
 // const BASE_URL = 'https://uat.hmgwebservices.com/';
 
-// const BASE_URL = 'https://hmgwebservices.com/';
+const BASE_URL = 'https://hmgwebservices.com/';
 
 // const BASE_URL = 'https://uat.hmgwebservices.com/';
 
@@ -413,7 +413,7 @@ const TRANSACTION_NO = 0;
 const LANGUAGE_ID = 2;
 const STAMP = '2020-04-27T12:17:17.721Z';
 const IP_ADDRESS = '9.9.9.9';
-const VERSION_ID = 9.5;
+const VERSION_ID = 9.6;
 const CHANNEL = 9;
 const SESSION_ID = 'BlUSkYymTt';
 const IS_LOGIN_FOR_DOCTOR_APP = true;

lib/core/service/authentication_service.dart

@@ -40,13 +40,13 @@ class AuthenticationService extends BaseService {
     try {
       await baseAppClient.post(SELECT_DEVICE_IMEI, onSuccess: (dynamic response, int statusCode) {
         _imeiDetails = [];
-        response['List_DoctorDeviceDetails'].forEach((v) {
+        response['List_DoctorDeviceDetails']?.forEach((v) {
           _imeiDetails.add(GetIMEIDetailsModel.fromJson(v));
         });
       }, onFailure: (String error, int statusCode) {
         hasError = true;
         super.error = error;
-      }, body: {"IMEI": imei, "TokenID": "@dm!n"});
+      }, body: {"IMEI": imei, });
     } catch (error) {
       hasError = true;
       super.error = error.toString();

lib/core/service/patient/ReferralService.dart

@@ -1,4 +1,6 @@
 import 'package:doctor_app_flutter/config/config.dart';
+import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
+import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart';
 import 'package:doctor_app_flutter/core/model/referral/ReferralRequest.dart';
 import 'package:doctor_app_flutter/core/service/base/base_service.dart';
 
@@ -14,8 +16,10 @@ class ReferralService extends BaseService {
       int? frequency,
       String? referringDoctorRemarks,
       String? extension}) async {
-    await getDoctorProfile();
+   // await getDoctorProfile();
     ReferralRequest referralRequest = ReferralRequest();
+    Map<String, dynamic>? profile = await sharedPref.getObj(DOCTOR_PROFILE);
+    DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile!);
     referralRequest.admissionNo = admissionNo;
     referralRequest.roomID = roomID;
     referralRequest.referralClinic = referralClinic.toString();

lib/screens/home/home_screen.dart

@@ -80,9 +80,7 @@ class _HomeScreenState extends State<HomeScreen> {
 
     return BaseView<DashboardViewModel>(
       onModelReady: (model) async {
-        model
+        model.startHomeScreenServices(projectsProvider, authenticationViewModel).then((value) {
-            .startHomeScreenServices(projectsProvider, authenticationViewModel)
-            .then((value) {
           WidgetsBinding.instance.addPostFrameCallback((_) async {
             if (model.radiologyCriticalFindingModel != null) {
               print("onModelReady radiologyCriticalFindingModel!!!");
@@ -113,12 +111,9 @@ class _HomeScreenState extends State<HomeScreen> {
                     //TODO Elham* make it componet
                     Container(
                       width: 40,
-                      margin: EdgeInsets.only(
+                      margin: EdgeInsets.only(left: projectsProvider.isArabic ? 0 : 32, right: projectsProvider.isArabic ? 23 : 0),
-                          left: projectsProvider.isArabic ? 0 : 32,
-                          right: projectsProvider.isArabic ? 23 : 0),
                       child: IconButton(
-                        icon: SvgPicture.asset('assets/images/svgs/menu.svg',
+                        icon: SvgPicture.asset('assets/images/svgs/menu.svg', height: 25, width: 10),
-                            height: 25, width: 10),
                         iconSize: 15,
                         color: Colors.black,
                         onPressed: () => Scaffold.of(context).openDrawer(),
@@ -126,8 +121,6 @@ class _HomeScreenState extends State<HomeScreen> {
                     ),
 
                     Column(children: <Widget>[
-
-
                       //
                       // InkWell(onTap: (){
                       //   AppPermissionsUtils.requestVideoCallPermission(
@@ -322,14 +315,10 @@ class _HomeScreenState extends State<HomeScreen> {
     );
   }
 
-  showRadiologyFindingDialog(DashboardViewModel model) async{
+  showRadiologyFindingDialog(DashboardViewModel model) async {
-    await Utils.showConfirmationDialog(
+    await Utils.showConfirmationDialog(context, model.radiologyCriticalFindingModel?.notificationMesssage ?? 'test radiology', () async {
-        context, model.radiologyCriticalFindingModel?.notificationMesssage ??'test radiology',
-        () async {
       GifLoaderDialogUtils.showMyDialog(context);
-      await model.acknowledgeRadiologyCriticalFinding(
+      await model.acknowledgeRadiologyCriticalFinding(model.radiologyCriticalFindingModel?.invoiceNo?.toString() ?? '', model.radiologyCriticalFindingModel?.invoiceLineItemNo?.toString() ?? '');
-          model.radiologyCriticalFindingModel?.invoiceNo?.toString() ?? '',
-          model.radiologyCriticalFindingModel?.invoiceLineItemNo?.toString() ?? '');
       GifLoaderDialogUtils.hideDialog(context);
       Navigator.of(context).pop();
     }, isShowCancelButton: false);
@@ -351,27 +340,19 @@ class _HomeScreenState extends State<HomeScreen> {
     _showErrorBottomSheet(context, TranslationBase.of(context).youHavePendingInterventions);
   }
 
-  List<Widget> homePatientsCardsWidget(
+  List<Widget> homePatientsCardsWidget(DashboardViewModel model, projectsProvider) {
-      DashboardViewModel model, projectsProvider) {
     colorIndex = 0;
 
     List<LinearGradient> backgroundColors = [];
-    backgroundColors.add(LinearGradient(
+    backgroundColors.add(LinearGradient(begin: Alignment(-1.0, -2.0), end: Alignment(1.0, 2.0), colors: [
-        begin: Alignment(-1.0, -2.0),
+      AppGlobal.appRedColor,
-        end: Alignment(1.0, 2.0),
+      Color(0xFFAD3B3B),
-        colors: [
+    ])); //AppGlobal.appRedColor;
-          AppGlobal.appRedColor,
+    backgroundColors.add(LinearGradient(begin: Alignment.center, end: Alignment.center, colors: [
-          Color(0xFFAD3B3B),
-        ])); //AppGlobal.appRedColor;
-    backgroundColors.add(
-        LinearGradient(begin: Alignment.center, end: Alignment.center, colors: [
       Color(0xFFC9C9C9),
       Color(0xFFC9C9C9),
     ]));
-    backgroundColors.add(LinearGradient(
+    backgroundColors.add(LinearGradient(begin: Alignment.center, end: Alignment.center, colors: [Color(0xFF71787E), AppGlobal.appTextColor]));
-        begin: Alignment.center,
-        end: Alignment.center,
-        colors: [Color(0xFF71787E), AppGlobal.appTextColor]));
     List<Color> backgroundIconColors = [];
     backgroundIconColors.add(Colors.white12);
     backgroundIconColors.add(Colors.white38);
@@ -390,8 +371,7 @@ class _HomeScreenState extends State<HomeScreen> {
         cardIcon: DoctorApp.livecare,
         textColor: textColors[colorIndex],
         iconSize: 21,
-        text:
+        text: "${TranslationBase.of(context).liveCare}\n${TranslationBase.of(context).patients}",
-            "${TranslationBase.of(context).liveCare}\n${TranslationBase.of(context).patients}",
         onTap: () {
           // TODO MOSA TEST
           // PatiantInformtion patient = PatiantInformtion(
@@ -438,22 +418,19 @@ class _HomeScreenState extends State<HomeScreen> {
     ));
     changeColorIndex();
 
-    if (model.doctorProfile !=null && !Utils.isVidaPlusInPatientProject(projectsProvider, model.doctorProfile!.projectID!)) {
+    if (model.doctorProfile != null && !Utils.isVidaPlusInPatientProject(projectsProvider, model.doctorProfile!.projectID!)) {
       patientCards.add(HomePatientCard(
         gradient: backgroundColors[colorIndex],
         backgroundIconColor: backgroundIconColors[colorIndex],
         cardIcon: DoctorApp.inpatient,
         textColor: textColors[colorIndex],
-        text: TranslationBase
+        text: TranslationBase.of(context).myInPatient,
-            .of(context)
-            .myInPatient,
         onTap: () {
           Navigator.push(
             context,
             FadePage(
               page: InPatientScreen(
-                specialClinic: model.getSpecialClinic(
+                specialClinic: model.getSpecialClinic(clinicId ?? projectsProvider.doctorClinicsList[0].clinicID),
-                  clinicId ?? projectsProvider.doctorClinicsList[0].clinicID),
               ),
             ),
           );
@@ -469,12 +446,10 @@ class _HomeScreenState extends State<HomeScreen> {
         cardIcon: DoctorApp.search_medicines,
         textColor: textColors[2],
         text: TranslationBase.of(context).interventionPharmacyApproval,
-        fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: width) *
+        fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: width) * (SizeConfig.isHeightVeryShort ? 10 : 9),
-            (SizeConfig.isHeightVeryShort ? 10 : 9),
         onTap: () {
           if (!model.isInfectiousDiseaseConsultant) {
-            DrAppToastMsg.showErrorToast(
+            DrAppToastMsg.showErrorToast(TranslationBase.of(context).unableToPerformTheAction);
-                TranslationBase.of(context).unableToPerformTheAction);
           }
           Navigator.push(
               context,
@@ -511,19 +486,13 @@ class _HomeScreenState extends State<HomeScreen> {
       textColor: textColors[colorIndex],
       text: TranslationBase.of(context).myOutPatient_2lines,
       onTap: () {
-        String date = AppDateUtils.convertDateToFormat(
+        String date = AppDateUtils.convertDateToFormat(DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day), 'yyyy-MM-dd');
-            DateTime(
-                DateTime.now().year, DateTime.now().month, DateTime.now().day),
-            'yyyy-MM-dd');
 
         Navigator.push(
             context,
             MaterialPageRoute(
               builder: (context) => OutPatientsScreen(
-                patientSearchRequestModel: PatientSearchRequestModel(
+                patientSearchRequestModel: PatientSearchRequestModel(from: date, to: date, doctorID: authenticationViewModel.doctorProfile!.doctorID),
-                    from: date,
-                    to: date,
-                    doctorID: authenticationViewModel.doctorProfile!.doctorID),
               ),
               settings: RouteSettings(name: 'OutPatientsScreen'),
             ));
@@ -583,10 +552,7 @@ class _HomeScreenState extends State<HomeScreen> {
     ));
     changeColorIndex();
 
-    return [
+    return [...List.generate(patientCards.length, (index) => patientCards[index]).toList()];
-      ...List.generate(patientCards.length, (index) => patientCards[index])
-          .toList()
-    ];
   }
 
   changeColorIndex() {
@@ -595,15 +561,17 @@ class _HomeScreenState extends State<HomeScreen> {
       colorIndex = 0;
     }
   }
+
   void _showErrorBottomSheet(BuildContext context, String errorMessage) {
     showModalBottomSheet(
-      isDismissible:true,
+      isDismissible: true,
-      enableDrag:false,
+      enableDrag: false,
       context: context,
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
       ),
-      backgroundColor: Colors.red[50], // Light red background
+      backgroundColor: Colors.red[50],
+      // Light red background
       builder: (context) {
         return Padding(
           padding: const EdgeInsets.all(16.0),
@@ -615,13 +583,17 @@ class _HomeScreenState extends State<HomeScreen> {
                 children: [
                   Icon(Icons.error_outline, color: Colors.red, size: 40),
                   InkWell(
-                      onTap: () {
+                    onTap: () {
-                        Navigator.pop(context);
+                      Navigator.pop(context);
-                      },
+                    },
-                      child: Padding(
+                    child: Padding(
-                        padding: const EdgeInsets.all(8.0),
+                      padding: const EdgeInsets.all(8.0),
-                        child: Icon(Icons.close,color: Colors.red,),
+                      child: Icon(
-                      ))
+                        Icons.close,
+                        color: Colors.red,
+                      ),
+                    ),
+                  )
                 ],
               ),
               const SizedBox(height: 10),
@@ -637,26 +609,28 @@ class _HomeScreenState extends State<HomeScreen> {
               ),
               const SizedBox(height: 15),
               SizedBox(
-                  width:  SizeConfig.realScreenWidth! * .4,
+                  width: SizeConfig.realScreenWidth! * .4,
-                  child:AppButton(
+                  child: AppButton(
                     color: Colors.green,
-                onPressed: () => {  //   Navigator.pop(context);
+                    onPressed: () => {
-      Navigator.push(
+                      //   Navigator.pop(context);
-          context,
+                      Navigator.push(
-          MaterialPageRoute(
+                          context,
-            builder: (context) => PharmacyIntervention(),
+                          MaterialPageRoute(
-            settings: RouteSettings(name: 'PharmacyIntervention'),
+                            builder: (context) => PharmacyIntervention(),
-          ))},
+                            settings: RouteSettings(name: 'PharmacyIntervention'),
-                title: TranslationBase.of(context).open,
+                          ))
-
+                    },
-              )),
+                    title: TranslationBase.of(context).open,
+                  )),
             ],
           ),
         );
       },
     );
   }
-  void startZoom(){
+
+  void startZoom() {
     var zoom = ZoomVideoSdk();
     InitConfig initConfig = InitConfig(
       domain: "zoom.us",

lib/screens/pharmacy_intervention/viewmodel/pharmacy_intervention_service.dart

@@ -74,7 +74,7 @@ class PharmacyInterventionService extends BaseService {
     var success = false;
     await baseAppClient.post(IS_INFECTIOUS_DISEASE_CONSULTANT,
         onSuccess: (dynamic response, int statusCode) {
-      success = response['IsInfectiousDiseases'];
+        success = response['IsInfectiousDiseases'];
     }, onFailure: (String error, int statusCode) {
       hasError = true;
       DrAppToastMsg.showErrorToast(error);