fix issue on soap design

lib/widgets/patients/profile/soap_update/expandable_SOAP_widget.dart

@@ -31,29 +31,35 @@ class ExpandableSOAPWidget extends StatelessWidget {
             width: 0.30),
       ),
       child: HeaderBodyExpandableNotifier(
-        headerWidget: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            InkWell(
-              onTap: onTap,
-              child: Row(
-                children: [
-                  Texts(headerTitle,
-                      variant: isExpanded ? "bodyText" : '',
-                      // bold: isExpanded ? true : false,
-                      fontSize: 15,
-                      color: Colors.black),
-                  if(isRequired)
-                  Icon(
-                    FontAwesomeIcons.asterisk,
-                    size: 12,
-                  )
-                ],
+        headerWidget:  InkWell(
+          onTap: onTap,
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              InkWell(
+                onTap: onTap,
+                child: Row(
+                  children: [
+                    Texts(headerTitle,
+                        variant: isExpanded ? "bodyText" : '',
+                        // bold: isExpanded ? true : false,
+                        fontSize: 15,
+                        color: Colors.black),
+                    if(isRequired)
+                    Icon(
+                      FontAwesomeIcons.asterisk,
+                      size: 12,
+                    )
+                  ],
+                ),
               ),
-            ),
-            Icon(
-                isExpanded ? EvaIcons.arrowIosUpwardOutline: EvaIcons.arrowIosDownwardOutline)
-          ],
+              InkWell(
+                onTap: onTap,
+                child: Icon(
+                    isExpanded ? EvaIcons.arrowIosUpwardOutline: EvaIcons.arrowIosDownwardOutline),
+              )
+            ],
+          ),
         ),
         bodyWidget: child,
         isExpand: isExpanded,

lib/widgets/patients/profile/soap_update/objective/update_objective_page.dart

@@ -461,33 +461,6 @@ class _AddExaminationDailogState extends State<AddExaminationDailog> {
                         SizedBox(
                           height: 16,
                         ),
-                        /*MasterKeyCheckboxSearchWidget(
-                          model: model,
-                          hintSearchText:
-                              TranslationBase.of(context).searchExamination,
-                          buttonName:
-                              TranslationBase.of(context).addExamination,
-                          masterList: model.physicalExaminationList,
-                          removeHistory: (history) {
-                            setState(() {
-                              widget.removeExamination(history);
-                            });
-                          },
-                          addHistory: (history) {
-                            setState(() {
-                              MySelectedExamination mySelectedExamination =
-                                  new MySelectedExamination(
-                                      selectedExamination: history);
-                              widget.mySelectedExamination
-                                  .add(mySelectedExamination);
-                            });
-                          },
-                          addSelectedHistories: () {
-                            widget.addSelectedExamination();
-                          },
-                          isServiceSelected: (master) =>
-                              isServiceSelected(master),
-                        ),*/
                       ]),
                 ))),
               )),

lib/widgets/patients/profile/soap_update/update_plan_page.dart

@@ -101,7 +101,9 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
       },
       builder: (_, model, w) => AppScaffold(
         // baseViewModel: model,
-        backgroundColor: Colors.grey[200],
+        backgroundColor: Theme
+            .of(context)
+            .scaffoldBackgroundColor,
         isShowAppBar: false,
         body: SingleChildScrollView(
           physics: ScrollPhysics(),

lib/widgets/patients/profile/soap_update/update_soap_index.dart

@@ -89,7 +89,7 @@ class _UpdateSoapIndexState extends State<UpdateSoapIndex>
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: <Widget>[
                     // PatientPageHeaderWidget(patient),
-                    PatientProfileHeaderNewDesign(patient, '7', '7', height: MediaQuery.of(context).size.height * 0.28,),
+                    PatientProfileHeaderNewDesign(patient, '7', '7',),
                     Container(
                       width: double.infinity,
                       height: 1,

lib/widgets/shared/master_key_checkbox_search_allergies_widget.dart

@@ -16,6 +16,7 @@ import 'package:provider/provider.dart';
 import 'app-textfield-custom.dart';
 import 'app_texts_widget.dart';
 import 'dialogs/master_key_dailog.dart';
+import 'divider_with_spaces_around.dart';
 import 'expandable-widget-header-body.dart';
 
 class MasterKeyCheckboxSearchAllergiesWidget extends StatefulWidget {
@@ -77,17 +78,21 @@ class _MasterKeyCheckboxSearchAllergiesWidgetState
                             color: Colors.white),
                         child: Column(
                           children: [
-                            TextFields(
-                              hintText: widget.hintSearchText ??
-                                  TranslationBase.of(context).selectAllergy,
-                              borderWidth: 0.0,
-                              padding: EdgeInsets.all(20),
-                              borderRadius: 0,
-                              suffixIcon: EvaIcons.search,
+                            AppTextFieldCustom(
+                              height: MediaQuery.of(context).size.height * 0.070,
+                              hintText: TranslationBase.of(context).selectAllergy,
+                              isDropDown: true,
+                              hasBorder: false,
+                              // controller: filteredSearchController,
                               onChanged: (value) {
                                 filterSearchResults(value);
                               },
+                              suffixIcon: Icon(
+                                Icons.search,
+                                color: Colors.black,
+                              ),
                             ),
+                            DividerWithSpacesAround(),
                             SizedBox(
                               height: 10,
                             ),

lib/widgets/shared/master_key_checkbox_search_widget.dart

@@ -3,16 +3,15 @@ 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/models/SOAP/master_key_model.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
-import 'package:doctor_app_flutter/widgets/shared/Text.dart';
 import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart';
-import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
 import 'package:eva_icons_flutter/eva_icons_flutter.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
+import 'app-textfield-custom.dart';
 import 'app_texts_widget.dart';
 
 class MasterKeyCheckboxSearchWidget extends StatefulWidget {
@@ -56,7 +55,16 @@ class _MasterKeyCheckboxSearchWidgetState extends State<MasterKeyCheckboxSearchW
         children: [
           Expanded(
             child: Container(
-              height: MediaQuery.of(context).size.height * 0.62,
+              decoration: BoxDecoration(
+                shape: BoxShape.rectangle,
+                color: Colors.white,
+                borderRadius: BorderRadius.circular(12),
+                border: Border.fromBorderSide(BorderSide(
+                  color: Colors.grey.shade400,
+                  width: 0.4,
+                )),
+              ),
+              height: MediaQuery.of(context).size.height * 0.60,
               child: Center(
                   child: Container(
                     decoration: BoxDecoration(
@@ -64,18 +72,21 @@ class _MasterKeyCheckboxSearchWidgetState extends State<MasterKeyCheckboxSearchW
                         color: Colors.white),
                     child: ListView(
                       children: [
-                        TextFields(
-                          hintText: widget.hintSearchText ?? TranslationBase
-                              .of(context)
-                              .searchHistory,
-                          borderWidth: 0.0,
-                          padding: EdgeInsets.all(20),
-                          borderRadius: 0,
-                          suffixIcon: EvaIcons.search,
+                        AppTextFieldCustom(
+                          height: MediaQuery.of(context).size.height * 0.070,
+                          hintText: TranslationBase.of(context).searchHistory,
+                          isDropDown: true,
+                          hasBorder: false,
+                          // controller: filteredSearchController,
                           onChanged: (value) {
                             filterSearchResults(value);
                           },
+                          suffixIcon: Icon(
+                            Icons.search,
+                            color: Colors.black,
+                          ),
                         ),
+
                         // SizedBox(height: 15,),
                         DividerWithSpacesAround(),
                         Container(