Merge branch 'fix_refere_desgin' into 'development'

Fixing small design issues in admission-request-first-screen

See merge request Cloud_Solution/doctor_app_flutter!980
merge-requests/981/merge
Elham Ali 4 years ago
commit 1dd66803fa

@ -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/screens/base/base_view.dart';
import 'package:doctor_app_flutter/utils/dr_app_toast_msg.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/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/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_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
@ -80,25 +81,15 @@ class _AdmissionRequestThirdScreenState
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( SizedBox(
margin: EdgeInsets.all(16.0), height: 15,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
"${TranslationBase.of(context).admission}",
fontSize: SizeConfig.textMultiplier * 1.6,
fontWeight: FontWeight.w700,
color: Color(0xFF2E303A),
), ),
AppText( ServiceTitle(
TranslationBase.of(context).request, title: "${TranslationBase.of(context).admission}",
fontSize: SizeConfig.textMultiplier * 3, subTitle: TranslationBase.of(context).request,
fontWeight: FontWeight.bold,
color: Color(0xFF2E303A),
)
],
), ),
SizedBox(
height: 15,
), ),
Container( Container(
margin: margin:
@ -106,13 +97,16 @@ class _AdmissionRequestThirdScreenState
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppText( Padding(
padding: const EdgeInsets.all(5.0),
child: AppText(
TranslationBase.of(context) TranslationBase.of(context)
.specialityAndDoctorDetail, .specialityAndDoctorDetail,
color: Color(0xFF2E303A), color: Color(0xFF2E303A),
fontSize: SizeConfig.textMultiplier * 1.8, fontSize: SizeConfig.textMultiplier * 1.8,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
),
SizedBox( SizedBox(
height: 10, height: 10,
), ),
@ -224,14 +218,14 @@ class _AdmissionRequestThirdScreenState
SizedBox( SizedBox(
height: 16, height: 16,
), ),
AppText( Padding(
padding: const EdgeInsets.all(5.0),
child: AppText(
TranslationBase.of(context).patientDetails, TranslationBase.of(context).patientDetails,
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 1.8, fontSize: SizeConfig.textMultiplier * 1.8,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
SizedBox(
height: 10,
), ),
if (patient.gender != 1) if (patient.gender != 1)
CheckboxListTile( CheckboxListTile(
@ -269,6 +263,9 @@ class _AdmissionRequestThirdScreenState
controlAffinity: ListTileControlAffinity.leading, controlAffinity: ListTileControlAffinity.leading,
contentPadding: EdgeInsets.all(0), contentPadding: EdgeInsets.all(0),
), ),
SizedBox(
height: 8,
),
AppTextFieldCustom( AppTextFieldCustom(
hintText: hintText:
TranslationBase.of(context).sickLeaveComments, TranslationBase.of(context).sickLeaveComments,

Loading…
Cancel
Save