Merge branch 'master' into haroon_dev

pull/311/head
haroon amjad 1 day ago
commit 67bcd34344

@ -89,17 +89,13 @@ class PatientInformationStepState extends State<PatientInformationStep> {
} }
Widget _buildSectionTitle(String title) { Widget _buildSectionTitle(String title) {
return Text( return Text(title, style: const TextStyle(fontWeight: FontWeight.w700, fontSize: 16)).paddingSymmetrical(4, 0);
title,
style: const TextStyle(fontWeight: FontWeight.w700, fontSize: 16)
).paddingSymmetrical(4, 0);
} }
Widget _buildIdentificationField(ReferralFormManager formManager) { Widget _buildIdentificationField(ReferralFormManager formManager) {
return Focus( return TextInputWidget(
focusNode: _identificationFocusNode,
child: TextInputWidget(
controller: _identificationController, controller: _identificationController,
focusNode: _identificationFocusNode,
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
vertical: ResponsiveExtension(12).h, vertical: ResponsiveExtension(12).h,
horizontal: ResponsiveExtension(16).h, horizontal: ResponsiveExtension(16).h,
@ -114,19 +110,14 @@ class PatientInformationStepState extends State<PatientInformationStep> {
onSubmitted: (value) { onSubmitted: (value) {
_nameFocusNode.requestFocus(); _nameFocusNode.requestFocus();
}, },
).paddingSymmetrical(0, 4), ).paddingSymmetrical(0, 4);
);
} }
Widget _buildPatientNameField(ReferralFormManager formManager) { Widget _buildPatientNameField(ReferralFormManager formManager) {
return Focus( return TextInputWidget(
focusNode: _nameFocusNode,
child: TextInputWidget(
controller: _nameController, controller: _nameController,
padding: EdgeInsets.symmetric( focusNode: _nameFocusNode,
vertical: ResponsiveExtension(12).h, padding: EdgeInsets.symmetric(vertical: ResponsiveExtension(12).h, horizontal: ResponsiveExtension(16).h),
horizontal: ResponsiveExtension(16).h,
),
hintText: LocaleKeys.patientName.tr(context: context), hintText: LocaleKeys.patientName.tr(context: context),
labelText: LocaleKeys.name.tr(context: context), labelText: LocaleKeys.name.tr(context: context),
keyboardType: TextInputType.text, keyboardType: TextInputType.text,
@ -136,21 +127,19 @@ class PatientInformationStepState extends State<PatientInformationStep> {
formManager.updatePatientName(value ?? ''); formManager.updatePatientName(value ?? '');
}, },
onSubmitted: (value) { onSubmitted: (value) {
// Optionally move to next field or keep focus _phoneFocusNode.requestFocus();
}, },
).paddingSymmetrical(0, 4), ).paddingSymmetrical(0, 4);
);
} }
Widget _buildPatientPhoneField(ReferralFormManager formManager) { Widget _buildPatientPhoneField(ReferralFormManager formManager) {
return Directionality( return Directionality(
textDirection: ui.TextDirection.ltr, textDirection: ui.TextDirection.ltr,
child: Focus(
focusNode: _phoneFocusNode,
child: TextInputWidget( child: TextInputWidget(
labelText: LocaleKeys.phoneNumber.tr(context: context), labelText: LocaleKeys.phoneNumber.tr(context: context),
hintText: "5xxxxxxxx", hintText: "5xxxxxxxx",
controller: _phoneController, controller: _phoneController,
focusNode: _phoneFocusNode,
padding: const EdgeInsets.all(8), padding: const EdgeInsets.all(8),
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
fontFamily: "Poppins", fontFamily: "Poppins",
@ -167,9 +156,8 @@ class PatientInformationStepState extends State<PatientInformationStep> {
isCountryDropDown: true, isCountryDropDown: true,
leadingIcon: AppAssets.smart_phone, leadingIcon: AppAssets.smart_phone,
errorMessage: formManager.errors.patientPhone, errorMessage: formManager.errors.patientPhone,
hasError: !ValidationUtils.isNullOrEmpty(formManager.errors.patientPhone) hasError: !ValidationUtils.isNullOrEmpty(formManager.errors.patientPhone),
).paddingSymmetrical(0, 8), ).paddingSymmetrical(0, 8),
),
); );
} }
@ -195,9 +183,7 @@ class PatientInformationStepState extends State<PatientInformationStep> {
return getIt.get<AppState>().isArabic() ? patientCity?.descriptionN : patientCity?.description; return getIt.get<AppState>().isArabic() ? patientCity?.descriptionN : patientCity?.description;
} }
void _showCityBottomSheet(BuildContext context, ReferralFormManager formManager) { void _showCityBottomSheet(BuildContext context, ReferralFormManager formManager) {
showCommonBottomSheetWithoutHeight( showCommonBottomSheetWithoutHeight(
context, context,
title: LocaleKeys.selectCity.tr(context: context), title: LocaleKeys.selectCity.tr(context: context),
@ -217,8 +203,8 @@ class PatientInformationStepState extends State<PatientInformationStep> {
decoration: RoundedRectangleBorder().toSmoothCornerDecoration( decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
color: Colors.white, color: Colors.white,
customBorder: BorderRadius.all(Radius.circular(24.h)), customBorder: BorderRadius.all(Radius.circular(24.h)),
),
), child: ListView.builder( child: ListView.builder(
shrinkWrap: true, shrinkWrap: true,
padding: EdgeInsets.all(16.h), padding: EdgeInsets.all(16.h),
physics: const BouncingScrollPhysics(), physics: const BouncingScrollPhysics(),

Loading…
Cancel
Save