diff --git a/lib/widgets/shared/doctor_card.dart b/lib/widgets/shared/doctor_card.dart index df5cbe33..78576a46 100644 --- a/lib/widgets/shared/doctor_card.dart +++ b/lib/widgets/shared/doctor_card.dart @@ -29,7 +29,9 @@ class DoctorCard extends StatelessWidget { this.invoiceNO, this.onTap, this.appointmentDate, - this.orderNo, this.isPrescriptions=false, this.clinic}); + this.orderNo, + this.isPrescriptions = false, + this.clinic}); @override Widget build(BuildContext context) { @@ -69,13 +71,13 @@ class DoctorCard extends StatelessWidget { fontWeight: FontWeight.w600, fontSize: 14, ), - if(!isPrescriptions) - Texts( - '${DateUtils.getHour(appointmentDate)}', - fontWeight: FontWeight.w600, - color: Colors.grey[700], - fontSize: 14, - ), + if (!isPrescriptions) + Texts( + '${DateUtils.getHour(appointmentDate)}', + fontWeight: FontWeight.w600, + color: Colors.grey[700], + fontSize: 14, + ), ], ), ), @@ -106,7 +108,8 @@ class DoctorCard extends StatelessWidget { Row( children: [ Texts( - 'order No:', + TranslationBase.of(context).orderNo + + ": ", color: Colors.grey[500], fontSize: 14, ), @@ -120,7 +123,9 @@ class DoctorCard extends StatelessWidget { Row( children: [ Texts( - 'Invoice:', + TranslationBase.of(context) + .invoiceNo + + ": ", fontSize: 14, color: Colors.grey[500], ), @@ -130,34 +135,36 @@ class DoctorCard extends StatelessWidget { ) ], ), - if(clinic!=null) - Row( - children: [ - Texts( - 'Clinic: ', - color: Colors.grey[500], - fontSize: 14, - ), - Texts( - clinic, - fontSize: 14, - ) - ], - ), - if(branch!=null) - Row( - children: [ - Texts( - 'Branch: ', - fontSize: 14, - color: Colors.grey[500], - ), - Texts( - branch, - fontSize: 14, - ) - ], - ) + if (clinic != null) + Row( + children: [ + Texts( + TranslationBase.of(context).clinic + + ": ", + color: Colors.grey[500], + fontSize: 14, + ), + Texts( + clinic, + fontSize: 14, + ) + ], + ), + if (branch != null) + Row( + children: [ + Texts( + TranslationBase.of(context).branch + + ": ", + fontSize: 14, + color: Colors.grey[500], + ), + Texts( + branch, + fontSize: 14, + ) + ], + ) ]), ), ), @@ -167,7 +174,6 @@ class DoctorCard extends StatelessWidget { ], ), ), - ], ), ], diff --git a/lib/widgets/shared/doctor_card_insurance.dart b/lib/widgets/shared/doctor_card_insurance.dart index fce3e316..e305a91d 100644 --- a/lib/widgets/shared/doctor_card_insurance.dart +++ b/lib/widgets/shared/doctor_card_insurance.dart @@ -1,5 +1,6 @@ import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; +import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/large_avatar.dart'; import 'package:eva_icons_flutter/eva_icons_flutter.dart'; import 'package:flutter/cupertino.dart'; @@ -105,7 +106,7 @@ class DoctorCardInsurance extends StatelessWidget { Expanded( child: Texts( doctorName, - fontWeight: FontWeight.w700, + bold: true, )), ], ), @@ -155,15 +156,18 @@ class DoctorCardInsurance extends StatelessWidget { Row( children: [ Texts( - 'Clinic: ', + TranslationBase.of(context).clinic + + ": ", + color: Colors.grey[500], + fontSize: 14, //fontWeight: FontWeight.w600, //color: Colors.grey[500], ), Expanded( child: Texts( clinic, - fontWeight: FontWeight.w700, - fontSize: 15.0, + //fontWeight: FontWeight.w700, + fontSize: 14.0, ), ) ], @@ -172,26 +176,30 @@ class DoctorCardInsurance extends StatelessWidget { Row( children: [ Texts( - 'Branch:', - //color: Colors.grey[500], + TranslationBase.of(context).branch + + ": ", + fontSize: 14, + color: Colors.grey[500], ), Texts( branch2, - fontWeight: FontWeight.w700, - fontSize: 15.0, + fontSize: 14.0, ) ], ), Row( children: [ Texts( - 'Approval No: ', + TranslationBase.of(context) + .approvalNo + + ": ", + fontSize: 14, + color: Colors.grey[500], //color: Colors.grey[500], ), Texts( branch, - fontWeight: FontWeight.w700, - fontSize: 15.0, + fontSize: 14.0, ) ], ), @@ -202,8 +210,7 @@ class DoctorCardInsurance extends StatelessWidget { padding: const EdgeInsets.symmetric(horizontal: 15.0), child: Icon( - DoctorApp.view, - size: 22.0, + EvaIcons.eye, ), ) ],