Merge branch 'design-fixes' into 'development'

working on buttons widgets

See merge request Cloud_Solution/doctor_app_flutter!520
merge-requests/522/merge
Mohammad Aljammal 5 years ago
commit 1fd7a2a394

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

@ -9,9 +9,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/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/app_button.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/buttons/app_buttons_widget.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@ -93,11 +94,11 @@ class _QrReaderScreenState extends State<QrReaderScreen> {
SizedBox(
height: 35,
),
Button(
onTap: () {
AppButton(
title : TranslationBase.of(context).scanQr,
onPressed: () {
_scanQrAndGetPatient(context, model);
},
title: TranslationBase.of(context).scanQr,
loading: isLoading,
icon: Image.asset('assets/images/qr_code_white.png'),
),

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

@ -149,8 +149,6 @@ class _LiveCarePandingListState extends State<LiveCarePandingListScreen> {
fontWeight:
FontWeight
.bold,
backGroundcolor:
Colors.white,
),
SizedBox(
height: 8,
@ -167,8 +165,6 @@ class _LiveCarePandingListState extends State<LiveCarePandingListScreen> {
fontWeight:
FontWeight
.bold,
backGroundcolor:
Colors.white,
),
AppText(
TranslationBase.of(
@ -183,8 +179,6 @@ class _LiveCarePandingListState extends State<LiveCarePandingListScreen> {
fontWeight:
FontWeight
.bold,
backGroundcolor:
Colors.white,
),
SizedBox(
height: 8,

@ -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.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_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/expandable-widget-header-body.dart';
@ -332,7 +332,7 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
children: [
Row(
children: [
Texts(
AppText(
TranslationBase.of(
context)
.historyOfPresentIllness
@ -454,7 +454,7 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
children: [
Row(
children: [
Texts(
AppText(
TranslationBase.of(
context)
.assessment
@ -698,7 +698,7 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
children: [
Row(
children: [
Texts(
AppText(
TranslationBase.of(
context)
.test
@ -932,7 +932,7 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
children: [
Row(
children: [
Texts(
AppText(
TranslationBase.of(
context)
.physicalSystemExamination
@ -1105,7 +1105,7 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: Texts('No Data For This Visit '),
child: AppText('No Data For This Visit '),
),
SizedBox(
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.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_texts_widget.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'),
Padding(
padding: const EdgeInsets.all(8.0),
child: Texts('No Medical File Found'),
child: AppText('No Medical File Found'),
)
],
),

@ -12,9 +12,9 @@ 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/widgets/medicine/medicine_item_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/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/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/loader/gif_loader_dialog_utils.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/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.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:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@ -41,8 +41,8 @@ class ECGPage extends StatelessWidget {
children: [
// PatientProfileHeaderNewDesign(patient,arrivalType??'0',patientType),
SizedBox(height: 12,),
Texts('Service',style: "caption2",color: Colors.black,),
Texts('ECG',bold: true,fontSize: 22,),
AppText('Service',style: "caption2",color: Colors.black,),
AppText('ECG',bold: true,fontSize: 22,),
SizedBox(height: 12,),
...List.generate(model.patientMuseResultsModelList.length, (index) => InkWell(
onTap: () async {
@ -68,7 +68,7 @@ class ECGPage extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Texts('ECG Report',fontWeight: FontWeight.w700,fontSize: 17,),
AppText('ECG Report',fontWeight: FontWeight.w700,fontSize: 17,),
SizedBox(height:3),
RichText(
text: TextSpan(
@ -101,8 +101,8 @@ class ECGPage extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Texts('${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.getDayMonthYearDateFormatted(model.patientMuseResultsModelList[index].createdOnDateTime,isArabic: projectViewModel.isArabic)}',color: Colors.black,fontWeight: FontWeight.w600,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/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/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_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/doctor_card.dart';
@ -137,7 +137,7 @@ class _InsuranceApprovalScreenNewState
Image.asset('assets/images/no-data.png'),
Padding(
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/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/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_texts_widget.dart';
import 'package:flutter/cupertino.dart';
@ -93,7 +93,7 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
children: [
Row(
children: [
Texts(
AppText(
model.insuranceApproval[indexInsurance]
.approvalStatusDescption !=
null
@ -118,7 +118,7 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
),
Row(
children: [
Texts(
AppText(
model.insuranceApproval[indexInsurance]
.doctorName
.toUpperCase(),
@ -174,13 +174,13 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
),
Row(
children: [
Texts(
AppText(
'Clinic: ',
color: Colors.grey[500],
fontSize: 14,
),
Expanded(
child: Texts(
child: AppText(
model
.insuranceApproval[
indexInsurance]
@ -192,12 +192,12 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
),
Row(
children: <Widget>[
Texts(
AppText(
'Approval No: ',
color: Colors.grey[500],
fontSize: 14,
),
Texts(
AppText(
model
.insuranceApproval[
indexInsurance]
@ -209,12 +209,12 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
),
Row(
children: <Widget>[
Texts(
AppText(
'Unused Count:',
color: Colors.grey[500],
fontSize: 14,
),
Texts(model
AppText(model
.insuranceApproval[
indexInsurance]
.unUsedCount
@ -226,21 +226,21 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
),
Row(
children: <Widget>[
Texts(
AppText(
'Company Name :',
color: Colors.grey[500],
),
Texts('Sample')
AppText('Sample')
],
),
Row(
children: [
Texts(
AppText(
'Receipt on: ',
color: Colors.grey[500],
),
Expanded(
child: Texts(
child: AppText(
'${DateUtils.getDayMonthYearDateFormatted(DateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].rceiptOn), isArabic: projectViewModel.isArabic)}',
color: Colors.black,
fontWeight: FontWeight.w600,
@ -250,11 +250,11 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
),
Row(
children: [
Texts(
AppText(
'Exp on: ',
color: Colors.grey[500],
),
Texts(
AppText(
'${DateUtils.getDayMonthYearDateFormatted(DateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].expiryDate), isArabic: projectViewModel.isArabic)}',
color: Colors.black,
fontWeight: FontWeight.w600,
@ -280,19 +280,19 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
child: Row(
children: [
Expanded(
child: Texts(
child: AppText(
'Procedure',
fontWeight: FontWeight.w700,
),
),
Expanded(
child: Texts(
child: AppText(
'Status',
fontWeight: FontWeight.w700,
),
),
Expanded(
child: Texts(
child: AppText(
'Usage Status',
fontWeight: FontWeight.w700,
),
@ -324,7 +324,7 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Expanded(
child: Container(
child: Texts(model
child: AppText(model
.insuranceApproval[
indexInsurance]
?.apporvalDetails[
@ -336,7 +336,7 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Expanded(
child: Container(
child: Texts(model
child: AppText(model
.insuranceApproval[
indexInsurance]
?.apporvalDetails[
@ -347,7 +347,7 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
),
Expanded(
child: Container(
child: Texts(model
child: AppText(model
.insuranceApproval[
indexInsurance]
?.apporvalDetails[

@ -15,9 +15,9 @@ import '../../config/config.dart';
import '../../config/size_config.dart';
import '../../lookups/patient_lookup.dart';
import '../../widgets/patients/dynamic_elements.dart';
import '../../widgets/shared/app_buttons_widget.dart';
import '../../widgets/shared/buttons/app_buttons_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/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/widgets/patients/PatientCard.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/errors/dr_app_embedded_error.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'),
Padding(
padding: const EdgeInsets.all(8.0),
child: Texts(TranslationBase.of(context)
child: AppText(TranslationBase.of(context)
.youDontHaveAnyPatient),
)
],
@ -586,7 +586,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
padding:
const EdgeInsets
.all(8.0),
child: Texts(
child: AppText(
TranslationBase.of(
context)
.youDontHaveAnyPatient),

@ -16,7 +16,8 @@ import 'package:doctor_app_flutter/widgets/patients/profile/PatientHeaderWidgetN
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/borderedButton.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
@ -47,9 +48,9 @@ class _UcafDetailScreenState extends State<UcafDetailScreen> {
},
builder: (_, model, w) => AppScaffold(
baseViewModel: model,
isShowAppBar: true,
appBar: PatientProfileHeaderNewDesignAppBar(
patient, patientType, arrivalType),
isShowAppBar: true,
appBar: PatientProfileHeaderNewDesignAppBar(
patient, patientType, arrivalType),
appBarTitle: TranslationBase.of(context).ucaf,
body: Column(
children: [
@ -114,18 +115,19 @@ class _UcafDetailScreenState extends State<UcafDetailScreen> {
children: [
Expanded(
child: Container(
child: BorderedButton(
TranslationBase.of(context).cancel,
child: AppButton(
title: TranslationBase.of(context).cancel,
hasBorder: true,
vPadding: 8,
hPadding: 8,
borderColor: Colors.white,
backgroundColor: Colors.white,
textColor: HexColor("#B8382B"),
fontSize: SizeConfig.textMultiplier * 2.2,
handler: () {
color: Colors.white,
fontColor: HexColor("#B8382B"),
fontSize: 2.2,
onPressed: () {
Navigator.of(context).popUntil((route) {
return route.settings.name == PATIENTS_PROFILE;
return route.settings.name ==
PATIENTS_PROFILE;
});
},
),
@ -136,22 +138,24 @@ class _UcafDetailScreenState extends State<UcafDetailScreen> {
),
Expanded(
child: Container(
child: BorderedButton(
TranslationBase.of(context).save,
child: AppButton(
title: TranslationBase.of(context).save,
hasBorder: true,
vPadding: 8,
hPadding: 8,
borderColor: HexColor("#B8382B"),
backgroundColor: HexColor("#B8382B"),
textColor: Colors.white,
fontSize: SizeConfig.textMultiplier * 2.0,
handler: () async {
color: HexColor("#B8382B"),
fontColor: Colors.white,
fontSize: 2.0,
onPressed: () async {
await model.postUCAF(patient);
if (model.state == ViewState.Idle) {
DrAppToastMsg.showSuccesToast(
TranslationBase.of(context).postUcafSuccessMsg);
TranslationBase.of(context)
.postUcafSuccessMsg);
Navigator.of(context).popUntil((route) {
return route.settings.name == PATIENTS_PROFILE;
return route.settings.name ==
PATIENTS_PROFILE;
});
} else {
DrAppToastMsg.showErrorToast(model.error);
@ -163,7 +167,6 @@ class _UcafDetailScreenState extends State<UcafDetailScreen> {
],
),
),
],
),
));

@ -9,8 +9,8 @@ import 'package:doctor_app_flutter/util/helpers.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/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/app_buttons_widget.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/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart';

@ -7,7 +7,7 @@ import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/helpers.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/shared/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_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/dialogs/dailog-list-select.dart';

@ -11,8 +11,8 @@ 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-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/user-guid/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.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/app_scaffold_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';

@ -13,8 +13,8 @@ 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-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/user-guid/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.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/app_scaffold_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';

@ -14,8 +14,8 @@ 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-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/user-guid/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.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/app_scaffold_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';

@ -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/screens/base/base_view.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_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/screens/patients/profile/lab_result/FlowChartPage.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/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
@ -32,7 +32,7 @@ class LabResultWidget extends StatelessWidget {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Texts(filterName),
AppText(filterName),
InkWell(
onTap: () {
Navigator.push(
@ -46,7 +46,7 @@ class LabResultWidget extends StatelessWidget {
),
);
},
child: Texts(
child: AppText(
TranslationBase.of(context).showMoreBtn,
textDecoration: TextDecoration.underline,
color: Colors.blue,
@ -59,7 +59,7 @@ class LabResultWidget extends StatelessWidget {
Expanded(
child: Container(
child: Center(
child: Texts(
child: AppText(
TranslationBase.of(context).description,
color: Colors.black,bold: true,
),
@ -69,14 +69,14 @@ class LabResultWidget extends StatelessWidget {
Expanded(
child: Container(
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(
child: Container(
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),
color: Colors.white,
child: Center(
child: Texts(
child: AppText(
'${patientLabResultList[index].testCode}\n'+
patientLabResultList[index].description,
textAlign: TextAlign.center,
@ -107,7 +107,7 @@ class LabResultWidget extends StatelessWidget {
padding: EdgeInsets.all(10),
color: Colors.white,
child: Center(
child: Texts(
child: AppText(
patientLabResultList[index].resultValue+" "+patientLabResultList[index].uOM,
textAlign: TextAlign.center,
),
@ -119,7 +119,7 @@ class LabResultWidget extends StatelessWidget {
padding: EdgeInsets.all(10),
color: Colors.white,
child: Center(
child: Texts(
child: AppText(
patientLabResultList[index].referanceRange,
textAlign: TextAlign.center,
),
@ -148,7 +148,7 @@ class LabResultWidget extends StatelessWidget {
children: [
Container(
child: Center(
child: Texts(
child: AppText(
TranslationBase.of(context).description,
color: Colors.black,bold: true,
),
@ -156,12 +156,12 @@ class LabResultWidget extends StatelessWidget {
),
Container(
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(
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),
color: Colors.white,
child: Center(
child: Texts(
child: AppText(
lab.description,
textAlign: TextAlign.center,
),
@ -188,7 +188,7 @@ class LabResultWidget extends StatelessWidget {
padding: EdgeInsets.all(10),
color: Colors.white,
child: Center(
child: Texts(
child: AppText(
lab.resultValue+" "+lab.uOM,
textAlign: TextAlign.center,
),
@ -200,7 +200,7 @@ class LabResultWidget extends StatelessWidget {
padding: EdgeInsets.all(10),
color: Colors.white,
child: Center(
child: Texts(
child: AppText(
lab.referanceRange,
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/util/date-utils.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:flutter/cupertino.dart';
@ -49,7 +49,6 @@ class _VitalSignDetailsWidgetState extends State<LabResultDetailsWidget> {
TranslationBase.of(context).date,
fontSize: SizeConfig.textMultiplier * 1.6,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.black,
fontFamily: 'Poppins',
),
),
@ -63,7 +62,6 @@ class _VitalSignDetailsWidgetState extends State<LabResultDetailsWidget> {
TranslationBase.of(context).labResult,
fontSize: SizeConfig.textMultiplier * 1.6,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.black,
fontFamily: 'Poppins',
),
// height: 60
@ -102,7 +100,7 @@ class _VitalSignDetailsWidgetState extends State<LabResultDetailsWidget> {
'${projectViewModel.isArabic? DateUtils.getWeekDayArabic(date.weekday): DateUtils.getWeekDay(date.weekday)} ,${date.day} ${projectViewModel.isArabic? DateUtils.getMonthArabic(date.month) : DateUtils.getMonth(date.month)} ${date.year}',
fontSize: SizeConfig.textMultiplier * 1.8,
fontWeight: FontWeight.w600,
backGroundcolor: Colors.black,
fontFamily: 'Poppins',
),
),
@ -115,7 +113,7 @@ class _VitalSignDetailsWidgetState extends State<LabResultDetailsWidget> {
'${vital.resultValue}',
fontSize: SizeConfig.textMultiplier * 1.8,
fontWeight: FontWeight.w600,
backGroundcolor: Colors.black,
fontFamily: 'Poppins',
),
),

@ -59,13 +59,13 @@ class LineChartCurvedState extends State<LineChartCurved> {
widget.title,
fontSize: SizeConfig.textMultiplier * 2.1,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.black,
fontFamily: 'Poppins',
textAlign: TextAlign.center,
),
Expanded(
child: Padding(
padding: const EdgeInsets.only(right: 16.0, left: 6.0),
padding: const EdgeInsets.only(right: 16.0, left: 8.0),
child: LineChart(
sampleData1(),
swapAnimationDuration: const Duration(milliseconds: 250),
@ -99,9 +99,9 @@ class LineChartCurvedState extends State<LineChartCurved> {
showTitles: true,
getTextStyles: (value) => const TextStyle(
color: Colors.black,
fontSize: 12,
fontSize: 11,
),
margin: 22,
margin: 28,
rotateAngle:-65,
getTitles: (value) {
print(value);
@ -213,8 +213,9 @@ class LineChartCurvedState extends State<LineChartCurved> {
spots: spots,
isCurved: true,
colors: [Colors.red],
barWidth: 5,
barWidth: 3,
isStrokeCapRound: true,
curveSmoothness: 0.12,
dotData: FlDotData(
show: false,
),

@ -51,7 +51,6 @@ class LabResultChartAndDetails extends StatelessWidget {
"Graph Details",
fontSize: SizeConfig.textMultiplier * 2.1,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.black,
fontFamily: 'Poppins',
),
SizedBox(height: 8,),

@ -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/patients/profile/lab_result/LabResultWidget.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:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@ -79,7 +79,7 @@ class _LaboratoryResultWidgetState extends State<LaboratoryResultWidget> {
children: <Widget>[
Expanded(child: Container(
margin: EdgeInsets.only(left: 10, right: 10),
child: Texts(TranslationBase.of(context).generalResult,bold: true,))),
child: AppText(TranslationBase.of(context).generalResult,bold: true,))),
Container(
width: 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/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.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_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/transitions/fade_page.dart';
import 'package:doctor_app_flutter/util/date-utils.dart';
@ -55,13 +56,13 @@ class LabsHomePage extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Texts(
AppText(
'Lab',
style: "caption2",
color: Colors.black,
fontSize: 13,
),
Texts(
AppText(
'Result',
bold: true,
fontSize: 22,
@ -75,13 +76,13 @@ class LabsHomePage extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Texts(
AppText(
'Lab',
style: "caption2",
color: Colors.black,
fontSize: 13,
),
Texts(
AppText(
'Result',
bold: true,
fontSize: 22,
@ -135,7 +136,7 @@ class LabsHomePage extends StatelessWidget {
SizedBox(
height: 10,
),
Texts(
AppText(
'Apply for New Lab Order',
color: Colors.grey[600],
fontWeight: FontWeight.w600,
@ -186,7 +187,7 @@ class LabsHomePage extends StatelessWidget {
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: Texts('No Lab Result Found'),
child: AppText('No Lab Result Found'),
)
],

@ -10,7 +10,8 @@ import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-head
import 'package:doctor_app_flutter/widgets/patients/profile/profile_medical_info_widget.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/profile_medical_info_widget_search.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/borderedButton.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
@ -103,24 +104,24 @@ class PatientProfileScreen extends StatelessWidget {
children: [
Expanded(child: Container()),
if (patient.episodeNo == 0)
BorderedButton(
"${TranslationBase.of(context).createNew}\n${TranslationBase.of(context).episode}",
backgroundColor: patient.patientStatusType == 43
AppButton(
title:
"${TranslationBase.of(context).createNew}\n${TranslationBase.of(context).episode}",
color: patient.patientStatusType == 43
? Colors.red.shade700
: Colors.grey.shade700,
textColor: Colors.white,
fontColor: Colors.white,
vPadding: 8,
radius: 30,
hPadding: 20,
fontWeight: FontWeight.normal,
fontSize: 12,
fontFamily: 'Poppins',
fontSize: 1.6,
icon: Image.asset(
"assets/images/create-episod.png",
color: Colors.white,
height: 30,
),
handler: () async {
onPressed: () async {
if (patient.patientStatusType == 43) {
PostEpisodeReqModel postEpisodeReqModel =
PostEpisodeReqModel(
@ -139,32 +140,30 @@ class PatientProfileScreen extends StatelessWidget {
},
),
if (patient.episodeNo != 0)
BorderedButton(
"${TranslationBase.of(context).update}\n${TranslationBase.of(context).episode}",
backgroundColor:
patient.patientStatusType == 43
? Colors.red.shade700
: Colors.grey.shade700,
textColor: Colors.white,
AppButton(
title:
"${TranslationBase.of(context).update}\n${TranslationBase.of(context).episode}",
color: patient.patientStatusType == 43
? Colors.red.shade700
: Colors.grey.shade700,
fontColor: Colors.white,
vPadding: 8,
radius: 30,
hPadding: 20,
fontWeight: FontWeight.normal,
fontSize: 12,
fontFamily: 'Poppins',
fontSize: 1.6,
icon: Image.asset(
"assets/images/modilfy-episode.png",
color: Colors.white,
height: 30,
),
handler: () {
if (patient.patientStatusType == 43) {
Navigator.of(context).pushNamed(
UPDATE_EPISODE,
arguments: {'patient': patient});
}
}
),
),
onPressed: () {
if (patient.patientStatusType == 43) {
Navigator.of(context).pushNamed(
UPDATE_EPISODE,
arguments: {'patient': patient});
}
}),
],
),
),

@ -1,17 +1,12 @@
import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/model/radiology/final_radiology.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/radiology_view_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/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_app_bar.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart';
import 'package:doctor_app_flutter/widgets/shared/app_button.dart';
import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.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/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/material.dart';
import 'package:url_launcher/url_launcher.dart';
@ -69,13 +64,13 @@ class RadiologyDetailsPage extends StatelessWidget {
SizedBox(
height: 5,
),
Texts(TranslationBase.of(context).generalResult),
AppText(TranslationBase.of(context).generalResult),
SizedBox(
height: 5,
),
Padding(
padding: const EdgeInsets.all(8.0),
child: Texts(
child: AppText(
'${finalRadiology.reportData.trim()}',
textAlign: TextAlign.start,
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/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.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_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/doctor_card.dart';
@ -51,13 +51,13 @@ class RadiologyHomePage extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Texts(
AppText(
'Radiology',
style: "caption2",
color: Colors.black,
fontSize: 13,
),
Texts(
AppText(
'Result',
bold: true,
fontSize: 22,
@ -71,13 +71,13 @@ class RadiologyHomePage extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Texts(
AppText(
'Radiology',
style: "caption2",
color: Colors.black,
fontSize: 13,
),
Texts(
AppText(
'Result',
bold: true,
fontSize: 22,
@ -132,7 +132,7 @@ class RadiologyHomePage extends StatelessWidget {
SizedBox(
height: 10,
),
Texts(
AppText(
'Apply for Radiology Order',
color: Colors.grey[600],
fontWeight: FontWeight.w600,
@ -173,7 +173,7 @@ class RadiologyHomePage extends StatelessWidget {
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: Texts('No Radiology Found'),
child: AppText('No Radiology Found'),
)
],

@ -1,6 +1,6 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/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_texts_widget.dart';
import 'package:flutter/cupertino.dart';

@ -4,8 +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/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/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/buttons/app_buttons_widget.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/rounded_container_widget.dart';

@ -9,11 +9,11 @@ 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/helpers.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/profile/profile_medical_info_widget_search.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/borderedButton.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart';
@ -73,7 +73,6 @@ class MyReferralDetailScreen extends StatelessWidget {
.fullName)),
fontSize: SizeConfig.textMultiplier * 2.5,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.white,
fontFamily: 'Poppins',
),
),
@ -113,107 +112,148 @@ class MyReferralDetailScreen extends StatelessWidget {
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
AppText(
pendingReferral.referralStatus != null ? pendingReferral.referralStatus : "",
pendingReferral.referralStatus != null
? pendingReferral.referralStatus
: "",
fontFamily: 'Poppins',
fontSize: 1.9 * SizeConfig.textMultiplier,
fontSize:
1.9 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w700,
color: pendingReferral.referralStatus != null
? pendingReferral.referralStatus == 'Pending'
? Color(0xffc4aa54)
: pendingReferral.referralStatus == 'Accepted'
? Colors.green[700]
: Colors.red[700]
color: pendingReferral
.referralStatus !=
null
? pendingReferral
.referralStatus ==
'Pending'
? Color(0xffc4aa54)
: pendingReferral
.referralStatus ==
'Accepted'
? Colors.green[700]
: Colors.red[700]
: Colors.grey[500],
),
AppText(
pendingReferral.referredOn.split(" ")[0],
pendingReferral.referredOn
.split(" ")[0],
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
fontSize: 2.0 * SizeConfig.textMultiplier,
fontSize:
2.0 * SizeConfig.textMultiplier,
color: Color(0XFF28353E),
)
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context).fileNumber,
TranslationBase.of(context)
.fileNumber,
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
fontSize: 1.7 * SizeConfig.textMultiplier,
fontSize: 1.7 *
SizeConfig.textMultiplier,
color: Color(0XFF575757),
),
AppText(
"${pendingReferral.patientID}",
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
fontSize: 1.8 * SizeConfig.textMultiplier,
fontSize: 1.8 *
SizeConfig.textMultiplier,
color: Color(0XFF2E303A),
),
],
),
AppText(
pendingReferral.referredOn.split(" ")[1],
pendingReferral.referredOn
.split(" ")[1],
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
fontSize: 1.8 * SizeConfig.textMultiplier,
fontSize:
1.8 * SizeConfig.textMultiplier,
color: Color(0XFF575757),
)
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
crossAxisAlignment:
CrossAxisAlignment.center,
children: [
Expanded(
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context).referredFrom,
TranslationBase.of(context)
.referredFrom,
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
fontSize: 1.7 * SizeConfig.textMultiplier,
fontSize: 1.7 *
SizeConfig
.textMultiplier,
color: Color(0XFF575757),
),
AppText(
pendingReferral.isReferralDoctorSameBranch
? TranslationBase.of(context).sameBranch
: TranslationBase.of(context)
.otherBranch,
pendingReferral
.isReferralDoctorSameBranch
? TranslationBase.of(
context)
.sameBranch
: TranslationBase.of(
context)
.otherBranch,
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
fontSize: 1.8 * SizeConfig.textMultiplier,
fontSize: 1.8 *
SizeConfig
.textMultiplier,
color: Color(0XFF2E303A),
),
],
),
Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context).remarks + " : ",
TranslationBase.of(context)
.remarks +
" : ",
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
fontSize: 1.7 * SizeConfig.textMultiplier,
fontSize: 1.7 *
SizeConfig
.textMultiplier,
color: Color(0XFF575757),
),
Expanded(
child: AppText(
pendingReferral.remarksFromSource,
pendingReferral
.remarksFromSource,
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
fontSize: 1.8 * SizeConfig.textMultiplier,
fontWeight:
FontWeight.w700,
fontSize: 1.8 *
SizeConfig
.textMultiplier,
color: Color(0XFF2E303A),
),
),
@ -225,52 +265,74 @@ class MyReferralDetailScreen extends StatelessWidget {
Row(
children: [
AppText(
pendingReferral
.patientDetails.nationalityName != null ? pendingReferral
.patientDetails.nationalityName : "",
pendingReferral.patientDetails
.nationalityName !=
null
? pendingReferral
.patientDetails
.nationalityName
: "",
fontWeight: FontWeight.bold,
color: Color(0xFF2E303A),
fontSize: 1.4 * SizeConfig.textMultiplier,
fontSize: 1.4 *
SizeConfig.textMultiplier,
),
pendingReferral.nationalityFlagUrl != null
pendingReferral
.nationalityFlagUrl !=
null
? ClipRRect(
borderRadius: BorderRadius.circular(20.0),
child: Image.network(
pendingReferral.nationalityFlagUrl,
height: 25,
width: 30,
errorBuilder: (BuildContext context,
Object exception,
StackTrace stackTrace) {
return Text('No Image');
},
))
borderRadius:
BorderRadius.circular(
20.0),
child: Image.network(
pendingReferral
.nationalityFlagUrl,
height: 25,
width: 30,
errorBuilder:
(BuildContext context,
Object exception,
StackTrace
stackTrace) {
return Text('No Image');
},
))
: SizedBox()
],
)
],
),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Container(
margin: EdgeInsets.only(left: 10, right: 0),
child: Image.asset('assets/images/patient/ic_ref_arrow_up.png',
margin: EdgeInsets.only(
left: 10, right: 0),
child: Image.asset(
'assets/images/patient/ic_ref_arrow_up.png',
height: 50,
width: 30,
),
),
Container(
margin: EdgeInsets.only(
left: 0, top: 25, right: 0, bottom: 0),
padding: EdgeInsets.only(left: 4.0, right: 4.0),
left: 0,
top: 25,
right: 0,
bottom: 0),
padding: EdgeInsets.only(
left: 4.0, right: 4.0),
child: Container(
width: 40,
height: 40,
child: CircleAvatar(
radius: 25.0,
backgroundImage: NetworkImage(pendingReferral.doctorImageUrl),
backgroundColor: Colors.transparent,
backgroundImage: NetworkImage(
pendingReferral
.doctorImageUrl),
backgroundColor:
Colors.transparent,
),
),
),
@ -278,14 +340,19 @@ class MyReferralDetailScreen extends StatelessWidget {
flex: 4,
child: Container(
margin: EdgeInsets.only(
left: 10, top: 25, right: 10, bottom: 0),
left: 10,
top: 25,
right: 10,
bottom: 0),
child: Column(
children: [
AppText(
pendingReferral.referredByDoctorInfo,
pendingReferral
.referredByDoctorInfo,
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
fontSize: 1.7 * SizeConfig.textMultiplier,
fontSize: 1.7 *
SizeConfig.textMultiplier,
color: Color(0XFF2E303A),
),
],
@ -312,39 +379,6 @@ class MyReferralDetailScreen extends StatelessWidget {
SizedBox(
height: 16,
),
/*Padding(
padding:
const EdgeInsets.symmetric(horizontal: 16.0),
child: AppText(
TranslationBase.of(context).myReferralPatient,
color: Colors.black,
fontWeight: FontWeight.bold,
fontSize: 16,
),
),*/
/*PatientReferralItemWidget(
referralStatus: pendingReferral.referralStatus,
patientName: pendingReferral.patientName,
patientGender:
pendingReferral.patientDetails.gender,
referredDate:
pendingReferral.referredOn.split(" ")[0],
referredTime:
pendingReferral.referredOn.split(" ")[1],
patientID: "${pendingReferral.patientID}",
isSameBranch:
pendingReferral.isReferralDoctorSameBranch,
isReferral: true,
remark: pendingReferral.remarksFromSource,
nationality: pendingReferral
.patientDetails.nationalityName,
nationalityFlag:
pendingReferral.nationalityFlagUrl,
doctorAvatar: pendingReferral.doctorImageUrl,
referralDoctorName:
pendingReferral.referredByDoctorInfo,
clinicDescription: null,
),*/
Padding(
padding:
const EdgeInsets.symmetric(horizontal: 16),
@ -367,14 +401,14 @@ class MyReferralDetailScreen extends StatelessWidget {
child: Row(
children: [
Expanded(
child: BorderedButton(
TranslationBase.of(context).accept,
backgroundColor: Color(0xFF4BA821),
textColor: Colors.white,
fontSize: 16,
child: AppButton(
title: TranslationBase.of(context).accept,
color: Color(0xFF4BA821),
fontColor: Colors.white,
fontSize: 1.6,
hPadding: 8,
vPadding: 12,
handler: () async {
onPressed: () async {
await model.responseReferral(
pendingReferral, true);
if (model.state == ViewState.ErrorLocal) {
@ -390,17 +424,17 @@ class MyReferralDetailScreen extends StatelessWidget {
),
),
SizedBox(
height: 8,
width: 8,
),
Expanded(
child: BorderedButton(
TranslationBase.of(context).reject,
backgroundColor: Color(0xFFB9382C),
textColor: Colors.white,
fontSize: 16,
child: AppButton(
title: TranslationBase.of(context).reject,
color: Color(0xFFB9382C),
fontColor: Colors.white,
fontSize: 1.6,
hPadding: 8,
vPadding: 12,
handler: () async {
onPressed: () async {
await model.responseReferral(
pendingReferral, true);
if (model.state == ViewState.ErrorLocal) {
@ -435,7 +469,7 @@ class MyReferralDetailScreen extends StatelessWidget {
"",
fontSize: SizeConfig.textMultiplier * 2.5,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.white,
fontFamily: 'Poppins',
),
),

@ -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/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart';
@ -6,14 +5,11 @@ 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/util/date-utils.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/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.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.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/app_scaffold_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';

@ -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/util/helpers.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_buttons_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/app_scaffold_widget.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/user-guid/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/user-guid/text_fields/text_fields_utils.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/auto_complete_text_field.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/text_field_error.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/text_fields_utils.dart';
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart';
@ -192,7 +192,7 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
suggestions: model.listOfICD10,
itemBuilder: (context, suggestion) =>
new Padding(
child: Texts(suggestion
child: AppText(suggestion
.description +
" / " +
suggestion.code.toString()),

@ -11,8 +11,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/helpers.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_buttons_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/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart';
@ -388,7 +388,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
children: [
Column(
children: [
Texts(
AppText(
assessment.createdOn != null
? DateUtils
.getDayMonthYearDateFormatted(
@ -401,7 +401,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
fontWeight: FontWeight
.w600,
fontSize: 14,
), Texts(
), AppText(
assessment.createdOn != null
? DateUtils.getHour(
DateTime.parse(

@ -7,7 +7,8 @@ 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/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/borderedButton.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
@ -115,16 +116,15 @@ class _AddExaminationPageState extends State<AddExaminationPage> {
Container(
padding: EdgeInsets.all(16),
color: Colors.white,
child: BorderedButton(
"${TranslationBase.of(context).addExamination}",
backgroundColor: HexColor("#359846"),
textColor: Colors.white,
child: AppButton(
title:"${TranslationBase.of(context).addExamination}",
color: HexColor("#359846"),
fontColor: Colors.white,
vPadding: 12,
radius: 12,
fontWeight: FontWeight.w600,
fontSize: SizeConfig.textMultiplier * 2.5,
fontFamily: 'Poppins',
handler: () {
onPressed: () {
widget.addSelectedExamination();
},
),

@ -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/my_selected_examination.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/expandable-widget-header-body.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/my_selected_examination.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:flutter/material.dart';

@ -11,7 +11,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/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/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_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';

@ -12,9 +12,9 @@ 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/helpers.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/user-guid/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.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/app_scaffold_widget.dart';
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
@ -164,12 +164,12 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
children: [
Row(
children: [
Texts('Appointment No: ',fontSize: 12,),
Texts(widget.patientProgressNote.appointmentNo??'',fontWeight: FontWeight.w600,),
AppText('Appointment No: ',fontSize: 12,),
AppText(widget.patientProgressNote.appointmentNo??'',fontWeight: FontWeight.w600,),
],
),
Texts(
AppText(
widget.patientProgressNote.createdOn !=null?DateUtils.getDayMonthYearDateFormatted(DateTime.parse(widget.patientProgressNote.createdOn)):DateUtils.getDayMonthYearDateFormatted(DateTime.now()),
fontWeight: FontWeight
.w600,
@ -186,13 +186,13 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
children: [
Row(
children: [
Texts('Condition: ',
AppText('Condition: ',
fontSize: 12,),
Texts(
AppText(
widget.patientProgressNote.mName??'',fontWeight: FontWeight.w600),
],
),
Texts(
AppText(
widget.patientProgressNote.createdOn !=null?DateUtils.getHour(DateTime.parse(widget.patientProgressNote.createdOn)):DateUtils.getHour(DateTime.now()),
fontWeight: FontWeight.w600,
fontSize: 14,
@ -206,7 +206,7 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
MainAxisAlignment.start,
children: [
Expanded(
child: Texts(
child: AppText(
progressNoteController.text,
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:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/material.dart';
@ -39,7 +39,7 @@ class ExpandableSOAPWidget extends StatelessWidget {
onTap: onTap,
child: Row(
children: [
Texts(headerTitle,
AppText(headerTitle,
variant: isExpanded ? "bodyText" : '',
fontSize: 15,
color: Colors.black),

@ -7,7 +7,7 @@ import 'package:doctor_app_flutter/models/SOAP/my_selected_allergy.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/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/master_key_checkbox_search_allergies_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';

@ -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/util/helpers.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/divider_with_spaces_around.dart';
import 'package:flutter/material.dart';
@ -63,7 +63,7 @@ class _UpdateAllergiesWidgetState extends State<UpdateAllergiesWidget> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Texts(
AppText(
projectViewModel.isArabic
? selectedAllergy.selectedAllergy.nameAr
: selectedAllergy.selectedAllergy.nameEn
@ -73,7 +73,7 @@ class _UpdateAllergiesWidgetState extends State<UpdateAllergiesWidget> {
: TextDecoration.lineThrough,
bold: true,
color: Color(0xFF2B353E)),
Texts(
AppText(
projectViewModel.isArabic
? selectedAllergy.selectedAllergySeverity
.nameAr
@ -96,7 +96,7 @@ class _UpdateAllergiesWidgetState extends State<UpdateAllergiesWidget> {
InkWell(
child: Row(
children: [Container(
child: Texts(
child: AppText(
TranslationBase
.of(context)
.remove,

@ -1,6 +1,6 @@
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/user-guid/text_fields/new_text_Field.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/new_text_Field.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';

@ -4,7 +4,7 @@ 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/screens/base/base_view.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/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/master_key_checkbox_search_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/network_base_view.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/my_selected_history.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:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:hexcolor/hexcolor.dart';
@ -59,7 +59,7 @@ class _UpdateHistoryWidgetState extends State<UpdateHistoryWidget>
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Container(
child: Texts(
child: AppText(
projectViewModel.isArabic
? myHistory.selectedHistory.nameAr
: myHistory.selectedHistory.nameEn,
@ -78,7 +78,7 @@ class _UpdateHistoryWidgetState extends State<UpdateHistoryWidget>
child: Row(
children: [
Container(
child: Texts(
child: AppText(
TranslationBase
.of(context)
.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/screens/base/base_view.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_buttons_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/app_scaffold_widget.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/user-guid/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/user-guid/text_fields/text_fields_utils.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/auto_complete_text_field.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/text_field_error.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/text_fields_utils.dart';
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart';
@ -139,7 +139,7 @@ class _AddMedicationState extends State<AddMedication> {
itemBuilder: (context,
suggestion) =>
new Padding(
child: Texts(suggestion
child: AppText(suggestion
.description +
'/' +
suggestion

@ -16,7 +16,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/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/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:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';

@ -48,7 +48,6 @@ class LineChartCurved extends StatelessWidget {
title,
fontSize: SizeConfig.textMultiplier * 2.1,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.black,
fontFamily: 'Poppins',
textAlign: TextAlign.center,
),

@ -42,7 +42,7 @@ class LineChartCurvedBloodPressure extends StatelessWidget {
title,
fontSize: SizeConfig.textMultiplier * 2.1,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.black,
fontFamily: 'Poppins',
textAlign: TextAlign.center,
),

@ -64,7 +64,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignBloodPressureWidget> {
TranslationBase.of(context).date,
fontSize: SizeConfig.textMultiplier * 1.5,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.black,
fontFamily: 'Poppins',
),
// height: 60,
@ -86,7 +86,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignBloodPressureWidget> {
widget.title2,
fontSize: SizeConfig.textMultiplier * 1.5,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.black,
fontFamily: 'Poppins',
),
// height: 60
@ -108,7 +108,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignBloodPressureWidget> {
widget.title3,
fontSize: SizeConfig.textMultiplier * 1.5,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.black,
fontFamily: 'Poppins',
),
// height: 60
@ -167,7 +167,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignBloodPressureWidget> {
// textAlign: TextAlign.center,
fontSize: SizeConfig.textMultiplier * 1.6,
fontWeight: FontWeight.w600,
backGroundcolor: Colors.black,
fontFamily: 'Poppins',
),
),
@ -181,7 +181,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignBloodPressureWidget> {
// textAlign: TextAlign.center,
fontSize: SizeConfig.textMultiplier * 1.6,
fontWeight: FontWeight.w600,
backGroundcolor: Colors.black,
fontFamily: 'Poppins',
),
),
@ -195,7 +195,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignBloodPressureWidget> {
// textAlign: TextAlign.center,
fontSize: SizeConfig.textMultiplier * 1.6,
fontWeight: FontWeight.w600,
backGroundcolor: Colors.black,
fontFamily: 'Poppins',
),
),

@ -57,7 +57,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignDetailsWidget> {
TranslationBase.of(context).date,
fontSize: SizeConfig.textMultiplier * 1.6,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.black,
fontFamily: 'Poppins',
),
// height: 60,
@ -79,7 +79,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignDetailsWidget> {
widget.title2,
fontSize: SizeConfig.textMultiplier * 1.6,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.black,
fontFamily: 'Poppins',
),
// height: 60
@ -125,7 +125,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignDetailsWidget> {
// textAlign: TextAlign.center,
fontSize: SizeConfig.textMultiplier * 1.8,
fontWeight: FontWeight.w600,
backGroundcolor: Colors.black,
fontFamily: 'Poppins',
),
),
@ -139,7 +139,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignDetailsWidget> {
// textAlign: TextAlign.center,
fontSize: SizeConfig.textMultiplier * 1.8,
fontWeight: FontWeight.w600,
backGroundcolor: Colors.black,
fontFamily: 'Poppins',
),
),

@ -63,7 +63,7 @@ class VitalSingChartAndDetials extends StatelessWidget {
"Graph Details",
fontSize: SizeConfig.textMultiplier * 2.1,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.black,
fontFamily: 'Poppins',
),
SizedBox(height: 8,),

@ -70,7 +70,7 @@ class VitalSingChartBloodPressure extends StatelessWidget {
"Graph Details",
fontSize: SizeConfig.textMultiplier * 2.3,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.black,
fontFamily: 'Poppins',
),
SizedBox(height: 8,),

@ -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/translations_delegate_base.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/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/buttons/app_buttons_widget.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/dialogs/dailog-list-select.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,
// suggestion) =>
// new Padding(
// child: Texts(suggestion
// child: AppText(suggestion
// .description +
// '/' +
// suggestion

@ -1,6 +1,6 @@
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/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:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@ -45,7 +45,7 @@ class PrescriptionDetailsPage extends StatelessWidget {
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Center(
child: Texts(
child: AppText(
prescriptionReport.itemDescription.isNotEmpty
? prescriptionReport.itemDescription
: prescriptionReport.itemDescriptionN),
@ -70,7 +70,7 @@ class PrescriptionDetailsPage extends StatelessWidget {
height: 30,
width: double.infinity,
child: Center(
child: Texts(
child: AppText(
TranslationBase.of(context).route,
fontSize: 14,
))),
@ -79,7 +79,7 @@ class PrescriptionDetailsPage extends StatelessWidget {
height: 30,
width: double.infinity,
child: Center(
child: Texts(
child: AppText(
TranslationBase.of(context).frequency,
fontSize: 14,
))),
@ -88,7 +88,7 @@ class PrescriptionDetailsPage extends StatelessWidget {
width: double.infinity,
padding: EdgeInsets.symmetric(horizontal: 4),
child: Center(
child: Texts(
child: AppText(
"${TranslationBase.of(context).dailyDoses}",
fontSize: 14,
))),
@ -97,7 +97,7 @@ class PrescriptionDetailsPage extends StatelessWidget {
height: 30,
width: double.infinity,
child: Center(
child: Texts(
child: AppText(
TranslationBase.of(context).duration,
fontSize: 14,
))),
@ -144,7 +144,7 @@ class PrescriptionDetailsPage extends StatelessWidget {
child: Center(
child: Column(
children: <Widget>[
Texts(TranslationBase.of(context).notes),
AppText(TranslationBase.of(context).notes),
SizedBox(
height: 5,
),
@ -155,7 +155,7 @@ class PrescriptionDetailsPage extends StatelessWidget {
SizedBox(
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/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/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/dialogs/ShowImageDialog.dart';
import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
@ -64,7 +64,7 @@ class PrescriptionItemsPage extends StatelessWidget {
children: [
Container(
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,),
Row(
children: [
@ -100,30 +100,30 @@ class PrescriptionItemsPage extends StatelessWidget {
children: [
Row(
children: [
Texts(TranslationBase.of(context).route,color: Colors.grey,),
Expanded(child: Texts(" "+model.prescriptionReportList[index].routeN)),
AppText(TranslationBase.of(context).route,color: Colors.grey,),
Expanded(child: AppText(" "+model.prescriptionReportList[index].routeN)),
],
),
Row(
children: [
Texts(TranslationBase.of(context).frequency,color: Colors.grey,),
Texts(" "+model.prescriptionReportList[index].frequencyN ?? ''),
AppText(TranslationBase.of(context).frequency,color: Colors.grey,),
AppText(" "+model.prescriptionReportList[index].frequencyN ?? ''),
],
),
Row(
children: [
Texts(TranslationBase.of(context).dailyDoses,color: Colors.grey,),
Texts(" "+model.prescriptionReportList[index].doseDailyQuantity ?? ''),
AppText(TranslationBase.of(context).dailyDoses,color: Colors.grey,),
AppText(" "+model.prescriptionReportList[index].doseDailyQuantity ?? ''),
],
),
Row(
children: [
Texts(TranslationBase.of(context).duration,color: Colors.grey,),
Texts(" "+model.prescriptionReportList[index].days.toString() ?? ''),
AppText(TranslationBase.of(context).duration,color: Colors.grey,),
AppText(" "+model.prescriptionReportList[index].days.toString() ?? ''),
],
),
SizedBox(height: 12,),
Texts(model.prescriptionReportList[index].remarks ?? ''),
AppText(model.prescriptionReportList[index].remarks ?? ''),
],
),)
@ -151,7 +151,7 @@ class PrescriptionItemsPage extends StatelessWidget {
children: [
Container(
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,),
Row(
mainAxisAlignment: MainAxisAlignment.start,
@ -190,30 +190,30 @@ class PrescriptionItemsPage extends StatelessWidget {
children: [
Row(
children: [
Texts(TranslationBase.of(context).route,color: Colors.grey,),
Expanded(child: Texts(" "+model.prescriptionReportEnhList[index].route??'')),
AppText(TranslationBase.of(context).route,color: Colors.grey,),
Expanded(child: AppText(" "+model.prescriptionReportEnhList[index].route??'')),
],
),
Row(
children: [
Texts(TranslationBase.of(context).frequency,color: Colors.grey,),
Texts(" "+model.prescriptionReportEnhList[index].frequency ?? ''),
AppText(TranslationBase.of(context).frequency,color: Colors.grey,),
AppText(" "+model.prescriptionReportEnhList[index].frequency ?? ''),
],
),
Row(
children: [
Texts(TranslationBase.of(context).dailyDoses,color: Colors.grey,),
Texts(" "+model.prescriptionReportEnhList[index].doseDailyQuantity.toString() ?? ''),
AppText(TranslationBase.of(context).dailyDoses,color: Colors.grey,),
AppText(" "+model.prescriptionReportEnhList[index].doseDailyQuantity.toString() ?? ''),
],
),
Row(
children: [
Texts(TranslationBase.of(context).duration,color: Colors.grey,),
Texts(" "+model.prescriptionReportList[index].days.toString() ?? ''),
AppText(TranslationBase.of(context).duration,color: Colors.grey,),
AppText(" "+model.prescriptionReportList[index].days.toString() ?? ''),
],
),
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/size_config.dart';
import 'package:doctor_app_flutter/widgets/shared/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/buttons/app_buttons_widget.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:flutter/material.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/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.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_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/doctor_card.dart';
@ -49,13 +49,13 @@ class PrescriptionsPage extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Texts(
AppText(
'Order',
style: "caption2",
color: Colors.black,
fontSize: 13,
),
Texts(
AppText(
'Prescriptions',
bold: true,
fontSize: 22,
@ -69,13 +69,13 @@ class PrescriptionsPage extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Texts(
AppText(
'Order',
style: "caption2",
color: Colors.black,
fontSize: 13,
),
Texts(
AppText(
'Prescriptions',
bold: true,
fontSize: 22,
@ -121,7 +121,7 @@ class PrescriptionsPage extends StatelessWidget {
SizedBox(
height: 10,
),
Texts(
AppText(
'Apply for New Prescriptions Order',
color: Colors.grey[600],
fontWeight: FontWeight.w600,
@ -170,7 +170,7 @@ class PrescriptionsPage extends StatelessWidget {
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
child: Texts('No Lab Result Found'),
child: AppText('No Lab Result Found'),
)
],

@ -12,9 +12,9 @@ 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/helpers.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/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/dialogs/dailog-list-select.dart';
import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
@ -204,7 +204,7 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
// itemBuilder: (context,
// suggestion) =>
// new Padding(
// child: Texts(suggestion
// child: AppText(suggestion
// .description +
// '/' +
// 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/util/date-utils.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:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@ -72,7 +72,7 @@ class ProcedureCard extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Texts(
AppText(
entityList.orderType == 0
? 'Routine'
: 'Urgent',
@ -84,7 +84,7 @@ class ProcedureCard extends StatelessWidget {
SizedBox(
height: 5,
),
Texts(
AppText(
entityList.procedureName,
bold: true,
fontSize: 14,
@ -99,13 +99,13 @@ class ProcedureCard extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.end,
mainAxisAlignment: MainAxisAlignment.end,
children: [
Texts(
AppText(
'${DateUtils.getDayMonthYearDateFormatted(DateUtils.convertISOStringToDateTime(entityList.orderDate), isArabic: projectViewModel.isArabic)}',
color: Colors.black,
fontWeight: FontWeight.w600,
fontSize: 14,
),
Texts(
AppText(
'${DateUtils.getHour(DateUtils.convertISOStringToDateTime(entityList.orderDate))}',
fontWeight: FontWeight.w600,
color: Colors.grey[700],
@ -117,13 +117,13 @@ class ProcedureCard extends StatelessWidget {
),
Row(
children: [
Texts(
AppText(
TranslationBase.of(context).orderNo,
//color: Colors.grey,
fontSize: 12,
color: Colors.grey,
),
Texts(
AppText(
entityList.orderNo.toString(),
fontSize: 12,
bold: true,
@ -132,13 +132,13 @@ class ProcedureCard extends StatelessWidget {
),
Row(
children: [
Texts(
AppText(
TranslationBase.of(context).doctorName + ": ",
//color: Colors.grey,
fontSize: 12,
color: Colors.grey,
),
Texts(
AppText(
entityList.doctorName.toString(),
fontSize: 12,
bold: true,
@ -147,13 +147,13 @@ class ProcedureCard extends StatelessWidget {
),
Row(
children: [
Texts(
AppText(
TranslationBase.of(context).clinic + ": ",
//color: Colors.grey,
fontSize: 12,
color: Colors.grey,
),
Texts(
AppText(
entityList.clinicDescription ?? "",
bold: true,
fontSize: 12,
@ -174,7 +174,7 @@ class ProcedureCard extends StatelessWidget {
),
);
},
child: Texts(
child: AppText(
TranslationBase.of(context).showMoreBtn,
textDecoration: TextDecoration.underline,
color: Colors.blue,
@ -184,7 +184,7 @@ class ProcedureCard extends StatelessWidget {
// Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: [
// Texts(
// AppText(
// entityList.remarks.toString() ?? '',
// fontSize: 12,
// ),

@ -12,7 +12,7 @@ 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/widgets/shared/TextFields.dart';
import 'package:doctor_app_flutter/widgets/shared/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_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/dialogs/dailog-list-select.dart';

@ -12,7 +12,7 @@ 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/widgets/shared/TextFields.dart';
import 'package:doctor_app_flutter/widgets/shared/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_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/dialogs/dailog-list-select.dart';

@ -12,7 +12,7 @@ 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/widgets/shared/TextFields.dart';
import 'package:doctor_app_flutter/widgets/shared/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_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/dialogs/dailog-list-select.dart';

@ -4,9 +4,9 @@ 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/viewModel/procedure_View_model.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/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/divider_with_spaces_around.dart';
import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
@ -120,7 +120,7 @@ class _EntityListCheckboxSearchWidgetState
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 10, vertical: 0),
child: Texts(
child: AppText(
historyInfo.procedureName,
fontSize: 14.0,
variant: "bodyText",

@ -2,9 +2,9 @@ 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/viewModel/procedure_View_model.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/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/divider_with_spaces_around.dart';
import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
@ -112,7 +112,7 @@ class _ProcedureListWidgetState extends State<ProcedureListWidget> {
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 10, vertical: 0),
child: Texts(
child: AppText(
historyInfo.procedureName,
variant: "bodyText",
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-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.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_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
@ -50,13 +50,13 @@ class ProcedureScreen extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Texts(
AppText(
'Order Test or',
style: "caption2",
color: Colors.black,
fontSize: 13,
),
Texts(
AppText(
'Procedure',
bold: true,
fontSize: 22,
@ -70,13 +70,13 @@ class ProcedureScreen extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Texts(
AppText(
'Order Test or',
style: "caption2",
color: Colors.black,
fontSize: 13,
),
Texts(
AppText(
'Procedure',
bold: true,
fontSize: 22,
@ -128,7 +128,7 @@ class ProcedureScreen extends StatelessWidget {
SizedBox(
height: 10,
),
Texts(
AppText(
'Add More Procedure',
color: Colors.grey[600],
fontWeight: FontWeight.w600,
@ -188,7 +188,7 @@ class ProcedureScreen extends StatelessWidget {
Image.asset('assets/images/no-data.png'),
Padding(
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'),
Padding(
padding: const EdgeInsets.all(22.0),
child: Texts(model.error),
child: AppText(model.error),
)
],
),

@ -13,7 +13,7 @@ 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/widgets/shared/TextFields.dart';
import 'package:doctor_app_flutter/widgets/shared/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/dialogs/dailog-list-select.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';

@ -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/helpers.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_buttons_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/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/rounded_container_widget.dart';
import 'package:flutter/cupertino.dart';
@ -880,7 +880,7 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
),
// Column(
// children: [
// Texts(TranslationBase.of(context)
// AppText(TranslationBase.of(context)
// .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.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_texts_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'),
Padding(
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/translations_delegate_base.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_buttons_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/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/rounded_container_widget.dart';
import 'package:flutter/cupertino.dart';
@ -424,7 +424,7 @@ class _SickLeaveScreenState extends State<SickLeaveScreen> {
),
// Column(
// children: [
// Texts(TranslationBase.of(context)
// AppText(TranslationBase.of(context)
// .previousSickLeaveIssue +
// ' ')
// ],

@ -68,7 +68,7 @@ class DrAppToastMsg {
radius: 20,
elevation: 10,
textColor: Colors.white,
backgroundColor: Colors.black,
timeInSeconds: 2);
}

@ -1,9 +1,10 @@
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/core/viewModel/imei_view_model.dart';
import 'package:doctor_app_flutter/screens/auth/verification_methods_screen.dart';
import 'package:doctor_app_flutter/widgets/shared/app_button.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_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/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/app_text_form_field.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
@ -225,10 +226,11 @@ class _LoginFormState extends State<LoginForm> {
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
Expanded(
child: Button(
child: AppButton(
title: TranslationBase.of(context).login,
color: HexColor('#D02127'),
onTap: () {
fontWeight: FontWeight.bold,
onPressed: () {
login(context, this.widget.model);
},
)),

@ -13,8 +13,10 @@ 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/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/otp/sms-popup.dart';
import 'package:doctor_app_flutter/widgets/shared/app_button.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/rounded_container_widget.dart';
import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart';
@ -315,11 +317,11 @@ class _VerificationMethodsState extends State<VerificationMethods> {
? Row(
children: <Widget>[
Expanded(
child: Button(
child: AppButton(
title: TranslationBase.of(context)
.useAnotherAccount,
color: Colors.red[700],
onTap: () {
onPressed: () {
Navigator.of(context).pushNamed(LOGIN);
},
)),

@ -110,7 +110,6 @@ class _DoctorReplyWidgetState extends State<DoctorReplyWidget> {
Helpers.capitalize( widget.reply.patientName),
fontSize: SizeConfig.textMultiplier * 2.5,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.white,
fontFamily: 'Poppins',
),
),

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

@ -5,10 +5,12 @@ 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/helpers.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/app_button.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/card_with_bgNew_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/expandable-widget-header-body.dart';
import 'package:flutter/cupertino.dart';
@ -21,7 +23,12 @@ class MyReferralPatientWidget extends StatefulWidget {
final bool isExpand;
final Function expandClick;
MyReferralPatientWidget({Key key, this.myReferralPatientModel, this.model, this.isExpand, this.expandClick});
MyReferralPatientWidget(
{Key key,
this.myReferralPatientModel,
this.model,
this.isExpand,
this.expandClick});
@override
_MyReferralPatientWidgetState createState() =>
@ -428,8 +435,9 @@ class _MyReferralPatientWidgetState extends State<MyReferralPatientWidget> {
Container(
width: double.infinity,
margin: EdgeInsets.only(left: 10, right: 10),
child: Button(
onTap: () async {
child: AppButton(
title : TranslationBase.of(context).replay,
onPressed: () async {
final form = _formKey.currentState;
if (form.validate()) {
try {
@ -443,7 +451,6 @@ class _MyReferralPatientWidgetState extends State<MyReferralPatientWidget> {
}
}
},
title: TranslationBase.of(context).replay,
loading: widget.model.state == ViewState.BusyLocal,
),
)

@ -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/helpers.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:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@ -110,7 +110,6 @@ class PatientCard extends StatelessWidget {
Helpers.capitalize(patientInfo.lastName)),
fontSize: 16,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.white,
fontFamily: 'Poppins',
textOverflow: TextOverflow.ellipsis,
),

@ -1,8 +1,8 @@
import 'package:doctor_app_flutter/config/config.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/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:hexcolor/hexcolor.dart';
import 'package:intl/intl.dart';

@ -99,7 +99,6 @@ class PatientReferralItemWidget extends StatelessWidget {
patientName,
fontSize: SizeConfig.textMultiplier * 2.2,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.white,
color: Colors.black,
fontFamily: 'Poppins',
),

@ -60,7 +60,6 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget
: Helpers.capitalize(patient.patientDetails.fullName),
fontSize: SizeConfig.textMultiplier * 2.2,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.white,
fontFamily: 'Poppins',
),
),

@ -61,7 +61,6 @@ class PatientProfileHeaderNewDesign extends StatelessWidget {
: Helpers.capitalize(patient.patientDetails.fullName),
fontSize: SizeConfig.textMultiplier * 2.2,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.white,
fontFamily: 'Poppins',
),
),

@ -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/helpers.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:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
@ -79,7 +79,6 @@ class PatientProfileHeaderWhitAppointment extends StatelessWidget {
patient.lastName)) : Helpers.capitalize(patient.patientDetails.fullName),
fontSize: SizeConfig.textMultiplier *2.2,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.white,
fontFamily: 'Poppins',
),
),
@ -373,7 +372,7 @@ class PatientProfileHeaderWhitAppointment extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Texts(
AppText(
'${TranslationBase.of(context).dr}.$doctorName',
color: Colors.black,
fontWeight: FontWeight.w600,
@ -382,11 +381,11 @@ class PatientProfileHeaderWhitAppointment extends StatelessWidget {
if (orderNo != null && !isPrescriptions)
Row(
children: <Widget>[
Texts(
AppText(
'Order No:',
color: Colors.grey[800],
),
Texts(
AppText(
orderNo ?? '',
)
],
@ -394,11 +393,11 @@ class PatientProfileHeaderWhitAppointment extends StatelessWidget {
if (invoiceNO != null && !isPrescriptions)
Row(
children: <Widget>[
Texts(
AppText(
'Invoice:',
color: Colors.grey[800],
),
Texts(
AppText(
invoiceNO,
)
],
@ -406,11 +405,11 @@ class PatientProfileHeaderWhitAppointment extends StatelessWidget {
if(isPrescriptions)
Row(
children: [
Texts(
AppText(
'Branch:',
color: Colors.grey[800],
),
Texts(
AppText(
branch?? '',
)
],
@ -418,23 +417,23 @@ class PatientProfileHeaderWhitAppointment extends StatelessWidget {
if(isPrescriptions)
Row(
children: [
Texts(
AppText(
'Clinic:',
color: Colors.grey[800],
),
Texts(
AppText(
clinic?? '',
)
],
),
Row(
children: <Widget>[
Texts(
AppText(
!isPrescriptions? 'Result Date:': 'Prescriptions Date',
color: Colors.grey[800],
),
Expanded(
child: Texts(
child: AppText(
'${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/helpers.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:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
@ -87,7 +87,6 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget
: Helpers.capitalize(patient.patientDetails.fullName),
fontSize: SizeConfig.textMultiplier * 2.2,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.white,
fontFamily: 'Poppins',
),
),
@ -323,7 +322,7 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Texts(
AppText(
'${TranslationBase.of(context).dr}$doctorName',
color: Colors.black,
fontWeight: FontWeight.w600,
@ -332,63 +331,63 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget
if (orderNo != null && !isPrescriptions)
Row(
children: <Widget>[
Texts('Order No: ',
AppText('Order No: ',
color: Colors.grey[800],
fontSize: 12),
Texts(orderNo ?? '', fontSize: 12)
AppText(orderNo ?? '', fontSize: 12)
],
),
if (invoiceNO != null && !isPrescriptions)
Row(
children: <Widget>[
Texts('Invoice: ',
AppText('Invoice: ',
color: Colors.grey[800],
fontSize: 12),
Texts(invoiceNO, fontSize: 12)
AppText(invoiceNO, fontSize: 12)
],
),
if (branch != null)
Row(
children: [
Texts('Branch: ',
AppText('Branch: ',
color: Colors.grey[800],
fontSize: 12),
Texts(branch ?? '', fontSize: 12)
AppText(branch ?? '', fontSize: 12)
],
),
if (isPrescriptions)
if (clinic != null)
Row(
children: [
Texts('Clinic: ',
AppText('Clinic: ',
color: Colors.grey[800],
fontSize: 12),
Texts(clinic ?? '', fontSize: 12)
AppText(clinic ?? '', fontSize: 12)
],
),
if (isMedicalFile && episode != null)
Row(
children: [
Texts('Episode: ',
AppText('Episode: ',
color: Colors.grey[800],
fontSize: 12),
Texts(episode ?? '', fontSize: 12)
AppText(episode ?? '', fontSize: 12)
],
),
if (isMedicalFile && vistDate != null)
Row(
children: [
Texts('Visit Date: ',
AppText('Visit Date: ',
color: Colors.grey[800],
fontSize: 12),
Texts(vistDate ?? '', fontSize: 12)
AppText(vistDate ?? '', fontSize: 12)
],
),
if (!isMedicalFile)
Row(
children: <Widget>[
Expanded(
child: Texts(
child: AppText(
!isPrescriptions
? 'Result Date: '
: 'Prescriptions Date ',
@ -396,7 +395,7 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget
fontSize: 12,
),
),
Texts(
AppText(
'${DateUtils.getDayMonthYearDateFormatted(appointmentDate, isArabic: projectViewModel.isArabic)}',
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/util/date-utils.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/material.dart';
import 'package:hexcolor/hexcolor.dart';
@ -61,7 +61,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignDetailsWidget> {
),
),
child: Center(
child: Texts(
child: AppText(
widget.title1,
color: Colors.white,
),
@ -78,7 +78,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignDetailsWidget> {
),
),
child: Center(
child: Texts(widget.title2, color: Colors.white),
child: AppText(widget.title2, color: Colors.white),
),
height: 60),
)
@ -90,7 +90,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignDetailsWidget> {
padding: EdgeInsets.all(10),
color: Colors.white,
child: Center(
child: Texts(
child: AppText(
'${DateUtils.getWeekDay(vital.vitalSignDate.weekday)}, ${vital.vitalSignDate.day} ${DateUtils.getMonth(vital.vitalSignDate.month)}, ${vital.vitalSignDate.year} ',
textAlign: TextAlign.center,
),
@ -102,7 +102,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignDetailsWidget> {
padding: EdgeInsets.all(10),
color: Colors.white,
child: Center(
child: Texts(
child: AppText(
'${vital.toJson()[widget.viewKey]}',
textAlign: TextAlign.center,
),

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

@ -1,150 +0,0 @@
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
class Button extends StatefulWidget {
final String title;
final Widget icon;
final VoidCallback onTap;
final bool loading;
final Color color;
Button({
Key key,
this.title = "",
this.icon,
this.onTap,
this.loading= false,
this.color,
}) : super(key: key);
@override
_ButtonState createState() => _ButtonState();
}
class _ButtonState extends State<Button> with TickerProviderStateMixin {
double _buttonSize = 1.0;
AnimationController _animationController;
Animation _animation;
@override
void initState() {
_animationController = AnimationController(
vsync: this,
lowerBound: 0.7,
upperBound: 1.0,
duration: Duration(milliseconds: 120));
_animation = CurvedAnimation(
parent: _animationController,
curve: Curves.easeOutQuad,
reverseCurve: Curves.easeOutQuad);
_animation.addListener(() {
setState(() {
_buttonSize = _animation.value;
});
});
super.initState();
}
@override
void dispose() {
_animationController.dispose();
super.dispose();
}
Widget _buildIcon() {
if (widget.icon != null && (widget.title != null && widget.title != "")) {
return Container(
margin: EdgeInsets.only(right: 12.0),
height: 24.0,
child: widget.icon);
} else if (widget.icon != null) {
return Container(
height: 18.0,
width: 18.0,
child: widget.icon,
);
} else {
return Container();
}
}
@override
Widget build(BuildContext context) {
return IgnorePointer(
ignoring: widget.loading,
child: GestureDetector(
onTapDown: (TapDownDetails tap) {
_animationController.reverse(from: 1.0);
},
onTapUp: (TapUpDetails tap) {
_animationController.forward();
},
onTapCancel: () {
_animationController.forward();
},
onTap: Feedback.wrapForTap(widget.onTap, context),
behavior: HitTestBehavior.opaque,
child: Transform.scale(
scale: _buttonSize,
child: AnimatedContainer(
duration: Duration(milliseconds: 150),
margin:
EdgeInsets.only(bottom: widget.title.isNotEmpty ? 14.0 : 0.0),
padding: EdgeInsets.symmetric(
vertical: widget.title != null && widget.title.isNotEmpty
? 12.0
: 15.0,
horizontal: widget.title != null && widget.title.isNotEmpty
? 22.0
: 19),
decoration: BoxDecoration(
color: widget.color ?? HexColor('#515b5d'),
borderRadius: BorderRadius.all(Radius.circular(10.0)),
boxShadow: [
BoxShadow(
color: Color.fromRGBO(70, 70, 70, 0.28),
spreadRadius:
_buttonSize < 1.0 ? -(1 - _buttonSize) * 50 : 0.0,
offset: Offset(0, 7.0),
blurRadius: 24.0)
],
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
_buildIcon(),
widget.loading
? Padding(
padding: const EdgeInsets.all(2.7),
child: SizedBox(
height: 19.0,
width: 19.0,
child: CircularProgressIndicator(
backgroundColor: Colors.white,
valueColor: AlwaysStoppedAnimation<Color>(
HexColor('#FFDDD9'),
),
),
),
)
: Padding(
padding: EdgeInsets.only(bottom: 3.0),
child: Text(widget.title,
style: TextStyle(
color: Colors.white,
fontSize: 17.0,
fontWeight: FontWeight.w700,
fontFamily: "Poppins")),
)
],
),
),
),
),
);
}
}

@ -1,92 +0,0 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
import 'app_texts_widget.dart';
class AppButton extends StatefulWidget {
final GestureTapCallback onPressed;
final String title;
final IconData icon;
final Color color;
final double fontSize;
final double padding;
final Color fontColor;
final bool loading;
final bool disabled;
final FontWeight fontWeight;
AppButton(
{@required this.onPressed,
this.title,
this.icon,
this.color,
this.fontSize = 2,
this.padding = 13,
this.loading = false,
this.disabled = false,
this.fontColor = Colors.white,
this.fontWeight});
_AppButtonState createState() => _AppButtonState();
}
class _AppButtonState extends State<AppButton> {
@override
Widget build(BuildContext context) {
return IgnorePointer(
ignoring: widget.loading,
child: RawMaterialButton(
fillColor: widget.color != null ? widget.color : HexColor("#B8382C"),
splashColor: widget.color,
child: Padding(
padding: EdgeInsets.only(
top: widget.padding,
bottom: widget.padding,
//right: SizeConfig.widthMultiplier * widget.padding,
//left: SizeConfig.widthMultiplier * widget.padding
),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
if (widget.icon != null)
Icon(
widget.icon,
color: Colors.white,
),
if (widget.icon != null)
SizedBox(
width: 5.0,
),
widget.loading
? Padding(
padding: EdgeInsets.all(2.6),
child: SizedBox(
height: 19.0,
width: 19.0,
child: CircularProgressIndicator(
backgroundColor: Colors.white,
valueColor: AlwaysStoppedAnimation<Color>(
Colors.grey[300],
),
),
),
)
: AppText(
widget.title,
color: widget.fontColor,
fontSize: SizeConfig.textMultiplier * widget.fontSize,
fontWeight: widget.fontWeight,
),
],
),
),
onPressed: widget.onPressed,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6))),
),
);
}
}

@ -1,46 +1,92 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
// OWNER : Ibrahim albitar
// DATE : 12-04-2020
// DESCRIPTION : Customization for Texts in app
import 'package:hexcolor/hexcolor.dart';
class AppText extends StatefulWidget {
final String data;
final String text;
final String variant;
final Color color;
final FontWeight fontWeight;
final double fontSize;
final String fontFamily;
final int maxLength;
final bool italic;
final double margin;
final double marginTop;
final double marginRight;
final double marginBottom;
final double marginLeft;
final bool visibility;
final TextAlign textAlign;
final Color backGroundcolor;
final bool bold;
final bool regular;
final bool medium;
final int maxLines;
final bool readMore;
final String style;
final bool allowExpand;
final bool visibility;
final TextOverflow textOverflow;
AppText(this.data,
{this.color = Colors.black,
this.fontWeight = FontWeight.normal,
this.fontSize,
this.fontFamily = 'Poppins',
this.margin,
this.marginTop = 0,
this.marginRight = 0,
this.marginBottom = 0,
this.marginLeft = 0,
this.visibility = true,
this.textAlign,
this.textOverflow,
this.backGroundcolor = Colors.white});
final TextDecoration textDecoration;
AppText(
this.text, {
this.color = Colors.black,
this.fontWeight = FontWeight.normal,
this.variant,
this.fontSize,
this.fontFamily = 'Poppins',
this.italic = false,
this.maxLength = 60,
this.margin,
this.marginTop = 0,
this.marginRight = 0,
this.marginBottom = 0,
this.marginLeft = 0,
this.textAlign,
this.bold,
this.regular,
this.medium,
this.maxLines,
this.readMore = false,
this.style,
this.allowExpand = true,
this.visibility = true,
this.textOverflow,
this.textDecoration,
});
@override
_AppTextState createState() => _AppTextState();
}
class _AppTextState extends State<AppText> {
bool hidden = false;
String text = "";
@override
void didUpdateWidget(covariant AppText 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();
}
@override
Widget build(BuildContext context) {
return Container(
@ -51,19 +97,200 @@ class _AppTextState extends State<AppText> {
right: widget.marginRight,
bottom: widget.marginBottom,
left: widget.marginLeft),
child: Text(
widget.data,
textAlign: widget.textAlign,
overflow: widget.textOverflow ?? TextOverflow.clip,
style: TextStyle(
color: widget.color,
fontWeight: widget.fontWeight,
fontSize: widget.fontSize ?? (SizeConfig.textMultiplier * 2),
fontFamily: widget.fontFamily,
// backgroundColor:widget.backGroundcolor
),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Stack(
children: [
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.textDecoration == null
? widget.color != null
? widget.color
: Colors.black
: null,
fontSize: widget.fontSize ?? _getFontSize(),
letterSpacing:
widget.variant == "overline" ? 1.5 : null,
fontWeight: widget.fontWeight ?? _getFontWeight(),
fontFamily: widget.fontFamily ?? 'Poppins',
decoration: widget.textDecoration),
),
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",
)),
),
),
],
),
);
}
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();
}
}
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 SizeConfig.textMultiplier * 2;
}
}
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;
}
}
}
}

@ -1,87 +0,0 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:flutter/material.dart';
class BorderedButton extends StatelessWidget {
final String text;
final Function handler;
final Color textColor;
final bool hasBorder;
final Color borderColor;
final Color backgroundColor;
final double vPadding;
final double hPadding;
final double radius;
final double lPadding;
final double tPadding;
final double rPadding;
final double bPadding;
final double fontSize;
final String fontFamily;
final Widget icon;
final FontWeight fontWeight;
BorderedButton(
this.text, {
this.handler,
this.textColor,
this.hasBorder = false,
this.borderColor,
this.backgroundColor,
this.vPadding = 0,
this.hPadding = 0,
this.radius = 4.0,
this.lPadding = 4.0,
this.tPadding = 0.0,
this.rPadding = 4.0,
this.bPadding = 0.0,
this.fontSize = 0,
this.fontFamily = 'WorkSans',
this.icon,
this.fontWeight,
});
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: () {
handler();
},
child: Container(
decoration: BoxDecoration(
shape: BoxShape.rectangle,
color: backgroundColor ?? Colors.white,
borderRadius: BorderRadius.circular(radius),
border: Border.fromBorderSide(BorderSide(
color: hasBorder ? borderColor : Colors.white,
width: 0.8,
)),
),
child: Container(
padding: (hPadding > 0 || vPadding > 0)
? EdgeInsets.symmetric(
vertical: vPadding, horizontal: hPadding)
: EdgeInsets.fromLTRB(
lPadding, tPadding, rPadding, bPadding),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
icon != null ? icon : Container(),
Container(
margin: EdgeInsets.symmetric(horizontal: 2),
child: Text(
text,
textAlign: TextAlign.center,
style: TextStyle(
fontSize: fontSize == 0 ? SizeConfig.textMultiplier * 1.6 : fontSize,
fontWeight: fontWeight != null ? fontWeight : FontWeight.normal,
fontFamily: fontFamily,
color: textColor ?? Color(0xffc4aa54)),
),
),
],
),
),
),
);
}
}

@ -0,0 +1,117 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
import '../app_texts_widget.dart';
class AppButton extends StatefulWidget {
final GestureTapCallback onPressed;
final String title;
final IconData iconData;
final Widget icon;
final Color color;
final double fontSize;
final double padding;
final Color fontColor;
final bool loading;
final bool disabled;
final FontWeight fontWeight;
final bool hasBorder;
final Color borderColor;
final double radius;
final double vPadding;
final double hPadding;
AppButton({
@required this.onPressed,
this.title,
this.iconData,
this.icon,
this.color,
this.fontSize = 2,
this.padding = 13,
this.loading = false,
this.disabled = false,
this.fontColor = Colors.white,
this.fontWeight = FontWeight.normal,
this.vPadding = 0,
this.hPadding = 0,
this.radius = 8.0,
this.hasBorder = false,
this.borderColor,
});
_AppButtonState createState() => _AppButtonState();
}
class _AppButtonState extends State<AppButton> {
@override
Widget build(BuildContext context) {
return IgnorePointer(
ignoring: widget.loading,
child: RawMaterialButton(
fillColor: widget.color != null ? widget.color : HexColor("#B8382C"),
splashColor: widget.color,
child: Padding(
padding: (widget.hPadding > 0 || widget.vPadding > 0)
? EdgeInsets.symmetric(
vertical: widget.vPadding, horizontal: widget.hPadding)
: EdgeInsets.only(
top: widget.padding,
bottom: widget.padding,
//right: SizeConfig.widthMultiplier * widget.padding,
//left: SizeConfig.widthMultiplier * widget.padding
),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
if (widget.icon != null)
Container(width: 25, height: 25, child: widget.icon),
if (widget.iconData != null)
Icon(
widget.iconData,
color: Colors.white,
),
if (widget.icon != null || widget.iconData != null)
SizedBox(
width: 5.0,
),
widget.loading
? Padding(
padding: EdgeInsets.all(2.6),
child: SizedBox(
height: 19.0,
width: 19.0,
child: CircularProgressIndicator(
backgroundColor: Colors.white,
valueColor: AlwaysStoppedAnimation<Color>(
Colors.grey[300],
),
),
),
)
: Container(
child: AppText(
widget.title,
color: widget.fontColor,
fontSize: SizeConfig.textMultiplier * widget.fontSize,
fontWeight: widget.fontWeight,
),
),
],
),
),
onPressed: widget.onPressed,
shape: RoundedRectangleBorder(
side: BorderSide(
color:
widget.hasBorder ? widget.borderColor : widget.color,
width: 0.8,
),
borderRadius: BorderRadius.all(Radius.circular(widget.radius))),
),
);
}
}

@ -0,0 +1,24 @@
import 'package:flutter/material.dart';
import 'app_buttons_widget.dart';
class ButtonBottomSheet extends StatelessWidget {
final double height;
final String buttonTitle;
final Function onPressed;
ButtonBottomSheet({@required this.height, @required this.buttonTitle, @required this.onPressed});
@override
Widget build(BuildContext context) {
return Container(
height: height ?? null,
margin: EdgeInsets.symmetric(horizontal: 16, vertical: 16),
child: AppButton(
title: buttonTitle,
onPressed: onPressed,
),
);
}
}

@ -242,7 +242,7 @@ class _SecondaryButtonState extends State<SecondaryButton>
// fontWeight: FontWeight.w800,
fontFamily: projectViewModel.isArabic
? 'Cairo'
: 'WorkSans'),
: 'Poppins'),
),
)
],

@ -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/translations_delegate_base.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:flutter/cupertino.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 'StarRating.dart';
import 'Text.dart';
class DoctorCard extends StatelessWidget {
final String doctorName;
@ -57,7 +57,7 @@ class DoctorCard extends StatelessWidget {
Row(
children: [
Expanded(
child: Texts(
child: AppText(
doctorName,
bold: true,
)),
@ -65,14 +65,14 @@ class DoctorCard extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Texts(
AppText(
'${DateUtils.getDayMonthYearDateFormatted(appointmentDate, isArabic: projectViewModel.isArabic)}',
color: Colors.black,
fontWeight: FontWeight.w600,
fontSize: 14,
),
if (!isPrescriptions)
Texts(
AppText(
'${DateUtils.getHour(appointmentDate)}',
fontWeight: FontWeight.w600,
color: Colors.grey[700],
@ -107,13 +107,13 @@ class DoctorCard extends StatelessWidget {
if (orderNo != null && !isPrescriptions)
Row(
children: <Widget>[
Texts(
AppText(
TranslationBase.of(context).orderNo +
": ",
color: Colors.grey[500],
fontSize: 14,
),
Texts(
AppText(
orderNo ?? '',
fontSize: 14,
)
@ -122,14 +122,14 @@ class DoctorCard extends StatelessWidget {
if (invoiceNO != null && !isPrescriptions)
Row(
children: <Widget>[
Texts(
AppText(
TranslationBase.of(context)
.invoiceNo +
": ",
fontSize: 14,
color: Colors.grey[500],
),
Texts(
AppText(
invoiceNO,
fontSize: 14,
)
@ -138,13 +138,13 @@ class DoctorCard extends StatelessWidget {
if (clinic != null)
Row(
children: <Widget>[
Texts(
AppText(
TranslationBase.of(context).clinic +
": ",
color: Colors.grey[500],
fontSize: 14,
),
Texts(
AppText(
clinic,
fontSize: 14,
)
@ -153,13 +153,13 @@ class DoctorCard extends StatelessWidget {
if (branch != null)
Row(
children: <Widget>[
Texts(
AppText(
TranslationBase.of(context).branch +
": ",
fontSize: 14,
color: Colors.grey[500],
),
Texts(
AppText(
branch,
fontSize: 14,
)

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

@ -4,14 +4,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/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart';
import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.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';
class MasterKeyCheckboxSearchWidget extends StatefulWidget {

@ -1,6 +1,6 @@
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/widgets/shared/Text.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@ -42,7 +42,7 @@ class NetworkBaseView extends StatelessWidget {
child: Center(
child: Padding(
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/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/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_field_error.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/text_fields_utils.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import '../../app_texts_widget.dart';
import '../app_texts_widget.dart';
class AppTextFieldCustom extends StatefulWidget {
final double height;

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save