finish working on app text widget

merge-requests/520/head
mosazaid 5 years ago
parent 8ae0a91c05
commit 72bb64b460

@ -1,5 +1,5 @@
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.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:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -33,14 +33,14 @@ class UpdatePage extends StatelessWidget {
), ),
Image.asset('assets/images/HMG_logo.png'), Image.asset('assets/images/HMG_logo.png'),
SizedBox(height: 8,), SizedBox(height: 8,),
Texts( AppText(
TranslationBase.of(context).updateTheApp.toUpperCase(),fontSize: 17, TranslationBase.of(context).updateTheApp.toUpperCase(),fontSize: 17,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
SizedBox(height: 12,), SizedBox(height: 12,),
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Texts(message??"Update the app",fontSize: 12,), child: AppText(message??"Update the app",fontSize: 12,),
) )
], ],
), ),

@ -10,7 +10,7 @@ import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/TextFields.dart'; import 'package:doctor_app_flutter/widgets/shared/TextFields.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';

@ -20,7 +20,7 @@ import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/dashboard/guage_chart.dart'; import 'package:doctor_app_flutter/widgets/dashboard/guage_chart.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/profile-welcome-widget.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/profile-welcome-widget.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.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:firebase_messaging/firebase_messaging.dart'; import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -776,7 +776,7 @@ class _HomeScreenState extends State<HomeScreen> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [ children: [
Texts( AppText(
value.kPIName, value.kPIName,
medium: true, medium: true,
), ),

@ -10,7 +10,7 @@ import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.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';
import 'package:doctor_app_flutter/widgets/shared/expandable-widget-header-body.dart'; import 'package:doctor_app_flutter/widgets/shared/expandable-widget-header-body.dart';
@ -332,7 +332,7 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
children: [ children: [
Row( Row(
children: [ children: [
Texts( AppText(
TranslationBase.of( TranslationBase.of(
context) context)
.historyOfPresentIllness .historyOfPresentIllness
@ -454,7 +454,7 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
children: [ children: [
Row( Row(
children: [ children: [
Texts( AppText(
TranslationBase.of( TranslationBase.of(
context) context)
.assessment .assessment
@ -698,7 +698,7 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
children: [ children: [
Row( Row(
children: [ children: [
Texts( AppText(
TranslationBase.of( TranslationBase.of(
context) context)
.test .test
@ -932,7 +932,7 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
children: [ children: [
Row( Row(
children: [ children: [
Texts( AppText(
TranslationBase.of( TranslationBase.of(
context) context)
.physicalSystemExamination .physicalSystemExamination
@ -1105,7 +1105,7 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
Image.asset('assets/images/no-data.png'), Image.asset('assets/images/no-data.png'),
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Texts('No Data For This Visit '), child: AppText('No Data For This Visit '),
), ),
SizedBox( SizedBox(
height: 100, height: 100,

@ -13,7 +13,7 @@ import 'package:doctor_app_flutter/widgets/patients/profile/patient-page-header-
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.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';
import 'package:doctor_app_flutter/widgets/shared/doctor_card.dart'; import 'package:doctor_app_flutter/widgets/shared/doctor_card.dart';
@ -186,7 +186,7 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
Image.asset('assets/images/no-data.png'), Image.asset('assets/images/no-data.png'),
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Texts('No Medical File Found'), child: AppText('No Medical File Found'),
) )
], ],
), ),

@ -14,7 +14,7 @@ import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/medicine/medicine_item_widget.dart'; import 'package:doctor_app_flutter/widgets/medicine/medicine_item_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.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/user-guid/text_fields/app_text_form_field.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app_text_form_field.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';

@ -8,7 +8,7 @@ import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.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:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -41,8 +41,8 @@ class ECGPage extends StatelessWidget {
children: [ children: [
// PatientProfileHeaderNewDesign(patient,arrivalType??'0',patientType), // PatientProfileHeaderNewDesign(patient,arrivalType??'0',patientType),
SizedBox(height: 12,), SizedBox(height: 12,),
Texts('Service',style: "caption2",color: Colors.black,), AppText('Service',style: "caption2",color: Colors.black,),
Texts('ECG',bold: true,fontSize: 22,), AppText('ECG',bold: true,fontSize: 22,),
SizedBox(height: 12,), SizedBox(height: 12,),
...List.generate(model.patientMuseResultsModelList.length, (index) => InkWell( ...List.generate(model.patientMuseResultsModelList.length, (index) => InkWell(
onTap: () async { onTap: () async {
@ -68,7 +68,7 @@ class ECGPage extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts('ECG Report',fontWeight: FontWeight.w700,fontSize: 17,), AppText('ECG Report',fontWeight: FontWeight.w700,fontSize: 17,),
SizedBox(height:3), SizedBox(height:3),
RichText( RichText(
text: TextSpan( text: TextSpan(
@ -101,8 +101,8 @@ class ECGPage extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
Texts('${DateUtils.getDayMonthYearDateFormatted(model.patientMuseResultsModelList[index].createdOnDateTime,isArabic: projectViewModel.isArabic)}',color: Colors.black,fontWeight: FontWeight.w600,fontSize: 14,), AppText('${DateUtils.getDayMonthYearDateFormatted(model.patientMuseResultsModelList[index].createdOnDateTime,isArabic: projectViewModel.isArabic)}',color: Colors.black,fontWeight: FontWeight.w600,fontSize: 14,),
Texts('${DateUtils.getHour(model.patientMuseResultsModelList[index].createdOnDateTime)}',fontWeight: FontWeight.w600,color: Colors.grey[700],fontSize: 14,), AppText('${DateUtils.getHour(model.patientMuseResultsModelList[index].createdOnDateTime)}',fontWeight: FontWeight.w600,color: Colors.grey[700],fontSize: 14,),
], ],
), ),
), ),

@ -7,7 +7,7 @@ import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/large_avatar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/large_avatar.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.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';
import 'package:doctor_app_flutter/widgets/shared/doctor_card.dart'; import 'package:doctor_app_flutter/widgets/shared/doctor_card.dart';
@ -137,7 +137,7 @@ class _InsuranceApprovalScreenNewState
Image.asset('assets/images/no-data.png'), Image.asset('assets/images/no-data.png'),
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Texts('No Insurance Approval Found'), child: AppText('No Insurance Approval Found'),
) )
], ],
), ),

@ -6,7 +6,7 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.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';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -93,7 +93,7 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
children: [ children: [
Row( Row(
children: [ children: [
Texts( AppText(
model.insuranceApproval[indexInsurance] model.insuranceApproval[indexInsurance]
.approvalStatusDescption != .approvalStatusDescption !=
null null
@ -118,7 +118,7 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
), ),
Row( Row(
children: [ children: [
Texts( AppText(
model.insuranceApproval[indexInsurance] model.insuranceApproval[indexInsurance]
.doctorName .doctorName
.toUpperCase(), .toUpperCase(),
@ -174,13 +174,13 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
), ),
Row( Row(
children: [ children: [
Texts( AppText(
'Clinic: ', 'Clinic: ',
color: Colors.grey[500], color: Colors.grey[500],
fontSize: 14, fontSize: 14,
), ),
Expanded( Expanded(
child: Texts( child: AppText(
model model
.insuranceApproval[ .insuranceApproval[
indexInsurance] indexInsurance]
@ -192,12 +192,12 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
), ),
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( AppText(
'Approval No: ', 'Approval No: ',
color: Colors.grey[500], color: Colors.grey[500],
fontSize: 14, fontSize: 14,
), ),
Texts( AppText(
model model
.insuranceApproval[ .insuranceApproval[
indexInsurance] indexInsurance]
@ -209,12 +209,12 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
), ),
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( AppText(
'Unused Count:', 'Unused Count:',
color: Colors.grey[500], color: Colors.grey[500],
fontSize: 14, fontSize: 14,
), ),
Texts(model AppText(model
.insuranceApproval[ .insuranceApproval[
indexInsurance] indexInsurance]
.unUsedCount .unUsedCount
@ -226,21 +226,21 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
), ),
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( AppText(
'Company Name :', 'Company Name :',
color: Colors.grey[500], color: Colors.grey[500],
), ),
Texts('Sample') AppText('Sample')
], ],
), ),
Row( Row(
children: [ children: [
Texts( AppText(
'Receipt on: ', 'Receipt on: ',
color: Colors.grey[500], color: Colors.grey[500],
), ),
Expanded( Expanded(
child: Texts( child: AppText(
'${DateUtils.getDayMonthYearDateFormatted(DateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].rceiptOn), isArabic: projectViewModel.isArabic)}', '${DateUtils.getDayMonthYearDateFormatted(DateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].rceiptOn), isArabic: projectViewModel.isArabic)}',
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -250,11 +250,11 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
), ),
Row( Row(
children: [ children: [
Texts( AppText(
'Exp on: ', 'Exp on: ',
color: Colors.grey[500], color: Colors.grey[500],
), ),
Texts( AppText(
'${DateUtils.getDayMonthYearDateFormatted(DateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].expiryDate), isArabic: projectViewModel.isArabic)}', '${DateUtils.getDayMonthYearDateFormatted(DateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].expiryDate), isArabic: projectViewModel.isArabic)}',
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -280,19 +280,19 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
child: Row( child: Row(
children: [ children: [
Expanded( Expanded(
child: Texts( child: AppText(
'Procedure', 'Procedure',
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
), ),
Expanded( Expanded(
child: Texts( child: AppText(
'Status', 'Status',
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
), ),
Expanded( Expanded(
child: Texts( child: AppText(
'Usage Status', 'Usage Status',
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
@ -324,7 +324,7 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Expanded( Expanded(
child: Container( child: Container(
child: Texts(model child: AppText(model
.insuranceApproval[ .insuranceApproval[
indexInsurance] indexInsurance]
?.apporvalDetails[ ?.apporvalDetails[
@ -336,7 +336,7 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Expanded( Expanded(
child: Container( child: Container(
child: Texts(model child: AppText(model
.insuranceApproval[ .insuranceApproval[
indexInsurance] indexInsurance]
?.apporvalDetails[ ?.apporvalDetails[
@ -347,7 +347,7 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
), ),
Expanded( Expanded(
child: Container( child: Container(
child: Texts(model child: AppText(model
.insuranceApproval[ .insuranceApproval[
indexInsurance] indexInsurance]
?.apporvalDetails[ ?.apporvalDetails[

@ -17,7 +17,7 @@ import '../../lookups/patient_lookup.dart';
import '../../widgets/patients/dynamic_elements.dart'; import '../../widgets/patients/dynamic_elements.dart';
import '../../widgets/shared/buttons/app_buttons_widget.dart'; import '../../widgets/shared/buttons/app_buttons_widget.dart';
import '../../widgets/shared/app_scaffold_widget.dart'; import '../../widgets/shared/app_scaffold_widget.dart';
import '../../widgets/shared/user-guid/text_fields/app_text_form_field.dart'; import '../../widgets/shared/text_fields/app_text_form_field.dart';
import '../../widgets/shared/app_texts_widget.dart'; import '../../widgets/shared/app_texts_widget.dart';
import '../../widgets/shared/rounded_container_widget.dart'; import '../../widgets/shared/rounded_container_widget.dart';

@ -17,7 +17,7 @@ import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/PatientCard.dart'; import 'package:doctor_app_flutter/widgets/patients/PatientCard.dart';
import 'package:doctor_app_flutter/widgets/patients/clinic_list_dropdwon.dart'; import 'package:doctor_app_flutter/widgets/patients/clinic_list_dropdwon.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart'; import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
@ -450,7 +450,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
Image.asset('assets/images/no-data.png'), Image.asset('assets/images/no-data.png'),
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Texts(TranslationBase.of(context) child: AppText(TranslationBase.of(context)
.youDontHaveAnyPatient), .youDontHaveAnyPatient),
) )
], ],
@ -586,7 +586,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
padding: padding:
const EdgeInsets const EdgeInsets
.all(8.0), .all(8.0),
child: Texts( child: AppText(
TranslationBase.of( TranslationBase.of(
context) context)
.youDontHaveAnyPatient), .youDontHaveAnyPatient),

@ -9,7 +9,7 @@ import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/PatientHeaderWidgetNoAvatar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/PatientHeaderWidgetNoAvatar.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/app-textfield-custom.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.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';

@ -11,7 +11,7 @@ import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-page-header-widget.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-page-header-widget.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/app-textfield-custom.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.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';

@ -13,7 +13,7 @@ import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-page-header-widget.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-page-header-widget.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/app-textfield-custom.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.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';

@ -14,7 +14,7 @@ import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-page-header-widget.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-page-header-widget.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/app-textfield-custom.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.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';

@ -4,7 +4,7 @@ import 'package:doctor_app_flutter/core/viewModel/labs_view_model.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/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/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.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';

@ -4,7 +4,7 @@ import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/screens/patients/profile/lab_result/FlowChartPage.dart'; import 'package:doctor_app_flutter/screens/patients/profile/lab_result/FlowChartPage.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -32,7 +32,7 @@ class LabResultWidget extends StatelessWidget {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Texts(filterName), AppText(filterName),
InkWell( InkWell(
onTap: () { onTap: () {
Navigator.push( Navigator.push(
@ -46,7 +46,7 @@ class LabResultWidget extends StatelessWidget {
), ),
); );
}, },
child: Texts( child: AppText(
TranslationBase.of(context).showMoreBtn, TranslationBase.of(context).showMoreBtn,
textDecoration: TextDecoration.underline, textDecoration: TextDecoration.underline,
color: Colors.blue, color: Colors.blue,
@ -59,7 +59,7 @@ class LabResultWidget extends StatelessWidget {
Expanded( Expanded(
child: Container( child: Container(
child: Center( child: Center(
child: Texts( child: AppText(
TranslationBase.of(context).description, TranslationBase.of(context).description,
color: Colors.black,bold: true, color: Colors.black,bold: true,
), ),
@ -69,14 +69,14 @@ class LabResultWidget extends StatelessWidget {
Expanded( Expanded(
child: Container( child: Container(
child: Center( child: Center(
child: Texts(TranslationBase.of(context).value, color: Colors.black,bold: true,), child: AppText(TranslationBase.of(context).value, color: Colors.black,bold: true,),
), ),
), ),
), ),
Expanded( Expanded(
child: Container( child: Container(
child: Center( child: Center(
child: Texts(TranslationBase.of(context).range, color: Colors.black,bold: true,), child: AppText(TranslationBase.of(context).range, color: Colors.black,bold: true,),
), ),
), ),
) )
@ -94,7 +94,7 @@ class LabResultWidget extends StatelessWidget {
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
color: Colors.white, color: Colors.white,
child: Center( child: Center(
child: Texts( child: AppText(
'${patientLabResultList[index].testCode}\n'+ '${patientLabResultList[index].testCode}\n'+
patientLabResultList[index].description, patientLabResultList[index].description,
textAlign: TextAlign.center, textAlign: TextAlign.center,
@ -107,7 +107,7 @@ class LabResultWidget extends StatelessWidget {
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
color: Colors.white, color: Colors.white,
child: Center( child: Center(
child: Texts( child: AppText(
patientLabResultList[index].resultValue+" "+patientLabResultList[index].uOM, patientLabResultList[index].resultValue+" "+patientLabResultList[index].uOM,
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
@ -119,7 +119,7 @@ class LabResultWidget extends StatelessWidget {
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
color: Colors.white, color: Colors.white,
child: Center( child: Center(
child: Texts( child: AppText(
patientLabResultList[index].referanceRange, patientLabResultList[index].referanceRange,
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
@ -148,7 +148,7 @@ class LabResultWidget extends StatelessWidget {
children: [ children: [
Container( Container(
child: Center( child: Center(
child: Texts( child: AppText(
TranslationBase.of(context).description, TranslationBase.of(context).description,
color: Colors.black,bold: true, color: Colors.black,bold: true,
), ),
@ -156,12 +156,12 @@ class LabResultWidget extends StatelessWidget {
), ),
Container( Container(
child: Center( child: Center(
child: Texts(TranslationBase.of(context).value, color: Colors.black,bold: true,), child: AppText(TranslationBase.of(context).value, color: Colors.black,bold: true,),
), ),
), ),
Container( Container(
child: Center( child: Center(
child: Texts(TranslationBase.of(context).range, color: Colors.black,bold: true,), child: AppText(TranslationBase.of(context).range, color: Colors.black,bold: true,),
), ),
), ),
], ],
@ -176,7 +176,7 @@ class LabResultWidget extends StatelessWidget {
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
color: Colors.white, color: Colors.white,
child: Center( child: Center(
child: Texts( child: AppText(
lab.description, lab.description,
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
@ -188,7 +188,7 @@ class LabResultWidget extends StatelessWidget {
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
color: Colors.white, color: Colors.white,
child: Center( child: Center(
child: Texts( child: AppText(
lab.resultValue+" "+lab.uOM, lab.resultValue+" "+lab.uOM,
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
@ -200,7 +200,7 @@ class LabResultWidget extends StatelessWidget {
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
color: Colors.white, color: Colors.white,
child: Center( child: Center(
child: Texts( child: AppText(
lab.referanceRange, lab.referanceRange,
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),

@ -3,7 +3,7 @@ import 'package:doctor_app_flutter/core/model/labs/LabOrderResult.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';

@ -5,7 +5,7 @@ import 'package:doctor_app_flutter/models/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/screens/patients/profile/lab_result/LabResultWidget.dart'; import 'package:doctor_app_flutter/screens/patients/profile/lab_result/LabResultWidget.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart'; import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -79,7 +79,7 @@ class _LaboratoryResultWidgetState extends State<LaboratoryResultWidget> {
children: <Widget>[ children: <Widget>[
Expanded(child: Container( Expanded(child: Container(
margin: EdgeInsets.only(left: 10, right: 10), margin: EdgeInsets.only(left: 10, right: 10),
child: Texts(TranslationBase.of(context).generalResult,bold: true,))), child: AppText(TranslationBase.of(context).generalResult,bold: true,))),
Container( Container(
width: 25, width: 25,
height: 25, height: 25,

@ -9,9 +9,10 @@ import 'package:doctor_app_flutter/screens/procedures/add_lab_orders.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_expandable_notifier_new.dart'; import 'package:doctor_app_flutter/widgets/shared/app_expandable_notifier_new.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/doctor_card.dart'; import 'package:doctor_app_flutter/widgets/shared/doctor_card.dart';
import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
@ -55,13 +56,13 @@ class LabsHomePage extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts( AppText(
'Lab', 'Lab',
style: "caption2", style: "caption2",
color: Colors.black, color: Colors.black,
fontSize: 13, fontSize: 13,
), ),
Texts( AppText(
'Result', 'Result',
bold: true, bold: true,
fontSize: 22, fontSize: 22,
@ -75,13 +76,13 @@ class LabsHomePage extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts( AppText(
'Lab', 'Lab',
style: "caption2", style: "caption2",
color: Colors.black, color: Colors.black,
fontSize: 13, fontSize: 13,
), ),
Texts( AppText(
'Result', 'Result',
bold: true, bold: true,
fontSize: 22, fontSize: 22,
@ -135,7 +136,7 @@ class LabsHomePage extends StatelessWidget {
SizedBox( SizedBox(
height: 10, height: 10,
), ),
Texts( AppText(
'Apply for New Lab Order', 'Apply for New Lab Order',
color: Colors.grey[600], color: Colors.grey[600],
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -186,7 +187,7 @@ class LabsHomePage extends StatelessWidget {
Image.asset('assets/images/no-data.png'), Image.asset('assets/images/no-data.png'),
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Texts('No Lab Result Found'), child: AppText('No Lab Result Found'),
) )
], ],

@ -4,7 +4,7 @@ import 'package:doctor_app_flutter/models/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/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/widgets/shared/buttons/secondary_button.dart'; import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/widgets/shared/buttons/secondary_button.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -64,13 +64,13 @@ class RadiologyDetailsPage extends StatelessWidget {
SizedBox( SizedBox(
height: 5, height: 5,
), ),
Texts(TranslationBase.of(context).generalResult), AppText(TranslationBase.of(context).generalResult),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Texts( child: AppText(
'${finalRadiology.reportData.trim()}', '${finalRadiology.reportData.trim()}',
textAlign: TextAlign.start, textAlign: TextAlign.start,
fontSize: 17, fontSize: 17,

@ -10,7 +10,7 @@ import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_expandable_notifier_new.dart'; import 'package:doctor_app_flutter/widgets/shared/app_expandable_notifier_new.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/doctor_card.dart'; import 'package:doctor_app_flutter/widgets/shared/doctor_card.dart';
@ -51,13 +51,13 @@ class RadiologyHomePage extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts( AppText(
'Radiology', 'Radiology',
style: "caption2", style: "caption2",
color: Colors.black, color: Colors.black,
fontSize: 13, fontSize: 13,
), ),
Texts( AppText(
'Result', 'Result',
bold: true, bold: true,
fontSize: 22, fontSize: 22,
@ -71,13 +71,13 @@ class RadiologyHomePage extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts( AppText(
'Radiology', 'Radiology',
style: "caption2", style: "caption2",
color: Colors.black, color: Colors.black,
fontSize: 13, fontSize: 13,
), ),
Texts( AppText(
'Result', 'Result',
bold: true, bold: true,
fontSize: 22, fontSize: 22,
@ -132,7 +132,7 @@ class RadiologyHomePage extends StatelessWidget {
SizedBox( SizedBox(
height: 10, height: 10,
), ),
Texts( AppText(
'Apply for Radiology Order', 'Apply for Radiology Order',
color: Colors.grey[600], color: Colors.grey[600],
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -173,7 +173,7 @@ class RadiologyHomePage extends StatelessWidget {
Image.asset('assets/images/no-data.png'), Image.asset('assets/images/no-data.png'),
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Texts('No Radiology Found'), child: AppText('No Radiology Found'),
) )
], ],

@ -5,7 +5,6 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/app_text_form_field.dart';
import 'package:doctor_app_flutter/widgets/shared/dialogs/dailog-list-select.dart'; import 'package:doctor_app_flutter/widgets/shared/dialogs/dailog-list-select.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart';
import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart';

@ -1,4 +1,3 @@
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart';
@ -6,13 +5,10 @@ import 'package:doctor_app_flutter/models/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/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/patient-referral-item-widget.dart'; import 'package:doctor_app_flutter/widgets/patients/patient-referral-item-widget.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-page-header-widget.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.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';

@ -15,14 +15,14 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.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/dialogs/master_key_dailog.dart'; import 'package:doctor_app_flutter/widgets/shared/dialogs/master_key_dailog.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/app-textfield-custom.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/auto_complete_text_field.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/auto_complete_text_field.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/text_field_error.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/text_field_error.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/text_fields_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/text_fields_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -192,7 +192,7 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
suggestions: model.listOfICD10, suggestions: model.listOfICD10,
itemBuilder: (context, suggestion) => itemBuilder: (context, suggestion) =>
new Padding( new Padding(
child: Texts(suggestion child: AppText(suggestion
.description + .description +
" / " + " / " +
suggestion.code.toString()), suggestion.code.toString()),

@ -11,7 +11,7 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.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';
@ -388,7 +388,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
children: [ children: [
Column( Column(
children: [ children: [
Texts( AppText(
assessment.createdOn != null assessment.createdOn != null
? DateUtils ? DateUtils
.getDayMonthYearDateFormatted( .getDayMonthYearDateFormatted(
@ -401,7 +401,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
fontWeight: FontWeight fontWeight: FontWeight
.w600, .w600,
fontSize: 14, fontSize: 14,
), Texts( ), AppText(
assessment.createdOn != null assessment.createdOn != null
? DateUtils.getHour( ? DateUtils.getHour(
DateTime.parse( DateTime.parse(

@ -4,7 +4,7 @@ import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
import 'package:doctor_app_flutter/models/SOAP/my_selected_examination.dart'; import 'package:doctor_app_flutter/models/SOAP/my_selected_examination.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/app-textfield-custom.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/expandable-widget-header-body.dart'; import 'package:doctor_app_flutter/widgets/shared/expandable-widget-header-body.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';

@ -1,7 +1,7 @@
import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
import 'package:doctor_app_flutter/models/SOAP/my_selected_examination.dart'; import 'package:doctor_app_flutter/models/SOAP/my_selected_examination.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/app-textfield-custom.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart'; import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';

@ -12,8 +12,8 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/app-textfield-custom.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.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:flutter/material.dart'; import 'package:flutter/material.dart';
@ -164,12 +164,12 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
children: [ children: [
Row( Row(
children: [ children: [
Texts('Appointment No: ',fontSize: 12,), AppText('Appointment No: ',fontSize: 12,),
Texts(widget.patientProgressNote.appointmentNo??'',fontWeight: FontWeight.w600,), AppText(widget.patientProgressNote.appointmentNo??'',fontWeight: FontWeight.w600,),
], ],
), ),
Texts( AppText(
widget.patientProgressNote.createdOn !=null?DateUtils.getDayMonthYearDateFormatted(DateTime.parse(widget.patientProgressNote.createdOn)):DateUtils.getDayMonthYearDateFormatted(DateTime.now()), widget.patientProgressNote.createdOn !=null?DateUtils.getDayMonthYearDateFormatted(DateTime.parse(widget.patientProgressNote.createdOn)):DateUtils.getDayMonthYearDateFormatted(DateTime.now()),
fontWeight: FontWeight fontWeight: FontWeight
.w600, .w600,
@ -186,13 +186,13 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
children: [ children: [
Row( Row(
children: [ children: [
Texts('Condition: ', AppText('Condition: ',
fontSize: 12,), fontSize: 12,),
Texts( AppText(
widget.patientProgressNote.mName??'',fontWeight: FontWeight.w600), widget.patientProgressNote.mName??'',fontWeight: FontWeight.w600),
], ],
), ),
Texts( AppText(
widget.patientProgressNote.createdOn !=null?DateUtils.getHour(DateTime.parse(widget.patientProgressNote.createdOn)):DateUtils.getHour(DateTime.now()), widget.patientProgressNote.createdOn !=null?DateUtils.getHour(DateTime.parse(widget.patientProgressNote.createdOn)):DateUtils.getHour(DateTime.now()),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 14, fontSize: 14,
@ -206,7 +206,7 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
MainAxisAlignment.start, MainAxisAlignment.start,
children: [ children: [
Expanded( Expanded(
child: Texts( child: AppText(
progressNoteController.text, progressNoteController.text,
fontSize: 10, fontSize: 10,
), ),

@ -1,4 +1,4 @@
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/expandable-widget-header-body.dart'; import 'package:doctor_app_flutter/widgets/shared/expandable-widget-header-body.dart';
import 'package:eva_icons_flutter/eva_icons_flutter.dart'; import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -39,7 +39,7 @@ class ExpandableSOAPWidget extends StatelessWidget {
onTap: onTap, onTap: onTap,
child: Row( child: Row(
children: [ children: [
Texts(headerTitle, AppText(headerTitle,
variant: isExpanded ? "bodyText" : '', variant: isExpanded ? "bodyText" : '',
fontSize: 15, fontSize: 15,
color: Colors.black), color: Colors.black),

@ -2,7 +2,7 @@ import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/models/SOAP/my_selected_allergy.dart'; import 'package:doctor_app_flutter/models/SOAP/my_selected_allergy.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart'; import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -63,7 +63,7 @@ class _UpdateAllergiesWidgetState extends State<UpdateAllergiesWidget> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts( AppText(
projectViewModel.isArabic projectViewModel.isArabic
? selectedAllergy.selectedAllergy.nameAr ? selectedAllergy.selectedAllergy.nameAr
: selectedAllergy.selectedAllergy.nameEn : selectedAllergy.selectedAllergy.nameEn
@ -73,7 +73,7 @@ class _UpdateAllergiesWidgetState extends State<UpdateAllergiesWidget> {
: TextDecoration.lineThrough, : TextDecoration.lineThrough,
bold: true, bold: true,
color: Color(0xFF2B353E)), color: Color(0xFF2B353E)),
Texts( AppText(
projectViewModel.isArabic projectViewModel.isArabic
? selectedAllergy.selectedAllergySeverity ? selectedAllergy.selectedAllergySeverity
.nameAr .nameAr
@ -96,7 +96,7 @@ class _UpdateAllergiesWidgetState extends State<UpdateAllergiesWidget> {
InkWell( InkWell(
child: Row( child: Row(
children: [Container( children: [Container(
child: Texts( child: AppText(
TranslationBase TranslationBase
.of(context) .of(context)
.remove, .remove,

@ -1,6 +1,6 @@
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/app-textfield-custom.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/new_text_Field.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/new_text_Field.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';

@ -2,7 +2,7 @@ import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
import 'package:doctor_app_flutter/models/SOAP/my_selected_history.dart'; import 'package:doctor_app_flutter/models/SOAP/my_selected_history.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
@ -59,7 +59,7 @@ class _UpdateHistoryWidgetState extends State<UpdateHistoryWidget>
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Container( Container(
child: Texts( child: AppText(
projectViewModel.isArabic projectViewModel.isArabic
? myHistory.selectedHistory.nameAr ? myHistory.selectedHistory.nameAr
: myHistory.selectedHistory.nameEn, : myHistory.selectedHistory.nameEn,
@ -78,7 +78,7 @@ class _UpdateHistoryWidgetState extends State<UpdateHistoryWidget>
child: Row( child: Row(
children: [ children: [
Container( Container(
child: Texts( child: AppText(
TranslationBase TranslationBase
.of(context) .of(context)
.remove, .remove,

@ -7,14 +7,14 @@ import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/models/SOAP/master_key_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/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.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/dialogs/master_key_dailog.dart'; import 'package:doctor_app_flutter/widgets/shared/dialogs/master_key_dailog.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/app-textfield-custom.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/auto_complete_text_field.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/auto_complete_text_field.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/text_field_error.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/text_field_error.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/text_fields_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/text_fields_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -139,7 +139,7 @@ class _AddMedicationState extends State<AddMedication> {
itemBuilder: (context, itemBuilder: (context,
suggestion) => suggestion) =>
new Padding( new Padding(
child: Texts(suggestion child: AppText(suggestion
.description + .description +
'/' + '/' +
suggestion suggestion

@ -17,10 +17,10 @@ import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/medicine/medicine_item_widget.dart'; import 'package:doctor_app_flutter/widgets/medicine/medicine_item_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/TextFields.dart'; import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/app_text_form_field.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app_text_form_field.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/dialogs/dailog-list-select.dart'; import 'package:doctor_app_flutter/widgets/shared/dialogs/dailog-list-select.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
@ -357,7 +357,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
// itemBuilder: (context, // itemBuilder: (context,
// suggestion) => // suggestion) =>
// new Padding( // new Padding(
// child: Texts(suggestion // child: AppText(suggestion
// .description + // .description +
// '/' + // '/' +
// suggestion // suggestion

@ -1,6 +1,6 @@
import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_report.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_report.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.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:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -45,7 +45,7 @@ class PrescriptionDetailsPage extends StatelessWidget {
child: Padding( child: Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Center( child: Center(
child: Texts( child: AppText(
prescriptionReport.itemDescription.isNotEmpty prescriptionReport.itemDescription.isNotEmpty
? prescriptionReport.itemDescription ? prescriptionReport.itemDescription
: prescriptionReport.itemDescriptionN), : prescriptionReport.itemDescriptionN),
@ -70,7 +70,7 @@ class PrescriptionDetailsPage extends StatelessWidget {
height: 30, height: 30,
width: double.infinity, width: double.infinity,
child: Center( child: Center(
child: Texts( child: AppText(
TranslationBase.of(context).route, TranslationBase.of(context).route,
fontSize: 14, fontSize: 14,
))), ))),
@ -79,7 +79,7 @@ class PrescriptionDetailsPage extends StatelessWidget {
height: 30, height: 30,
width: double.infinity, width: double.infinity,
child: Center( child: Center(
child: Texts( child: AppText(
TranslationBase.of(context).frequency, TranslationBase.of(context).frequency,
fontSize: 14, fontSize: 14,
))), ))),
@ -88,7 +88,7 @@ class PrescriptionDetailsPage extends StatelessWidget {
width: double.infinity, width: double.infinity,
padding: EdgeInsets.symmetric(horizontal: 4), padding: EdgeInsets.symmetric(horizontal: 4),
child: Center( child: Center(
child: Texts( child: AppText(
"${TranslationBase.of(context).dailyDoses}", "${TranslationBase.of(context).dailyDoses}",
fontSize: 14, fontSize: 14,
))), ))),
@ -97,7 +97,7 @@ class PrescriptionDetailsPage extends StatelessWidget {
height: 30, height: 30,
width: double.infinity, width: double.infinity,
child: Center( child: Center(
child: Texts( child: AppText(
TranslationBase.of(context).duration, TranslationBase.of(context).duration,
fontSize: 14, fontSize: 14,
))), ))),
@ -144,7 +144,7 @@ class PrescriptionDetailsPage extends StatelessWidget {
child: Center( child: Center(
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Texts(TranslationBase.of(context).notes), AppText(TranslationBase.of(context).notes),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
@ -155,7 +155,7 @@ class PrescriptionDetailsPage extends StatelessWidget {
SizedBox( SizedBox(
height: 5, height: 5,
), ),
Texts(prescriptionReport.remarks ?? ''), AppText(prescriptionReport.remarks ?? ''),
], ],
), ),
), ),

@ -9,7 +9,7 @@ import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_header_with_appointment_card.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_header_with_appointment_card.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.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/dialogs/ShowImageDialog.dart'; import 'package:doctor_app_flutter/widgets/shared/dialogs/ShowImageDialog.dart';
import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
@ -64,7 +64,7 @@ class PrescriptionItemsPage extends StatelessWidget {
children: [ children: [
Container( Container(
margin: EdgeInsets.only(left: 18,right: 18), margin: EdgeInsets.only(left: 18,right: 18),
child: Texts(model.prescriptionReportList[index].itemDescription.isNotEmpty ? model.prescriptionReportList[index].itemDescription : model.prescriptionReportList[index].itemDescriptionN,bold: true,)), child: AppText(model.prescriptionReportList[index].itemDescription.isNotEmpty ? model.prescriptionReportList[index].itemDescription : model.prescriptionReportList[index].itemDescriptionN,bold: true,)),
SizedBox(height: 12,), SizedBox(height: 12,),
Row( Row(
children: [ children: [
@ -100,30 +100,30 @@ class PrescriptionItemsPage extends StatelessWidget {
children: [ children: [
Row( Row(
children: [ children: [
Texts(TranslationBase.of(context).route,color: Colors.grey,), AppText(TranslationBase.of(context).route,color: Colors.grey,),
Expanded(child: Texts(" "+model.prescriptionReportList[index].routeN)), Expanded(child: AppText(" "+model.prescriptionReportList[index].routeN)),
], ],
), ),
Row( Row(
children: [ children: [
Texts(TranslationBase.of(context).frequency,color: Colors.grey,), AppText(TranslationBase.of(context).frequency,color: Colors.grey,),
Texts(" "+model.prescriptionReportList[index].frequencyN ?? ''), AppText(" "+model.prescriptionReportList[index].frequencyN ?? ''),
], ],
), ),
Row( Row(
children: [ children: [
Texts(TranslationBase.of(context).dailyDoses,color: Colors.grey,), AppText(TranslationBase.of(context).dailyDoses,color: Colors.grey,),
Texts(" "+model.prescriptionReportList[index].doseDailyQuantity ?? ''), AppText(" "+model.prescriptionReportList[index].doseDailyQuantity ?? ''),
], ],
), ),
Row( Row(
children: [ children: [
Texts(TranslationBase.of(context).duration,color: Colors.grey,), AppText(TranslationBase.of(context).duration,color: Colors.grey,),
Texts(" "+model.prescriptionReportList[index].days.toString() ?? ''), AppText(" "+model.prescriptionReportList[index].days.toString() ?? ''),
], ],
), ),
SizedBox(height: 12,), SizedBox(height: 12,),
Texts(model.prescriptionReportList[index].remarks ?? ''), AppText(model.prescriptionReportList[index].remarks ?? ''),
], ],
),) ),)
@ -151,7 +151,7 @@ class PrescriptionItemsPage extends StatelessWidget {
children: [ children: [
Container( Container(
margin: EdgeInsets.only(left: 18,right: 18), margin: EdgeInsets.only(left: 18,right: 18),
child: Texts(model.prescriptionReportEnhList[index].itemDescription,bold: true,),), child: AppText(model.prescriptionReportEnhList[index].itemDescription,bold: true,),),
SizedBox(height: 12,), SizedBox(height: 12,),
Row( Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
@ -190,30 +190,30 @@ class PrescriptionItemsPage extends StatelessWidget {
children: [ children: [
Row( Row(
children: [ children: [
Texts(TranslationBase.of(context).route,color: Colors.grey,), AppText(TranslationBase.of(context).route,color: Colors.grey,),
Expanded(child: Texts(" "+model.prescriptionReportEnhList[index].route??'')), Expanded(child: AppText(" "+model.prescriptionReportEnhList[index].route??'')),
], ],
), ),
Row( Row(
children: [ children: [
Texts(TranslationBase.of(context).frequency,color: Colors.grey,), AppText(TranslationBase.of(context).frequency,color: Colors.grey,),
Texts(" "+model.prescriptionReportEnhList[index].frequency ?? ''), AppText(" "+model.prescriptionReportEnhList[index].frequency ?? ''),
], ],
), ),
Row( Row(
children: [ children: [
Texts(TranslationBase.of(context).dailyDoses,color: Colors.grey,), AppText(TranslationBase.of(context).dailyDoses,color: Colors.grey,),
Texts(" "+model.prescriptionReportEnhList[index].doseDailyQuantity.toString() ?? ''), AppText(" "+model.prescriptionReportEnhList[index].doseDailyQuantity.toString() ?? ''),
], ],
), ),
Row( Row(
children: [ children: [
Texts(TranslationBase.of(context).duration,color: Colors.grey,), AppText(TranslationBase.of(context).duration,color: Colors.grey,),
Texts(" "+model.prescriptionReportList[index].days.toString() ?? ''), AppText(" "+model.prescriptionReportList[index].days.toString() ?? ''),
], ],
), ),
SizedBox(height: 12,), SizedBox(height: 12,),
Texts(model.prescriptionReportEnhList[index].remarks?? ''), AppText(model.prescriptionReportEnhList[index].remarks?? ''),
], ],
),) ),)

@ -1,7 +1,7 @@
import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/app_text_form_field.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app_text_form_field.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';

@ -10,7 +10,7 @@ import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_expandable_notifier_new.dart'; import 'package:doctor_app_flutter/widgets/shared/app_expandable_notifier_new.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/doctor_card.dart'; import 'package:doctor_app_flutter/widgets/shared/doctor_card.dart';
@ -49,13 +49,13 @@ class PrescriptionsPage extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts( AppText(
'Order', 'Order',
style: "caption2", style: "caption2",
color: Colors.black, color: Colors.black,
fontSize: 13, fontSize: 13,
), ),
Texts( AppText(
'Prescriptions', 'Prescriptions',
bold: true, bold: true,
fontSize: 22, fontSize: 22,
@ -69,13 +69,13 @@ class PrescriptionsPage extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts( AppText(
'Order', 'Order',
style: "caption2", style: "caption2",
color: Colors.black, color: Colors.black,
fontSize: 13, fontSize: 13,
), ),
Texts( AppText(
'Prescriptions', 'Prescriptions',
bold: true, bold: true,
fontSize: 22, fontSize: 22,
@ -121,7 +121,7 @@ class PrescriptionsPage extends StatelessWidget {
SizedBox( SizedBox(
height: 10, height: 10,
), ),
Texts( AppText(
'Apply for New Prescriptions Order', 'Apply for New Prescriptions Order',
color: Colors.grey[600], color: Colors.grey[600],
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -170,7 +170,7 @@ class PrescriptionsPage extends StatelessWidget {
Image.asset('assets/images/no-data.png'), Image.asset('assets/images/no-data.png'),
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Texts('No Lab Result Found'), child: AppText('No Lab Result Found'),
) )
], ],

@ -12,7 +12,7 @@ import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/TextFields.dart'; import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
@ -204,7 +204,7 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
// itemBuilder: (context, // itemBuilder: (context,
// suggestion) => // suggestion) =>
// new Padding( // new Padding(
// child: Texts(suggestion // child: AppText(suggestion
// .description + // .description +
// '/' + // '/' +
// suggestion.genericName), // suggestion.genericName),

@ -5,7 +5,7 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/screens/patients/profile/lab_result/FlowChartPage.dart'; import 'package:doctor_app_flutter/screens/patients/profile/lab_result/FlowChartPage.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -72,7 +72,7 @@ class ProcedureCard extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts( AppText(
entityList.orderType == 0 entityList.orderType == 0
? 'Routine' ? 'Routine'
: 'Urgent', : 'Urgent',
@ -84,7 +84,7 @@ class ProcedureCard extends StatelessWidget {
SizedBox( SizedBox(
height: 5, height: 5,
), ),
Texts( AppText(
entityList.procedureName, entityList.procedureName,
bold: true, bold: true,
fontSize: 14, fontSize: 14,
@ -99,13 +99,13 @@ class ProcedureCard extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: [ children: [
Texts( AppText(
'${DateUtils.getDayMonthYearDateFormatted(DateUtils.convertISOStringToDateTime(entityList.orderDate), isArabic: projectViewModel.isArabic)}', '${DateUtils.getDayMonthYearDateFormatted(DateUtils.convertISOStringToDateTime(entityList.orderDate), isArabic: projectViewModel.isArabic)}',
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 14, fontSize: 14,
), ),
Texts( AppText(
'${DateUtils.getHour(DateUtils.convertISOStringToDateTime(entityList.orderDate))}', '${DateUtils.getHour(DateUtils.convertISOStringToDateTime(entityList.orderDate))}',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Colors.grey[700], color: Colors.grey[700],
@ -117,13 +117,13 @@ class ProcedureCard extends StatelessWidget {
), ),
Row( Row(
children: [ children: [
Texts( AppText(
TranslationBase.of(context).orderNo, TranslationBase.of(context).orderNo,
//color: Colors.grey, //color: Colors.grey,
fontSize: 12, fontSize: 12,
color: Colors.grey, color: Colors.grey,
), ),
Texts( AppText(
entityList.orderNo.toString(), entityList.orderNo.toString(),
fontSize: 12, fontSize: 12,
bold: true, bold: true,
@ -132,13 +132,13 @@ class ProcedureCard extends StatelessWidget {
), ),
Row( Row(
children: [ children: [
Texts( AppText(
TranslationBase.of(context).doctorName + ": ", TranslationBase.of(context).doctorName + ": ",
//color: Colors.grey, //color: Colors.grey,
fontSize: 12, fontSize: 12,
color: Colors.grey, color: Colors.grey,
), ),
Texts( AppText(
entityList.doctorName.toString(), entityList.doctorName.toString(),
fontSize: 12, fontSize: 12,
bold: true, bold: true,
@ -147,13 +147,13 @@ class ProcedureCard extends StatelessWidget {
), ),
Row( Row(
children: [ children: [
Texts( AppText(
TranslationBase.of(context).clinic + ": ", TranslationBase.of(context).clinic + ": ",
//color: Colors.grey, //color: Colors.grey,
fontSize: 12, fontSize: 12,
color: Colors.grey, color: Colors.grey,
), ),
Texts( AppText(
entityList.clinicDescription ?? "", entityList.clinicDescription ?? "",
bold: true, bold: true,
fontSize: 12, fontSize: 12,
@ -174,7 +174,7 @@ class ProcedureCard extends StatelessWidget {
), ),
); );
}, },
child: Texts( child: AppText(
TranslationBase.of(context).showMoreBtn, TranslationBase.of(context).showMoreBtn,
textDecoration: TextDecoration.underline, textDecoration: TextDecoration.underline,
color: Colors.blue, color: Colors.blue,
@ -184,7 +184,7 @@ class ProcedureCard extends StatelessWidget {
// Row( // Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween, // mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: [ // children: [
// Texts( // AppText(
// entityList.remarks.toString() ?? '', // entityList.remarks.toString() ?? '',
// fontSize: 12, // fontSize: 12,
// ), // ),

@ -4,7 +4,7 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/model/procedure/categories_procedure.dart'; import 'package:doctor_app_flutter/core/model/procedure/categories_procedure.dart';
import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart'; import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/TextFields.dart'; import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
@ -120,7 +120,7 @@ class _EntityListCheckboxSearchWidgetState
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 10, vertical: 0), horizontal: 10, vertical: 0),
child: Texts( child: AppText(
historyInfo.procedureName, historyInfo.procedureName,
fontSize: 14.0, fontSize: 14.0,
variant: "bodyText", variant: "bodyText",

@ -2,7 +2,7 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/model/procedure/categories_procedure.dart'; import 'package:doctor_app_flutter/core/model/procedure/categories_procedure.dart';
import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart'; import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/TextFields.dart'; import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
@ -112,7 +112,7 @@ class _ProcedureListWidgetState extends State<ProcedureListWidget> {
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 10, vertical: 0), horizontal: 10, vertical: 0),
child: Texts( child: AppText(
historyInfo.procedureName, historyInfo.procedureName,
variant: "bodyText", variant: "bodyText",
bold: true, bold: true,

@ -10,7 +10,7 @@ import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-page-header-widget.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-page-header-widget.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.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';
import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart'; import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
@ -50,13 +50,13 @@ class ProcedureScreen extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts( AppText(
'Order Test or', 'Order Test or',
style: "caption2", style: "caption2",
color: Colors.black, color: Colors.black,
fontSize: 13, fontSize: 13,
), ),
Texts( AppText(
'Procedure', 'Procedure',
bold: true, bold: true,
fontSize: 22, fontSize: 22,
@ -70,13 +70,13 @@ class ProcedureScreen extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts( AppText(
'Order Test or', 'Order Test or',
style: "caption2", style: "caption2",
color: Colors.black, color: Colors.black,
fontSize: 13, fontSize: 13,
), ),
Texts( AppText(
'Procedure', 'Procedure',
bold: true, bold: true,
fontSize: 22, fontSize: 22,
@ -128,7 +128,7 @@ class ProcedureScreen extends StatelessWidget {
SizedBox( SizedBox(
height: 10, height: 10,
), ),
Texts( AppText(
'Add More Procedure', 'Add More Procedure',
color: Colors.grey[600], color: Colors.grey[600],
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -188,7 +188,7 @@ class ProcedureScreen extends StatelessWidget {
Image.asset('assets/images/no-data.png'), Image.asset('assets/images/no-data.png'),
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Texts('No Procedure Found'), child: AppText('No Procedure Found'),
) )
], ],
), ),
@ -204,7 +204,7 @@ class ProcedureScreen extends StatelessWidget {
Image.asset('assets/images/no-data.png'), Image.asset('assets/images/no-data.png'),
Padding( Padding(
padding: const EdgeInsets.all(22.0), padding: const EdgeInsets.all(22.0),
child: Texts(model.error), child: AppText(model.error),
) )
], ],
), ),

@ -12,10 +12,10 @@ import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.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/user-guid/text_fields/app_text_form_field.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app_text_form_field.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -880,7 +880,7 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
), ),
// Column( // Column(
// children: [ // children: [
// Texts(TranslationBase.of(context) // AppText(TranslationBase.of(context)
// .previousSickLeaveIssue + // .previousSickLeaveIssue +
// ' ') // ' ')
// ], // ],

@ -13,7 +13,7 @@ import 'package:doctor_app_flutter/widgets/patients/profile/patient-page-header-
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.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';
import 'package:doctor_app_flutter/widgets/shared/card_with_bgNew_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/card_with_bgNew_widget.dart';
@ -252,7 +252,7 @@ class AddSickLeavScreen extends StatelessWidget {
Image.asset('assets/images/no-data.png'), Image.asset('assets/images/no-data.png'),
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Texts('No Sick Leave Found'), child: AppText('No Sick Leave Found'),
) )
], ],
), ),

@ -12,10 +12,10 @@ import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-page-header-widget.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-page-header-widget.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.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/user-guid/text_fields/app_text_form_field.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app_text_form_field.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -424,7 +424,7 @@ class _SickLeaveScreenState extends State<SickLeaveScreen> {
), ),
// Column( // Column(
// children: [ // children: [
// Texts(TranslationBase.of(context) // AppText(TranslationBase.of(context)
// .previousSickLeaveIssue + // .previousSickLeaveIssue +
// ' ') // ' ')
// ], // ],

@ -4,7 +4,7 @@ import 'package:doctor_app_flutter/screens/auth/verification_methods_screen.dart
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/app_text_form_field.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app_text_form_field.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart'; import 'package:flutter/rendering.dart';

@ -1,6 +1,6 @@
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/models/patient/lab_result/lab_result.dart'; import 'package:doctor_app_flutter/models/patient/lab_result/lab_result.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/card_with_bgNew_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/card_with_bgNew_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -72,7 +72,7 @@ class _LabResultWidgetState extends State<LabResultWidget> {
), ),
), ),
child: Center( child: Center(
child: Texts( child: AppText(
TranslationBase.of(context).description, TranslationBase.of(context).description,
color: Colors.white, color: Colors.white,
), ),
@ -84,7 +84,7 @@ class _LabResultWidgetState extends State<LabResultWidget> {
child: Container( child: Container(
color: HexColor('#515B5D'), color: HexColor('#515B5D'),
child: Center( child: Center(
child: Texts( child: AppText(
TranslationBase.of(context).value, TranslationBase.of(context).value,
color: Colors.white), color: Colors.white),
), ),
@ -99,7 +99,7 @@ class _LabResultWidgetState extends State<LabResultWidget> {
), ),
), ),
child: Center( child: Center(
child: Texts( child: AppText(
TranslationBase.of(context).range, TranslationBase.of(context).range,
color: Colors.white), color: Colors.white),
), ),
@ -135,7 +135,7 @@ class _LabResultWidgetState extends State<LabResultWidget> {
), ),
), ),
child: Center( child: Center(
child: Texts( child: AppText(
'${result.description}', '${result.description}',
color: Colors.grey[800], color: Colors.grey[800],
), ),
@ -146,7 +146,7 @@ class _LabResultWidgetState extends State<LabResultWidget> {
Expanded( Expanded(
child: Container( child: Container(
child: Center( child: Center(
child: Texts('${result.resultValue}', child: AppText('${result.resultValue}',
color: Colors.grey[800]), color: Colors.grey[800]),
), ),
height: 60), height: 60),
@ -154,7 +154,7 @@ class _LabResultWidgetState extends State<LabResultWidget> {
Expanded( Expanded(
child: Container( child: Container(
child: Center( child: Center(
child: Texts( child: AppText(
'${result.referenceRange}', '${result.referenceRange}',
color: Colors.grey[800]), color: Colors.grey[800]),
), ),

@ -5,7 +5,7 @@ import 'package:doctor_app_flutter/models/patient/my_referral/my_referral_patien
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/TextFields.dart'; import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';

@ -5,7 +5,7 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';

@ -1,8 +1,8 @@
import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/models/patient/patient_model.dart'; import 'package:doctor_app_flutter/models/patient/patient_model.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/app_text_form_field.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/custom_validation_error.dart'; import 'package:doctor_app_flutter/widgets/shared/user-guid/custom_validation_error.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/app_text_form_field.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';

@ -6,7 +6,7 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
@ -372,7 +372,7 @@ class PatientProfileHeaderWhitAppointment extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Texts( AppText(
'${TranslationBase.of(context).dr}.$doctorName', '${TranslationBase.of(context).dr}.$doctorName',
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -381,11 +381,11 @@ class PatientProfileHeaderWhitAppointment extends StatelessWidget {
if (orderNo != null && !isPrescriptions) if (orderNo != null && !isPrescriptions)
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( AppText(
'Order No:', 'Order No:',
color: Colors.grey[800], color: Colors.grey[800],
), ),
Texts( AppText(
orderNo ?? '', orderNo ?? '',
) )
], ],
@ -393,11 +393,11 @@ class PatientProfileHeaderWhitAppointment extends StatelessWidget {
if (invoiceNO != null && !isPrescriptions) if (invoiceNO != null && !isPrescriptions)
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( AppText(
'Invoice:', 'Invoice:',
color: Colors.grey[800], color: Colors.grey[800],
), ),
Texts( AppText(
invoiceNO, invoiceNO,
) )
], ],
@ -405,11 +405,11 @@ class PatientProfileHeaderWhitAppointment extends StatelessWidget {
if(isPrescriptions) if(isPrescriptions)
Row( Row(
children: [ children: [
Texts( AppText(
'Branch:', 'Branch:',
color: Colors.grey[800], color: Colors.grey[800],
), ),
Texts( AppText(
branch?? '', branch?? '',
) )
], ],
@ -417,23 +417,23 @@ class PatientProfileHeaderWhitAppointment extends StatelessWidget {
if(isPrescriptions) if(isPrescriptions)
Row( Row(
children: [ children: [
Texts( AppText(
'Clinic:', 'Clinic:',
color: Colors.grey[800], color: Colors.grey[800],
), ),
Texts( AppText(
clinic?? '', clinic?? '',
) )
], ],
), ),
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( AppText(
!isPrescriptions? 'Result Date:': 'Prescriptions Date', !isPrescriptions? 'Result Date:': 'Prescriptions Date',
color: Colors.grey[800], color: Colors.grey[800],
), ),
Expanded( Expanded(
child: Texts( child: AppText(
'${DateUtils.getDayMonthYearDateFormatted(appointmentDate, isArabic: projectViewModel.isArabic)}', '${DateUtils.getDayMonthYearDateFormatted(appointmentDate, isArabic: projectViewModel.isArabic)}',
), ),
) )

@ -6,7 +6,7 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
@ -322,7 +322,7 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Texts( AppText(
'${TranslationBase.of(context).dr}$doctorName', '${TranslationBase.of(context).dr}$doctorName',
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -331,63 +331,63 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget
if (orderNo != null && !isPrescriptions) if (orderNo != null && !isPrescriptions)
Row( Row(
children: <Widget>[ children: <Widget>[
Texts('Order No: ', AppText('Order No: ',
color: Colors.grey[800], color: Colors.grey[800],
fontSize: 12), fontSize: 12),
Texts(orderNo ?? '', fontSize: 12) AppText(orderNo ?? '', fontSize: 12)
], ],
), ),
if (invoiceNO != null && !isPrescriptions) if (invoiceNO != null && !isPrescriptions)
Row( Row(
children: <Widget>[ children: <Widget>[
Texts('Invoice: ', AppText('Invoice: ',
color: Colors.grey[800], color: Colors.grey[800],
fontSize: 12), fontSize: 12),
Texts(invoiceNO, fontSize: 12) AppText(invoiceNO, fontSize: 12)
], ],
), ),
if (branch != null) if (branch != null)
Row( Row(
children: [ children: [
Texts('Branch: ', AppText('Branch: ',
color: Colors.grey[800], color: Colors.grey[800],
fontSize: 12), fontSize: 12),
Texts(branch ?? '', fontSize: 12) AppText(branch ?? '', fontSize: 12)
], ],
), ),
if (isPrescriptions) if (isPrescriptions)
if (clinic != null) if (clinic != null)
Row( Row(
children: [ children: [
Texts('Clinic: ', AppText('Clinic: ',
color: Colors.grey[800], color: Colors.grey[800],
fontSize: 12), fontSize: 12),
Texts(clinic ?? '', fontSize: 12) AppText(clinic ?? '', fontSize: 12)
], ],
), ),
if (isMedicalFile && episode != null) if (isMedicalFile && episode != null)
Row( Row(
children: [ children: [
Texts('Episode: ', AppText('Episode: ',
color: Colors.grey[800], color: Colors.grey[800],
fontSize: 12), fontSize: 12),
Texts(episode ?? '', fontSize: 12) AppText(episode ?? '', fontSize: 12)
], ],
), ),
if (isMedicalFile && vistDate != null) if (isMedicalFile && vistDate != null)
Row( Row(
children: [ children: [
Texts('Visit Date: ', AppText('Visit Date: ',
color: Colors.grey[800], color: Colors.grey[800],
fontSize: 12), fontSize: 12),
Texts(vistDate ?? '', fontSize: 12) AppText(vistDate ?? '', fontSize: 12)
], ],
), ),
if (!isMedicalFile) if (!isMedicalFile)
Row( Row(
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: Texts( child: AppText(
!isPrescriptions !isPrescriptions
? 'Result Date: ' ? 'Result Date: '
: 'Prescriptions Date ', : 'Prescriptions Date ',
@ -395,7 +395,7 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget
fontSize: 12, fontSize: 12,
), ),
), ),
Texts( AppText(
'${DateUtils.getDayMonthYearDateFormatted(appointmentDate, isArabic: projectViewModel.isArabic)}', '${DateUtils.getDayMonthYearDateFormatted(appointmentDate, isArabic: projectViewModel.isArabic)}',
fontSize: 14, fontSize: 14,
) )

@ -1,7 +1,7 @@
import 'package:doctor_app_flutter/models/patient/vital_sign/vital_sign_res_model.dart'; import 'package:doctor_app_flutter/models/patient/vital_sign/vital_sign_res_model.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
@ -61,7 +61,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignDetailsWidget> {
), ),
), ),
child: Center( child: Center(
child: Texts( child: AppText(
widget.title1, widget.title1,
color: Colors.white, color: Colors.white,
), ),
@ -78,7 +78,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignDetailsWidget> {
), ),
), ),
child: Center( child: Center(
child: Texts(widget.title2, color: Colors.white), child: AppText(widget.title2, color: Colors.white),
), ),
height: 60), height: 60),
) )
@ -90,7 +90,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignDetailsWidget> {
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
color: Colors.white, color: Colors.white,
child: Center( child: Center(
child: Texts( child: AppText(
'${DateUtils.getWeekDay(vital.vitalSignDate.weekday)}, ${vital.vitalSignDate.day} ${DateUtils.getMonth(vital.vitalSignDate.month)}, ${vital.vitalSignDate.year} ', '${DateUtils.getWeekDay(vital.vitalSignDate.weekday)}, ${vital.vitalSignDate.day} ${DateUtils.getMonth(vital.vitalSignDate.month)}, ${vital.vitalSignDate.year} ',
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
@ -102,7 +102,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignDetailsWidget> {
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
color: Colors.white, color: Colors.white,
child: Center( child: Center(
child: Texts( child: AppText(
'${vital.toJson()[widget.viewKey]}', '${vital.toJson()[widget.viewKey]}',
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),

@ -1,7 +1,6 @@
import 'package:eva_icons_flutter/eva_icons_flutter.dart'; import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'Text.dart';
class StarRating extends StatelessWidget { class StarRating extends StatelessWidget {
final double totalAverage; final double totalAverage;
@ -21,7 +20,7 @@ class StarRating extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Row(mainAxisAlignment: MainAxisAlignment.start, children: <Widget>[ return Row(mainAxisAlignment: MainAxisAlignment.start, children: <Widget>[
if (!forceStars && (totalAverage == null || totalAverage == 0)) if (!forceStars && (totalAverage == null || totalAverage == 0))
Texts("New", style: "caption"), AppText("New", style: "caption"),
if (forceStars || (totalAverage != null && totalAverage > 0)) if (forceStars || (totalAverage != null && totalAverage > 0))
...List.generate( ...List.generate(
5, 5,
@ -38,7 +37,7 @@ class StarRating extends StatelessWidget {
)), )),
if (totalCount != null) SizedBox(width: 9.0), if (totalCount != null) SizedBox(width: 9.0),
if (totalCount != null) if (totalCount != null)
Texts( AppText(
"(" + totalCount.toString() + ")", "(" + totalCount.toString() + ")",
style: "overline", style: "overline",
color: Colors.grey[400], color: Colors.grey[400],

@ -1,262 +0,0 @@
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
class Texts extends StatefulWidget {
final String text;
final String variant;
final Color color;
final bool bold;
final bool regular;
final bool medium;
final int maxLength;
final bool italic;
final TextAlign textAlign;
final int maxLines;
final bool readMore;
final String style;
final bool allowExpand;
final double fontSize;
final FontWeight fontWeight;
final TextDecoration textDecoration;
Texts(this.text,
{Key key,
this.variant,
this.color,
this.bold,
this.regular,
this.medium,
this.allowExpand = true,
this.italic: false,
this.textAlign,
this.maxLength = 60,
this.maxLines,
this.readMore = false,
this.style,
this.textDecoration, this.fontSize, this.fontWeight})
: super(key: key);
@override
_TextsState createState() => _TextsState();
}
class _TextsState extends State<Texts> {
bool hidden = false;
String text = "";
@override
void didUpdateWidget(Texts oldWidget) {
setState(() {
if (widget.style == "overline")
text = widget.text.toUpperCase();
else {
text = widget.text;
}
});
super.didUpdateWidget(oldWidget);
}
@override
void initState() {
hidden = widget.readMore;
if (widget.style == "overline")
text = widget.text.toUpperCase();
else {
text = widget.text;
}
super.initState();
}
double _getFontSize() {
switch (widget.variant) {
case "heading0":
return 40.0;
case "heading":
return 32.0;
case "heading2":
return 28.0;
case "heading3":
return 18.0;
case "body1":
return 18.0;
case "body2":
return 20.0;
case "body2Link":
return 16.0;
case "caption":
return 16.0;
case "caption2":
return 14.0;
case "bodyText":
return 15.0;
case "bodyText2":
return 17.0;
case "caption3":
return 12.0;
case "caption4":
return 9.0;
case "overline":
return 11.0;
case "date":
return 24.0;
default:
return 16.0;
}
}
FontWeight _getFontWeight() {
if (widget.bold ?? false) {
return FontWeight.w900;
} else if (widget.regular ?? false) {
return FontWeight.w500;
} else if (widget.medium ?? false) {
return FontWeight.w800;
} else {
if (widget.style == null) {
switch (widget.variant) {
case "heading":
return FontWeight.w900;
case "heading2":
return FontWeight.w900;
case "heading3":
return FontWeight.w900;
case "body1":
return FontWeight.w800;
case "body2":
return FontWeight.w900;
case "body2Link":
return FontWeight.w800;
case "caption":
return FontWeight.w700;
case "caption2":
return FontWeight.w700;
case "bodyText":
return FontWeight.w500;
case "bodyText2":
return FontWeight.w500;
case "caption3":
return FontWeight.w600;
case "caption4":
return FontWeight.w600;
case "overline":
return FontWeight.w800;
case "date":
return FontWeight.w900;
default:
return FontWeight.w500;
}
} else {
return null;
}
}
}
@override
Widget build(BuildContext context) {
TextStyle _getFontStyle() {
switch (widget.style) {
case "headline2":
return Theme.of(context).textTheme.headline2;
case "headline3":
return Theme.of(context).textTheme.headline3;
case "headline4":
return Theme.of(context).textTheme.headline4;
case "headline5":
return Theme.of(context).textTheme.headline5;
case "headline6":
return Theme.of(context).textTheme.headline6;
case "bodyText2":
return Theme.of(context).textTheme.bodyText2;
case "bodyText_15":
return Theme.of(context).textTheme.bodyText2.copyWith(fontSize: 15.0);
case "bodyText1":
return Theme.of(context).textTheme.bodyText1;
case "caption":
return Theme.of(context).textTheme.caption;
case "overline":
return Theme.of(context).textTheme.overline;
case "button":
return Theme.of(context).textTheme.button;
default:
return TextStyle();
}
}
return Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Stack(
children: <Widget>[
Text(
!hidden
? text
: (text.substring(
0,
text.length > widget.maxLength
? widget.maxLength
: text.length)),
textAlign: widget.textAlign,
overflow: widget.maxLines != null
? ((widget.maxLines > 1)
? TextOverflow.fade
: TextOverflow.ellipsis)
: null,
maxLines: widget.maxLines ?? null,
style: widget.style != null
? _getFontStyle().copyWith(
fontStyle: widget.italic ? FontStyle.italic : null,
color: widget.color != null ? widget.color : null,
fontWeight: widget.fontWeight ?? _getFontWeight(),
)
: TextStyle(
fontStyle: widget.italic ? FontStyle.italic : null,
color:
widget.color != null ? widget.color : Colors.black,
fontSize:widget.fontSize?? _getFontSize(),
letterSpacing:
widget.variant == "overline" ? 1.5 : null,
fontWeight: widget.fontWeight ?? _getFontWeight(),
fontFamily: 'Poppins',
decoration:
widget.textDecoration //TextDecoration.lineThrough
)),
if (widget.readMore && text.length > widget.maxLength && hidden)
Positioned(
bottom: 0,
left: 0,
right: 0,
child: Container(
decoration: BoxDecoration(
gradient: LinearGradient(colors: [
Theme.of(context).backgroundColor,
Theme.of(context).backgroundColor.withOpacity(0),
], begin: Alignment.bottomCenter, end: Alignment.topCenter)),
height: 30,
),
)
],
),
if (widget.allowExpand &&
widget.readMore &&
text.length > widget.maxLength)
Padding(
padding: EdgeInsets.only(top: 8.0, right: 8.0, bottom: 8.0),
child: InkWell(
onTap: () {
setState(() {
hidden = !hidden;
});
},
child: Text(hidden ? "Read More" : "Read less",
style: _getFontStyle().copyWith(
color: HexColor('#FF0000'),
fontWeight: FontWeight.w800,
fontFamily: "Poppins",
)),
),
),
],
);
}
}

@ -18,6 +18,9 @@ class AppText extends StatefulWidget {
final double marginBottom; final double marginBottom;
final double marginLeft; final double marginLeft;
final TextAlign textAlign; final TextAlign textAlign;
final bool bold;
final bool regular;
final bool medium;
final int maxLines; final int maxLines;
final bool readMore; final bool readMore;
final String style; final String style;
@ -41,6 +44,9 @@ class AppText extends StatefulWidget {
this.marginBottom = 0, this.marginBottom = 0,
this.marginLeft = 0, this.marginLeft = 0,
this.textAlign, this.textAlign,
this.bold,
this.regular,
this.medium,
this.maxLines, this.maxLines,
this.readMore = false, this.readMore = false,
this.style, this.style,
@ -242,41 +248,49 @@ class _AppTextState extends State<AppText> {
} }
FontWeight _getFontWeight() { FontWeight _getFontWeight() {
if (widget.style == null) { if (widget.bold ?? false) {
switch (widget.variant) { return FontWeight.w900;
case "heading": } else if (widget.regular ?? false) {
return FontWeight.w900;
case "heading2":
return FontWeight.w900;
case "heading3":
return FontWeight.w900;
case "body1":
return FontWeight.w800;
case "body2":
return FontWeight.w900;
case "body2Link":
return FontWeight.w800;
case "caption":
return FontWeight.w700;
case "caption2":
return FontWeight.w700;
case "bodyText":
return FontWeight.w500;
case "bodyText2":
return FontWeight.w500;
case "caption3":
return FontWeight.w600;
case "caption4":
return FontWeight.w600;
case "overline":
return FontWeight.w800;
case "date":
return FontWeight.w900;
default:
return FontWeight.w500;
}
} else {
return FontWeight.w500; return FontWeight.w500;
} else if (widget.medium ?? false) {
return FontWeight.w800;
} else {
if (widget.style == null) {
switch (widget.variant) {
case "heading":
return FontWeight.w900;
case "heading2":
return FontWeight.w900;
case "heading3":
return FontWeight.w900;
case "body1":
return FontWeight.w800;
case "body2":
return FontWeight.w900;
case "body2Link":
return FontWeight.w800;
case "caption":
return FontWeight.w700;
case "caption2":
return FontWeight.w700;
case "bodyText":
return FontWeight.w500;
case "bodyText2":
return FontWeight.w500;
case "caption3":
return FontWeight.w600;
case "caption4":
return FontWeight.w600;
case "overline":
return FontWeight.w800;
case "date":
return FontWeight.w900;
default:
return FontWeight.w500;
}
} else {
return null;
}
} }
} }
} }

@ -2,6 +2,7 @@ import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/large_avatar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/large_avatar.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:eva_icons_flutter/eva_icons_flutter.dart'; import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -9,7 +10,6 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'StarRating.dart'; import 'StarRating.dart';
import 'Text.dart';
class DoctorCard extends StatelessWidget { class DoctorCard extends StatelessWidget {
final String doctorName; final String doctorName;
@ -57,7 +57,7 @@ class DoctorCard extends StatelessWidget {
Row( Row(
children: [ children: [
Expanded( Expanded(
child: Texts( child: AppText(
doctorName, doctorName,
bold: true, bold: true,
)), )),
@ -65,14 +65,14 @@ class DoctorCard extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
Texts( AppText(
'${DateUtils.getDayMonthYearDateFormatted(appointmentDate, isArabic: projectViewModel.isArabic)}', '${DateUtils.getDayMonthYearDateFormatted(appointmentDate, isArabic: projectViewModel.isArabic)}',
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 14, fontSize: 14,
), ),
if (!isPrescriptions) if (!isPrescriptions)
Texts( AppText(
'${DateUtils.getHour(appointmentDate)}', '${DateUtils.getHour(appointmentDate)}',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Colors.grey[700], color: Colors.grey[700],
@ -107,13 +107,13 @@ class DoctorCard extends StatelessWidget {
if (orderNo != null && !isPrescriptions) if (orderNo != null && !isPrescriptions)
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( AppText(
TranslationBase.of(context).orderNo + TranslationBase.of(context).orderNo +
": ", ": ",
color: Colors.grey[500], color: Colors.grey[500],
fontSize: 14, fontSize: 14,
), ),
Texts( AppText(
orderNo ?? '', orderNo ?? '',
fontSize: 14, fontSize: 14,
) )
@ -122,14 +122,14 @@ class DoctorCard extends StatelessWidget {
if (invoiceNO != null && !isPrescriptions) if (invoiceNO != null && !isPrescriptions)
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( AppText(
TranslationBase.of(context) TranslationBase.of(context)
.invoiceNo + .invoiceNo +
": ", ": ",
fontSize: 14, fontSize: 14,
color: Colors.grey[500], color: Colors.grey[500],
), ),
Texts( AppText(
invoiceNO, invoiceNO,
fontSize: 14, fontSize: 14,
) )
@ -138,13 +138,13 @@ class DoctorCard extends StatelessWidget {
if (clinic != null) if (clinic != null)
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( AppText(
TranslationBase.of(context).clinic + TranslationBase.of(context).clinic +
": ", ": ",
color: Colors.grey[500], color: Colors.grey[500],
fontSize: 14, fontSize: 14,
), ),
Texts( AppText(
clinic, clinic,
fontSize: 14, fontSize: 14,
) )
@ -153,13 +153,13 @@ class DoctorCard extends StatelessWidget {
if (branch != null) if (branch != null)
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( AppText(
TranslationBase.of(context).branch + TranslationBase.of(context).branch +
": ", ": ",
fontSize: 14, fontSize: 14,
color: Colors.grey[500], color: Colors.grey[500],
), ),
Texts( AppText(
branch, branch,
fontSize: 14, fontSize: 14,
) )

@ -6,7 +6,7 @@ import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
class DoctorCardInsurance extends StatelessWidget { class DoctorCardInsurance extends StatelessWidget {
final String doctorName; final String doctorName;
@ -78,7 +78,7 @@ class DoctorCardInsurance extends StatelessWidget {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Texts( AppText(
"$approvalStatus", "$approvalStatus",
color: approvalStatus == "Approved" color: approvalStatus == "Approved"
? Color(0xff359846) ? Color(0xff359846)
@ -92,7 +92,7 @@ class DoctorCardInsurance extends StatelessWidget {
color: Color(0xff2E303A)), color: Color(0xff2E303A)),
child: Padding( child: Padding(
padding: const EdgeInsets.all(5.0), padding: const EdgeInsets.all(5.0),
child: Texts( child: AppText(
'$patientOut'.replaceAll(" ", ""), '$patientOut'.replaceAll(" ", ""),
color: Colors.white, color: Colors.white,
fontSize: 13.0, fontSize: 13.0,
@ -104,7 +104,7 @@ class DoctorCardInsurance extends StatelessWidget {
Row( Row(
children: [ children: [
Expanded( Expanded(
child: Texts( child: AppText(
doctorName, doctorName,
bold: true, bold: true,
)), )),
@ -131,11 +131,11 @@ class DoctorCardInsurance extends StatelessWidget {
if (orderNo != null && !isPrescriptions) if (orderNo != null && !isPrescriptions)
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( AppText(
'order No:', 'order No:',
color: Colors.grey[500], color: Colors.grey[500],
), ),
Texts( AppText(
orderNo ?? '', orderNo ?? '',
) )
], ],
@ -143,11 +143,11 @@ class DoctorCardInsurance extends StatelessWidget {
if (invoiceNO != null && !isPrescriptions) if (invoiceNO != null && !isPrescriptions)
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( AppText(
'Invoice:', 'Invoice:',
color: Colors.grey[500], color: Colors.grey[500],
), ),
Texts( AppText(
invoiceNO, invoiceNO,
) )
], ],
@ -155,7 +155,7 @@ class DoctorCardInsurance extends StatelessWidget {
if (isPrescriptions) if (isPrescriptions)
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( AppText(
TranslationBase.of(context).clinic + TranslationBase.of(context).clinic +
": ", ": ",
color: Colors.grey[500], color: Colors.grey[500],
@ -164,7 +164,7 @@ class DoctorCardInsurance extends StatelessWidget {
//color: Colors.grey[500], //color: Colors.grey[500],
), ),
Expanded( Expanded(
child: Texts( child: AppText(
clinic, clinic,
//fontWeight: FontWeight.w700, //fontWeight: FontWeight.w700,
fontSize: 14.0, fontSize: 14.0,
@ -175,13 +175,13 @@ class DoctorCardInsurance extends StatelessWidget {
if (branch2 != null) if (branch2 != null)
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( AppText(
TranslationBase.of(context).branch + TranslationBase.of(context).branch +
": ", ": ",
fontSize: 14, fontSize: 14,
color: Colors.grey[500], color: Colors.grey[500],
), ),
Texts( AppText(
branch2, branch2,
fontSize: 14.0, fontSize: 14.0,
) )
@ -189,7 +189,7 @@ class DoctorCardInsurance extends StatelessWidget {
), ),
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( AppText(
TranslationBase.of(context) TranslationBase.of(context)
.approvalNo + .approvalNo +
": ", ": ",
@ -197,7 +197,7 @@ class DoctorCardInsurance extends StatelessWidget {
color: Colors.grey[500], color: Colors.grey[500],
//color: Colors.grey[500], //color: Colors.grey[500],
), ),
Texts( AppText(
branch, branch,
fontSize: 14.0, fontSize: 14.0,
) )

@ -5,15 +5,13 @@ import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
import 'package:doctor_app_flutter/models/SOAP/my_selected_allergy.dart'; import 'package:doctor_app_flutter/models/SOAP/my_selected_allergy.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/custom_validation_error.dart'; import 'package:doctor_app_flutter/widgets/shared/user-guid/custom_validation_error.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/TextFields.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/new_text_Field.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/new_text_Field.dart';
import 'package:eva_icons_flutter/eva_icons_flutter.dart'; import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'user-guid/text_fields/app-textfield-custom.dart'; import 'text_fields/app-textfield-custom.dart';
import 'app_texts_widget.dart'; import 'app_texts_widget.dart';
import 'dialogs/master_key_dailog.dart'; import 'dialogs/master_key_dailog.dart';
import 'divider_with_spaces_around.dart'; import 'divider_with_spaces_around.dart';

@ -11,7 +11,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'user-guid/text_fields/app-textfield-custom.dart'; import 'text_fields/app-textfield-custom.dart';
import 'app_texts_widget.dart'; import 'app_texts_widget.dart';
class MasterKeyCheckboxSearchWidget extends StatefulWidget { class MasterKeyCheckboxSearchWidget extends StatefulWidget {

@ -1,6 +1,6 @@
import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -42,7 +42,7 @@ class NetworkBaseView extends StatelessWidget {
child: Center( child: Center(
child: Padding( child: Padding(
padding: const EdgeInsets.only(top: 12, bottom: 12,right: 20, left: 30), padding: const EdgeInsets.only(top: 12, bottom: 12,right: 20, left: 30),
child: Center(child: Texts(baseViewModel.error??'' , textAlign: TextAlign.center,)), child: Center(child: AppText(baseViewModel.error??'' , textAlign: TextAlign.center,)),
), ),
), ),
) )

@ -1,10 +1,10 @@
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/text_field_error.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/text_field_error.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/text_fields_utils.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/text_fields_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import '../../app_texts_widget.dart';
import '../app_texts_widget.dart';
class AppTextFieldCustom extends StatefulWidget { class AppTextFieldCustom extends StatefulWidget {
final double height; final double height;

@ -1,12 +1,8 @@
import 'package:autocomplete_textfield/autocomplete_textfield.dart';
import 'package:doctor_app_flutter/core/model/get_medication_response_model.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/text_field_error.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/text_field_error.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/text_fields_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/text_fields_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../Text.dart';
class CustomAutoCompleteTextField extends StatelessWidget { class CustomAutoCompleteTextField extends StatelessWidget {
final bool isShowError; final bool isShowError;
final Widget child; final Widget child;

@ -2,7 +2,7 @@ import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../app_texts_widget.dart'; import '../app_texts_widget.dart';
class TextFieldsError extends StatelessWidget { class TextFieldsError extends StatelessWidget {
const TextFieldsError({ const TextFieldsError({

@ -1,6 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class TextFieldsUtils{ class TextFieldsUtils{
static BoxDecoration containerBorderDecoration( static BoxDecoration containerBorderDecoration(
Color containerColor, Color borderColor, Color containerColor, Color borderColor,
{double borderWidth = -1}) { {double borderWidth = -1}) {
@ -15,8 +16,6 @@ class TextFieldsUtils{
); );
} }
static InputDecoration textFieldSelectorDecoration( static InputDecoration textFieldSelectorDecoration(
String hintText, String selectedText, bool isDropDown, String hintText, String selectedText, bool isDropDown,
{IconData suffixIcon, Color dropDownColor}) { {IconData suffixIcon, Color dropDownColor}) {
Loading…
Cancel
Save