From e1c635a9116b7050576a45ef98487c8adf21cc96 Mon Sep 17 00:00:00 2001
From: RoaaGhali98 <ruaagh5656@outlook.com>
Date: Wed, 9 Mar 2022 09:40:18 +0300
Subject: [PATCH] Rename to bottom_sheet_dialog_button and
 two_bottom_sheet_dialog_buttons

---
 lib/config/config.dart                                     | 2 +-
 .../admission_request/admission_request_first_screen.dart  | 2 +-
 .../admission_request/admission_request_second_screen.dart | 4 ++--
 .../admission_request/admission_request_third_screen.dart  | 4 ++--
 .../refer_details/refer-patient-screen-in-patient.dart     | 2 +-
 .../referral/refer_details/refer-patient-screen.dart       | 7 +------
 .../soap_update/assessment/add_assessment_details.dart     | 2 +-
 .../soap_update/objective/add_examination_page.dart        | 2 +-
 .../soap_update/subjective/allergies/add_allergies.dart    | 2 +-
 .../soap_update/subjective/history/add_history_dialog.dart | 2 +-
 .../soap_update/subjective/medication/add_medication.dart  | 2 +-
 .../add_prescription/add_drug/add_drug_widget.dart         | 2 +-
 lib/screens/procedures/add-favourite-procedure.dart        | 4 +---
 ...eet_dialog_buttons.dart => bottom_sheet_container.dart} | 7 ++-----
 ...log_button.dart => custom_bottom_sheet_ container.dart} | 0
 15 files changed, 17 insertions(+), 27 deletions(-)
 rename lib/widgets/bottom_sheet/{two_bottom_sheet_dialog_buttons.dart => bottom_sheet_container.dart} (80%)
 rename lib/widgets/bottom_sheet/{bottom_sheet_dialog_button.dart => custom_bottom_sheet_ container.dart} (100%)

diff --git a/lib/config/config.dart b/lib/config/config.dart
index 16628fda..f5825d2e 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -434,7 +434,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 = 6.5;
+const VERSION_ID = 6.8;
 const CHANNEL = 9;
 const SESSION_ID = 'BlUSkYymTt';
 const IS_LOGIN_FOR_DOCTOR_APP = true;
diff --git a/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart b/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart
index e69faab8..84eba0f6 100644
--- a/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart
+++ b/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart
@@ -10,6 +10,7 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart';
 import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
 import 'package:doctor_app_flutter/utils/utils.dart';
+import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart';
 import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart';
 import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
@@ -22,7 +23,6 @@ import 'package:flutter/services.dart';
 import 'package:hexcolor/hexcolor.dart';
 import 'package:provider/provider.dart';
 import '../../../../routes.dart';
-import '../../../../widgets/bottom_sheet/bottom_sheet_dialog_button.dart';
 
 class AdmissionRequestFirstScreen extends StatefulWidget {
   @override
diff --git a/lib/screens/patients/profile/admission_request/admission_request_second_screen.dart b/lib/screens/patients/profile/admission_request/admission_request_second_screen.dart
index 275c0d2c..8d4f6a23 100644
--- a/lib/screens/patients/profile/admission_request/admission_request_second_screen.dart
+++ b/lib/screens/patients/profile/admission_request/admission_request_second_screen.dart
@@ -13,7 +13,7 @@ import 'package:doctor_app_flutter/utils/date-utils.dart';
 import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
 import 'package:doctor_app_flutter/utils/utils.dart';
-import 'package:doctor_app_flutter/widgets/bottom_sheet/two_bottom_sheet_dialog_buttons.dart';
+import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_container.dart';
 import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart';
 import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
@@ -470,7 +470,7 @@ class _AdmissionRequestSecondScreenState
               ],
             ),
           ),
-        bottomSheet: TwoBottomSheetDialogButtons(
+        bottomSheet: BottomSheetContainer(
             widget: Row(
               children: [
                 Container(
diff --git a/lib/screens/patients/profile/admission_request/admission_request_third_screen.dart b/lib/screens/patients/profile/admission_request/admission_request_third_screen.dart
index b0ecb8de..9099476f 100644
--- a/lib/screens/patients/profile/admission_request/admission_request_third_screen.dart
+++ b/lib/screens/patients/profile/admission_request/admission_request_third_screen.dart
@@ -10,7 +10,7 @@ import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';
 import 'package:doctor_app_flutter/screens/base/base_view.dart';
 import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
-import 'package:doctor_app_flutter/widgets/bottom_sheet/two_bottom_sheet_dialog_buttons.dart';
+import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_container.dart';
 import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart';
 import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
@@ -342,7 +342,7 @@ class _AdmissionRequestThirdScreenState
             ],
           ),
         ),
-        bottomSheet: TwoBottomSheetDialogButtons(
+        bottomSheet: BottomSheetContainer(
             widget: Row(
               children: [
                 Container(
diff --git a/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart
index a68127c0..d3ec7893 100644
--- a/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart
+++ b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart
@@ -6,10 +6,10 @@ import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dar
 import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
 import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';
 import 'package:doctor_app_flutter/screens/base/base_view.dart';
-import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart';
 import 'package:doctor_app_flutter/utils/date-utils.dart';
 import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
+import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart';
 import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart';
 import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
diff --git a/lib/screens/patients/profile/referral/refer_details/refer-patient-screen.dart b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen.dart
index ea9bfeb2..efc3dbcf 100644
--- a/lib/screens/patients/profile/referral/refer_details/refer-patient-screen.dart
+++ b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen.dart
@@ -1,27 +1,22 @@
-import 'package:doctor_app_flutter/config/size_config.dart';
 import 'package:doctor_app_flutter/core/enum/viewstate.dart';
 import 'package:doctor_app_flutter/core/service/AnalyticsService.dart';
 import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart';
 import 'package:doctor_app_flutter/locator.dart';
 import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';
 import 'package:doctor_app_flutter/screens/base/base_view.dart';
-import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart';
 import 'package:doctor_app_flutter/utils/date-utils.dart';
 import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart';
-import 'package:doctor_app_flutter/utils/utils.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
+import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart';
 import 'package:doctor_app_flutter/widgets/patients/patient-referral-item-widget.dart';
 import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart';
 import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
-import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
-import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/dialogs/dailog-list-select.dart';
 import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
 import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:hexcolor/hexcolor.dart';
 
 class PatientMakeReferralScreen extends StatefulWidget {
   // previous design page is: ReferPatientScreen
diff --git a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
index 181560a6..f9d4a8d3 100644
--- a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
+++ b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
@@ -11,10 +11,10 @@ import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_as
 import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart';
 import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';
 import 'package:doctor_app_flutter/screens/base/base_view.dart';
-import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart';
 import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart';
 import 'package:doctor_app_flutter/utils/utils.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
+import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/dialogs/master_key_dailog.dart';
diff --git a/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart b/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart
index 82dfb0da..56744ce0 100644
--- a/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart
+++ b/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart
@@ -4,9 +4,9 @@ import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart';
 import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart';
 import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_examination.dart';
 import 'package:doctor_app_flutter/screens/base/base_view.dart';
-import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart';
 import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
+import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:flutter/material.dart';
 
diff --git a/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart b/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart
index 026ca14a..9e35a496 100644
--- a/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart
+++ b/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart
@@ -5,9 +5,9 @@ import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart';
 import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart';
 import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart';
 import 'package:doctor_app_flutter/screens/base/base_view.dart';
-import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart';
 import 'package:doctor_app_flutter/utils/utils.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
+import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart b/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart
index 16bec79b..c3acbbfa 100644
--- a/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart
+++ b/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart
@@ -4,9 +4,9 @@ import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart';
 import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart';
 import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_history.dart';
 import 'package:doctor_app_flutter/screens/base/base_view.dart';
-import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart';
 import 'package:doctor_app_flutter/screens/patients/profile/soap_update/soap_utils.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
+import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/master_key_checkbox_search_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
diff --git a/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart b/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart
index 0b92aef9..671bf597 100644
--- a/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart
+++ b/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart
@@ -7,9 +7,9 @@ import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart';
 import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
 import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart';
 import 'package:doctor_app_flutter/screens/base/base_view.dart';
-import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart';
 import 'package:doctor_app_flutter/utils/utils.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
+import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/dialogs/master_key_dailog.dart';
diff --git a/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart b/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart
index 8151eb90..9be78781 100644
--- a/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart
+++ b/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart
@@ -5,11 +5,11 @@ import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';
 import 'package:doctor_app_flutter/core/model/search_drug/get_medication_response_model.dart';
 import 'package:doctor_app_flutter/core/viewModel/medicine_view_model.dart';
 import 'package:doctor_app_flutter/core/viewModel/prescription/prescription_view_model.dart';
-import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart';
 import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart';
 import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart';
 import 'package:doctor_app_flutter/utils/utils.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
+import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
 import 'package:flutter/cupertino.dart';
diff --git a/lib/screens/procedures/add-favourite-procedure.dart b/lib/screens/procedures/add-favourite-procedure.dart
index 5e7c9eb0..33aaa1f5 100644
--- a/lib/screens/procedures/add-favourite-procedure.dart
+++ b/lib/screens/procedures/add-favourite-procedure.dart
@@ -1,4 +1,3 @@
-import 'package:doctor_app_flutter/config/size_config.dart';
 import 'package:doctor_app_flutter/core/model/procedure/procedure_template_details_model.dart';
 import 'package:doctor_app_flutter/core/viewModel/prescription/prescription_view_model.dart';
 import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart';
@@ -9,12 +8,11 @@ import 'package:doctor_app_flutter/screens/procedures/entity_list_fav_procedure.
 import 'package:doctor_app_flutter/screens/procedures/procedure_checkout_screen.dart';
 import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
+import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
-import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import '../../widgets/bottom_sheet/bottom_sheet_dialog_button.dart';
 import 'ProcedureType.dart';
 
 class AddFavouriteProcedure extends StatefulWidget {
diff --git a/lib/widgets/bottom_sheet/two_bottom_sheet_dialog_buttons.dart b/lib/widgets/bottom_sheet/bottom_sheet_container.dart
similarity index 80%
rename from lib/widgets/bottom_sheet/two_bottom_sheet_dialog_buttons.dart
rename to lib/widgets/bottom_sheet/bottom_sheet_container.dart
index 20eb6525..31fee2b6 100644
--- a/lib/widgets/bottom_sheet/two_bottom_sheet_dialog_buttons.dart
+++ b/lib/widgets/bottom_sheet/bottom_sheet_container.dart
@@ -1,18 +1,15 @@
 import 'package:doctor_app_flutter/config/size_config.dart';
-import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:hexcolor/hexcolor.dart';
 
-import '../../config/config.dart';
 
-class TwoBottomSheetDialogButtons extends StatelessWidget {
+class BottomSheetContainer extends StatelessWidget {
   final Function onTap;
   final String label;
   final Widget widget;
-
   double headerHeight = SizeConfig.heightMultiplier * 12;
 
-  TwoBottomSheetDialogButtons({Key key, this.onTap, this.label, this.widget}) : super(key: key);
+  BottomSheetContainer({Key key, this.onTap, this.label, this.widget}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/widgets/bottom_sheet/bottom_sheet_dialog_button.dart b/lib/widgets/bottom_sheet/custom_bottom_sheet_ container.dart
similarity index 100%
rename from lib/widgets/bottom_sheet/bottom_sheet_dialog_button.dart
rename to lib/widgets/bottom_sheet/custom_bottom_sheet_ container.dart