diff --git a/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart b/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart index 16466704..68966553 100644 --- a/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart +++ b/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart @@ -99,7 +99,7 @@ class _VitalSignDetailsScreenState extends State { vitalSignDetails.bodyMeasurements }); }, - child: Expanded( + child: Container( child: VitalSignItem( des: 'Body Measurements', url: url + 'heartbeat.png', @@ -118,7 +118,7 @@ class _VitalSignDetailsScreenState extends State { }); }, - child: Expanded( + child: Container( child: VitalSignItem( des: 'Temperature', url: url + 'heartbeat.png', diff --git a/lib/widgets/patients/profile/patient_profile_widget.dart b/lib/widgets/patients/profile/patient_profile_widget.dart index 0ef50d81..87990fbf 100644 --- a/lib/widgets/patients/profile/patient_profile_widget.dart +++ b/lib/widgets/patients/profile/patient_profile_widget.dart @@ -36,8 +36,7 @@ class PatientProfileWidget extends StatelessWidget { SliverList( delegate: SliverChildListDelegate( [ - Expanded( - flex: 1, + Container( child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ @@ -78,7 +77,7 @@ class PatientProfileWidget extends StatelessWidget { ), SliverPadding( padding: const EdgeInsets.fromLTRB(20, 30, 15, 10), - sliver: ProfileMedicalInfoWidget()) + sliver: ProfileMedicalInfoWidget(patient: patient,)) ]); // Container( diff --git a/lib/widgets/patients/profile/profile_medical_info_widget.dart b/lib/widgets/patients/profile/profile_medical_info_widget.dart index bc92db90..16c9a0bd 100644 --- a/lib/widgets/patients/profile/profile_medical_info_widget.dart +++ b/lib/widgets/patients/profile/profile_medical_info_widget.dart @@ -291,23 +291,18 @@ class PatientProfileButton extends StatelessWidget { navigator(context, this.route); }, child: Column(children: [ - Expanded( - flex: 1, - child: Expanded( - child: Container( - alignment: Alignment.topLeft, - padding: EdgeInsets.all(5), - child: new AppText( - this.name, - color: Colors.red, - fontWeight: FontWeight.w600, - textAlign: TextAlign.left, - fontSize: SizeConfig.textMultiplier * 2, - ), - )), + Container( + alignment: Alignment.topLeft, + padding: EdgeInsets.all(5), + child: new AppText( + this.name, + color: Colors.red, + fontWeight: FontWeight.w600, + textAlign: TextAlign.left, + fontSize: SizeConfig.textMultiplier * 2, + ), ), - Expanded( - flex: 1, + Container( child: Row( mainAxisAlignment: MainAxisAlignment.end, children: [