From 4d820728e8cd3fbacc59a735d053b9259e442c29 Mon Sep 17 00:00:00 2001 From: RoaaGhali98 Date: Wed, 2 Mar 2022 16:49:53 +0300 Subject: [PATCH] Fixing small design issues in admission-request-first-screen --- .../admission-request-first-screen.dart | 63 +++++++++---------- 1 file changed, 30 insertions(+), 33 deletions(-) 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 90d958f0..b0770e7a 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 @@ -9,6 +9,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/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'; @@ -80,25 +81,15 @@ class _AdmissionRequestThirdScreenState child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Container( - margin: EdgeInsets.all(16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - "${TranslationBase.of(context).admission}", - fontSize: SizeConfig.textMultiplier * 1.6, - fontWeight: FontWeight.w700, - color: Color(0xFF2E303A), - ), - AppText( - TranslationBase.of(context).request, - fontSize: SizeConfig.textMultiplier * 3, - fontWeight: FontWeight.bold, - color: Color(0xFF2E303A), - ) - ], - ), + SizedBox( + height: 15, + ), + ServiceTitle( + title: "${TranslationBase.of(context).admission}", + subTitle: TranslationBase.of(context).request, + ), + SizedBox( + height: 15, ), Container( margin: @@ -106,12 +97,15 @@ class _AdmissionRequestThirdScreenState child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - AppText( - TranslationBase.of(context) - .specialityAndDoctorDetail, - color: Color(0xFF2E303A), - fontSize: SizeConfig.textMultiplier * 1.8, - fontWeight: FontWeight.w700, + Padding( + padding: const EdgeInsets.all(5.0), + child: AppText( + TranslationBase.of(context) + .specialityAndDoctorDetail, + color: Color(0xFF2E303A), + fontSize: SizeConfig.textMultiplier * 1.8, + fontWeight: FontWeight.w700, + ), ), SizedBox( height: 10, @@ -224,14 +218,14 @@ class _AdmissionRequestThirdScreenState SizedBox( height: 16, ), - AppText( - TranslationBase.of(context).patientDetails, - fontFamily: 'Poppins', - fontSize: SizeConfig.textMultiplier * 1.8, - fontWeight: FontWeight.w700, - ), - SizedBox( - height: 10, + Padding( + padding: const EdgeInsets.all(5.0), + child: AppText( + TranslationBase.of(context).patientDetails, + fontFamily: 'Poppins', + fontSize: SizeConfig.textMultiplier * 1.8, + fontWeight: FontWeight.w700, + ), ), if (patient.gender != 1) CheckboxListTile( @@ -269,6 +263,9 @@ class _AdmissionRequestThirdScreenState controlAffinity: ListTileControlAffinity.leading, contentPadding: EdgeInsets.all(0), ), + SizedBox( + height: 8, + ), AppTextFieldCustom( hintText: TranslationBase.of(context).sickLeaveComments,