diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 66be39bf..77994274 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -400,7 +400,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -485,7 +485,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -534,7 +534,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/lib/config/config.dart b/lib/config/config.dart index 0511f1cd..4c5374ae 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -456,4 +456,5 @@ const TIMER_MIN = 10; class AppGlobal { static var CONTEX; static Color appPrimaryColor = Color(0xFFB9382C); + static Color appGreenColor = Color(0xFF359846); } diff --git a/lib/screens/doctor/doctor_replay/doctor_repaly_chat.dart b/lib/screens/doctor/doctor_replay/doctor_repaly_chat.dart index 52331e8e..cda899f1 100644 --- a/lib/screens/doctor/doctor_replay/doctor_repaly_chat.dart +++ b/lib/screens/doctor/doctor_replay/doctor_repaly_chat.dart @@ -1,3 +1,4 @@ +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/doctor_replay_view_model.dart'; @@ -370,7 +371,7 @@ class _DoctorReplayChatState extends State { child: Center( child: AppButton( fontWeight: FontWeight.w700, - color: Colors.green[600], + color: AppGlobal.appGreenColor, title: "Update Your Answer", //TranslationBase.of(context).close, onPressed: () { setState(() { @@ -400,7 +401,7 @@ class _DoctorReplayChatState extends State { fontSize: 13.5, suffixIcon: FontAwesomeIcons.arrowRight, - suffixIconColor: Colors.green, + suffixIconColor: AppGlobal.appGreenColor, onSuffixTap: ()async { if(msgController.text.isEmpty){ diff --git a/lib/screens/doctor/doctor_replay/doctor_reply_widget.dart b/lib/screens/doctor/doctor_replay/doctor_reply_widget.dart index 69bb9ab2..ecd0f93d 100644 --- a/lib/screens/doctor/doctor_replay/doctor_reply_widget.dart +++ b/lib/screens/doctor/doctor_replay/doctor_reply_widget.dart @@ -37,7 +37,7 @@ class _DoctorReplyWidgetState extends State { ? IN_PROGRESS_COLOR : widget.reply.infoStatus == 3 ? Color(0xFFD02127) - : Colors.green[600], + : AppGlobal.appGreenColor, hasBorder: false, widget: Container( child: InkWell( @@ -77,7 +77,7 @@ class _DoctorReplyWidgetState extends State { ? IN_PROGRESS_COLOR : widget.reply.infoStatus == 3 ? Color(0xFFD02127) - : Colors.green[600], + : AppGlobal.appGreenColor, fontWeight: FontWeight.w700, fontFamily: 'Poppins', fontSize: 1.8 * SizeConfig.textMultiplier)), diff --git a/lib/screens/live_care/end_call_screen.dart b/lib/screens/live_care/end_call_screen.dart index 62b97f2d..060b3844 100644 --- a/lib/screens/live_care/end_call_screen.dart +++ b/lib/screens/live_care/end_call_screen.dart @@ -63,7 +63,7 @@ class _EndCallScreenState extends State { PatientProfileCardModel(TranslationBase.of(context).resume, TranslationBase.of(context).theCall, '', 'patient/vital_signs.png', isInPatient: isInpatient, - color: Colors.green[800], + color: AppGlobal.appGreenColor, onTap: () async { GifLoaderDialogUtils.showMyDialog(context); await liveCareModel @@ -347,7 +347,7 @@ class _EndCallScreenState extends State { }, title: TranslationBase.of(context).noteConfirm, fontColor: Colors.white, - color: Colors.green[600], + color: AppGlobal.appGreenColor, ), AppButton( onPressed: () { diff --git a/lib/screens/live_care/live_care_patient_screen.dart b/lib/screens/live_care/live_care_patient_screen.dart index a9c7b38f..d3217a95 100644 --- a/lib/screens/live_care/live_care_patient_screen.dart +++ b/lib/screens/live_care/live_care_patient_screen.dart @@ -159,7 +159,7 @@ class _LiveCarePatientScreenState extends State { )), // AppButton( // fontWeight: FontWeight.w700, - // color:Colors.green[600], + // color:AppGlobal.appGreenColor[600], // title: TranslationBase.of(context).initiateCall, // disabled: model.state == ViewState.BusyLocal, // onPressed: () async { diff --git a/lib/screens/live_care/video_call.dart b/lib/screens/live_care/video_call.dart index e024624a..2d3f1d15 100644 --- a/lib/screens/live_care/video_call.dart +++ b/lib/screens/live_care/video_call.dart @@ -1,5 +1,6 @@ import 'dart:async'; +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/core/viewModel/LiveCarePatientViewModel.dart'; import 'package:doctor_app_flutter/core/viewModel/livecare_view_model.dart'; @@ -242,7 +243,7 @@ class _VideoCallPageState extends State { onPressed: () => {resumeCall()}, child: Text(TranslationBase.of(context).resumecall), - color: Colors.green[900], + color: AppGlobal.appGreenColor, textColor: Colors.white, ), ), diff --git a/lib/screens/patient-sick-leave/add_patient_sick_leave_screen.dart b/lib/screens/patient-sick-leave/add_patient_sick_leave_screen.dart index 8c9f0f1d..439c9e26 100644 --- a/lib/screens/patient-sick-leave/add_patient_sick_leave_screen.dart +++ b/lib/screens/patient-sick-leave/add_patient_sick_leave_screen.dart @@ -295,7 +295,7 @@ class _AddPatientSickLeaveScreenState extends State { child: AppButton( title: TranslationBase.of(context) .addSickLeaverequest, - color: Colors.green, + color: AppGlobal.appGreenColor, onPressed: () async { submitForm(model); }), diff --git a/lib/screens/patients/ReferralDischargedPatientDetails.dart b/lib/screens/patients/ReferralDischargedPatientDetails.dart index f78752ec..a52df188 100644 --- a/lib/screens/patients/ReferralDischargedPatientDetails.dart +++ b/lib/screens/patients/ReferralDischargedPatientDetails.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/model/referral/DischargeReferralPatient.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart'; @@ -122,7 +123,7 @@ class ReferralDischargedPatientDetails extends StatelessWidget { color: referredPatient.referralStatus == 1 ? Color(0xffc4aa54) : referredPatient.referralStatus == 46 - ? Colors.green[700] + ? AppGlobal.appGreenColor : Colors.red[700], ), AppText( diff --git a/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart b/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart index 9268b031..901dcfe1 100644 --- a/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart +++ b/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; @@ -522,7 +523,7 @@ class ProceduresWidget extends StatelessWidget { AppText( "${procedure.isCovered}", fontWeight: FontWeight.normal, - color: procedure.isCovered ? Colors.green : Colors.red, + color: procedure.isCovered ? AppGlobal.appGreenColor : Colors.red, fontSize: SizeConfig.textMultiplier * 2.0, ), SizedBox( diff --git a/lib/screens/patients/profile/medical_report/MedicalReportPage.dart b/lib/screens/patients/profile/medical_report/MedicalReportPage.dart index a25d03b4..bb03a9bc 100644 --- a/lib/screens/patients/profile/medical_report/MedicalReportPage.dart +++ b/lib/screens/patients/profile/medical_report/MedicalReportPage.dart @@ -1,3 +1,4 @@ +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/service/AnalyticsService.dart'; @@ -135,7 +136,7 @@ class _MedicalReportPageState extends State { margin: EdgeInsets.symmetric(horizontal: 8), child: CardWithBgWidget( hasBorder: false, - bgColor: model.medicalReportList[index].status == 1 ? Color(0xFFCC9B14) : Colors.green[700], + bgColor: model.medicalReportList[index].status == 1 ? Color(0xFFCC9B14) : AppGlobal.appGreenColor, widget: Column( children: [ Row( @@ -150,7 +151,7 @@ class _MedicalReportPageState extends State { : TranslationBase.of(context).verified, color: model.medicalReportList[index].status == 1 ? Color(0xFFCC9B14) - : Colors.green[700], + : AppGlobal.appGreenColor, fontSize: 1.4 * SizeConfig.textMultiplier, bold: true, ), diff --git a/lib/screens/patients/profile/notes/note/progress_note_screen.dart b/lib/screens/patients/profile/notes/note/progress_note_screen.dart index 52a1b0e0..f47c99ae 100644 --- a/lib/screens/patients/profile/notes/note/progress_note_screen.dart +++ b/lib/screens/patients/profile/notes/note/progress_note_screen.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/core/model/note/note_model.dart'; import 'package:doctor_app_flutter/core/model/note/update_note_model.dart'; @@ -147,7 +148,7 @@ class _ProgressNoteState extends State { : model.patientProgressNoteList[index] .status == 2 - ? Colors.green[600] + ? AppGlobal.appGreenColor : Color(0xFFCC9B14), widget: Column( children: [ @@ -196,7 +197,7 @@ class _ProgressNoteState extends State { TranslationBase.of(context) .noteVerified, fontWeight: FontWeight.bold, - color: Colors.green[600], + color: AppGlobal.appGreenColor, fontSize: 12, ), if (model.patientProgressNoteList[index].status != 2 && @@ -318,7 +319,7 @@ class _ProgressNoteState extends State { }, child: Container( decoration: BoxDecoration( - color: Colors.green[600], + color: AppGlobal.appGreenColor, borderRadius: BorderRadius.circular( 10), diff --git a/lib/screens/patients/profile/operation_report/operation_report.dart b/lib/screens/patients/profile/operation_report/operation_report.dart index 6d912c3f..4d566e6c 100644 --- a/lib/screens/patients/profile/operation_report/operation_report.dart +++ b/lib/screens/patients/profile/operation_report/operation_report.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/core/model/note/note_model.dart'; import 'package:doctor_app_flutter/core/model/note/update_note_model.dart'; import 'package:doctor_app_flutter/core/service/AnalyticsService.dart'; @@ -320,7 +321,7 @@ class _ProgressNoteState extends State { }, child: Container( decoration: BoxDecoration( - color: Colors.green[600], + color: AppGlobal.appGreenColor, borderRadius: BorderRadius.circular(10), ), diff --git a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart index 0c66b493..16a4f23c 100644 --- a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart +++ b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart @@ -1,5 +1,6 @@ import 'dart:async'; +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/service/AnalyticsService.dart'; import 'package:doctor_app_flutter/core/service/VideoCallService.dart'; @@ -334,7 +335,7 @@ class _PatientProfileScreenState extends State fontWeight: FontWeight.w700, color: isCallFinished ? Colors.red[600] - : Colors.green[600], + : AppGlobal.appGreenColor, title: isCallFinished ? TranslationBase.of(context).endCall : TranslationBase.of(context).initiateCall, diff --git a/lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart b/lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart index 251a91fa..15d176d0 100644 --- a/lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart +++ b/lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart @@ -198,7 +198,7 @@ class _AddReplayOnReferralPatientState extends State }, title: TranslationBase.of(context).noteConfirm, fontColor: Colors.white, - color: Colors.green[600], + color: AppGlobal.appGreenColor, ), ), ], diff --git a/lib/screens/patients/profile/referral/ReplySummeryOnReferralPatient.dart b/lib/screens/patients/profile/referral/ReplySummeryOnReferralPatient.dart index 2a48e079..72bd6825 100644 --- a/lib/screens/patients/profile/referral/ReplySummeryOnReferralPatient.dart +++ b/lib/screens/patients/profile/referral/ReplySummeryOnReferralPatient.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/model/referral/MyReferralPatientModel.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart'; @@ -105,7 +106,7 @@ class _ReplySummeryOnReferralPatientState onPressed: () {}, title: TranslationBase.of(context).noteConfirm, fontColor: Colors.white, - color: Colors.green[600], + color: AppGlobal.appGreenColor, ), ), ], diff --git a/lib/screens/patients/profile/referral/my-referral-detail-screen.dart b/lib/screens/patients/profile/referral/my-referral-detail-screen.dart index 8bf89d87..218c568d 100644 --- a/lib/screens/patients/profile/referral/my-referral-detail-screen.dart +++ b/lib/screens/patients/profile/referral/my-referral-detail-screen.dart @@ -1,3 +1,4 @@ +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/model/referral/MyReferralPatientModel.dart'; @@ -105,7 +106,7 @@ class MyReferralDetailScreen extends StatelessWidget { color: referralPatient.referralStatus == 1 ? Color(0xffc4aa54) : referralPatient.referralStatus == 46 || referralPatient.referralStatus == 2 - ? Colors.green[700] + ? AppGlobal.appGreenColor : Colors.red[700], ), AppText( diff --git a/lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart b/lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart index cfc26eee..d88d5a95 100644 --- a/lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart +++ b/lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/model/referral/MyReferralPatientModel.dart'; import 'package:doctor_app_flutter/core/service/AnalyticsService.dart'; @@ -146,7 +147,7 @@ class ReferralPatientDetailScreen extends StatelessWidget { color: referredPatient.referralStatus == 1 ? Color(0xffc4aa54) : referredPatient.referralStatus == 46 || referredPatient.referralStatus == 2 - ? Colors.green[700] + ? AppGlobal.appGreenColor : Colors.red[700], ), AppText( diff --git a/lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart b/lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart index f6d3b8d7..21634d0f 100644 --- a/lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart +++ b/lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/PatientType.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; @@ -157,7 +158,7 @@ class ReferredPatientDetailScreen extends StatelessWidget { color: referredPatient.referralStatus == 1 ? Color(0xffc4aa54) : referredPatient.referralStatus == 46 - ? Colors.green[700] + ? AppGlobal.appGreenColor : Colors.red[700], ), AppText( diff --git a/lib/screens/patients/profile/soap_update/objective/examination_item_card.dart b/lib/screens/patients/profile/soap_update/objective/examination_item_card.dart index 9dd00302..89691cf2 100644 --- a/lib/screens/patients/profile/soap_update/objective/examination_item_card.dart +++ b/lib/screens/patients/profile/soap_update/objective/examination_item_card.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/models/SOAP/selected_items/my_selected_examination.dart'; @@ -59,7 +60,7 @@ class ExaminationItemCard extends StatelessWidget { ? examination.isAbnormal ? Colors.red.shade800 : Colors.grey.shade800 - : Colors.green.shade800, + : AppGlobal.appGreenColor, fontSize: SizeConfig.textMultiplier * 1.8, ), if (!examination.notExamined) diff --git a/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart b/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart index 9712eafd..c4964975 100644 --- a/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart +++ b/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; @@ -167,7 +168,7 @@ class _UpdateObjectivePageState extends State "Verified", fontWeight: FontWeight.w600, fontFamily: 'Poppins', - color: Colors.green, + color: AppGlobal.appGreenColor, ), ], ), diff --git a/lib/screens/reschedule-leaves/add-rescheduleleave.dart b/lib/screens/reschedule-leaves/add-rescheduleleave.dart index f6e1b8d7..db8a0140 100644 --- a/lib/screens/reschedule-leaves/add-rescheduleleave.dart +++ b/lib/screens/reschedule-leaves/add-rescheduleleave.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/core/service/AnalyticsService.dart'; import 'package:doctor_app_flutter/core/viewModel/leave_rechdule_response.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; @@ -62,7 +63,7 @@ class AddRescheduleLeavScreen extends StatelessWidget { : item.status == 2 ? HexColor('#CC9B14') : item.status == 9 - ? Colors.green + ? AppGlobal.appGreenColor : Colors.red, width: 5.0, ))), @@ -89,7 +90,7 @@ class AddRescheduleLeavScreen extends StatelessWidget { : item.status == 2 ? HexColor('#CC9B14') : item.status == 9 - ? Colors.green + ? AppGlobal.appGreenColor : Colors.red, fontSize: 14, ), @@ -174,7 +175,7 @@ class AddRescheduleLeavScreen extends StatelessWidget { (item.status == 2) ? IconButton( icon: Image.asset('assets/images/edit.png'), - // color: Colors.green, //Colors.black, + // color: AppGlobal.appGreenColor, //Colors.black, onPressed: () => {openLeave(context, true, extendedData: item)}, ) : SizedBox(), diff --git a/lib/util/dr_app_toast_msg.dart b/lib/util/dr_app_toast_msg.dart index 1f2ebe8f..76950ae5 100644 --- a/lib/util/dr_app_toast_msg.dart +++ b/lib/util/dr_app_toast_msg.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:flutter/material.dart'; import 'package:flutter_flexible_toast/flutter_flexible_toast.dart'; @@ -13,7 +14,7 @@ class DrAppToastMsg { FlutterFlexibleToast.showToast( message: msg, toastLength: Toast.LENGTH_SHORT, - backgroundColor: Colors.green, + backgroundColor: AppGlobal.appGreenColor, icon: ICON.SUCCESS, fontSize: 16, imageSize: 35, diff --git a/lib/util/helpers.dart b/lib/util/helpers.dart index 169ad81c..368a4c94 100644 --- a/lib/util/helpers.dart +++ b/lib/util/helpers.dart @@ -49,7 +49,7 @@ class Helpers { onPressed: okFunction, title: TranslationBase.of(context).noteConfirm, fontColor: Colors.white, - color: Colors.green[600], + color: AppGlobal.appGreenColor, ), AppButton( onPressed: () { diff --git a/lib/widgets/doctor/my_schedule_widget.dart b/lib/widgets/doctor/my_schedule_widget.dart index 54df8cd9..5c21f9ad 100644 --- a/lib/widgets/doctor/my_schedule_widget.dart +++ b/lib/widgets/doctor/my_schedule_widget.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/models/doctor/list_doctor_working_hours_table_model.dart'; @@ -52,7 +53,7 @@ class MyScheduleWidget extends StatelessWidget { width: MediaQuery.of(context).size.width * 0.55, child: CardWithBgWidget( bgColor: AppDateUtils.isToday(workingHoursTable.date) - ? Colors.green[500] + ? AppGlobal.appGreenColor : Colors.transparent, // hasBorder: false, widget: Container( @@ -64,7 +65,7 @@ class MyScheduleWidget extends StatelessWidget { "Today", fontSize: 1.8 * SizeConfig.textMultiplier, fontFamily: 'Poppins', - color: Colors.green[500], + color: AppGlobal.appGreenColor, // fontSize: 18 ), SizedBox( diff --git a/lib/widgets/patients/patient-referral-item-widget.dart b/lib/widgets/patients/patient-referral-item-widget.dart index ff1cb256..3d49c1e1 100644 --- a/lib/widgets/patients/patient-referral-item-widget.dart +++ b/lib/widgets/patients/patient-referral-item-widget.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; @@ -61,9 +62,9 @@ class PatientReferralItemWidget extends StatelessWidget { bgColor: referralStatusCode == 1 ? Color(0xffc4aa54) : referralStatusCode == 2 - ? Colors.green[700] + ? AppGlobal.appGreenColor : referralStatusCode == 46 - ? Colors.green[900] + ? AppGlobal.appGreenColor : referralStatusCode == 4 ? Colors.red[700] : Colors.red[900], @@ -85,9 +86,9 @@ class PatientReferralItemWidget extends StatelessWidget { color: referralStatusCode == 1 ? Color(0xffc4aa54) : referralStatusCode == 2 - ? Colors.green[700] + ? AppGlobal.appGreenColor : referralStatusCode == 46 - ? Colors.green[900] + ? AppGlobal.appGreenColor : referralStatusCode == 4 ? Colors.red[700] : Colors.red[900], diff --git a/lib/widgets/patients/patient_card/PatientCard.dart b/lib/widgets/patients/patient_card/PatientCard.dart index ea3a0940..5354bb5e 100644 --- a/lib/widgets/patients/patient_card/PatientCard.dart +++ b/lib/widgets/patients/patient_card/PatientCard.dart @@ -1,4 +1,6 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/util/date-utils.dart'; @@ -10,6 +12,8 @@ import 'package:doctor_app_flutter/widgets/shared/user-guid/CusomRow.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:cached_network_image/cached_network_image.dart'; +import 'package:hexcolor/hexcolor.dart'; +import 'package:provider/provider.dart'; import '../../../util/extenstions.dart'; import 'ShowTimer.dart'; @@ -38,6 +42,7 @@ class PatientCard extends StatelessWidget { @override Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); String nationalityName = patientInfo.nationalityName != null ? patientInfo.nationalityName.trim() : patientInfo.nationality != null @@ -50,10 +55,19 @@ class PatientCard extends StatelessWidget { return Container( width: SizeConfig.screenWidth * 0.9, margin: EdgeInsets.all(6), - padding: EdgeInsets.only(left: 0, right: 5, bottom: 0, top: 0), + padding: EdgeInsets.only(left: projectViewModel.isArabic?5:0, right: projectViewModel.isArabic?0:5, bottom: 0, top: 0), decoration: BoxDecoration( borderRadius: BorderRadius.circular(10), color: Colors.white, + shape: BoxShape.rectangle, + boxShadow: [ + BoxShadow( + color: Color(0x0000000D), + spreadRadius: 10, + blurRadius: 2.7, + offset: Offset(0, -3 ), // changes position of shadow + ), + ], ), child: CardWithBgWidget( padding: 0, @@ -63,18 +77,21 @@ class PatientCard extends StatelessWidget { bgColor: isFromLiveCare ? Colors.white : (isMyPatient && !isFromSearch) - ? Colors.green[500] + ? AppGlobal.appGreenColor : patientInfo.patientStatusType == 43 - ? Colors.green[500] + ? AppGlobal.appGreenColor : isMyPatient - ? Colors.green[500] + ? AppGlobal.appGreenColor : isInpatient ? Colors.white : !isFromSearch ? Colors.red[800] : Colors.white, widget: Container( - color: Colors.white, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10), + color: Colors.white, + ), // padding: EdgeInsets.only(left: 10, right: 0, bottom: 0), child: InkWell( child: Column( @@ -94,7 +111,7 @@ class PatientCard extends StatelessWidget { AppText( TranslationBase.of(context) .arrivedP, - color: Colors.green, + color: AppGlobal.appGreenColor, fontWeight: FontWeight.bold, fontFamily: 'Poppins', fontSize: 10, @@ -117,7 +134,7 @@ class PatientCard extends StatelessWidget { ? 'Confirmed' : 'Booked', color: patientInfo.status == 2 - ? Colors.green + ? AppGlobal.appGreenColor : Colors.grey, fontWeight: FontWeight.bold, fontFamily: 'Poppins', @@ -154,7 +171,7 @@ class PatientCard extends StatelessWidget { ? 'Confirmed' : 'Booked', color: patientInfo.status == 2 - ? Colors.green + ? AppGlobal.appGreenColor : Colors.grey, fontWeight: FontWeight.bold, fontFamily: 'Poppins', @@ -196,7 +213,7 @@ class PatientCard extends StatelessWidget { color: patientInfo.status == 2 ? Colors.grey - : Colors.green, + : AppGlobal.appGreenColor, fontWeight: FontWeight.bold, fontFamily: 'Poppins', fontSize: 12, @@ -249,7 +266,7 @@ class PatientCard extends StatelessWidget { ), AppText( 'My Patient', - color: Colors.green, + color: AppGlobal.appGreenColor, fontWeight: FontWeight.bold, fontFamily: 'Poppins', fontSize: 12, diff --git a/lib/widgets/patients/profile/patient-profile-app-bar.dart b/lib/widgets/patients/profile/patient-profile-app-bar.dart index 174da04d..1bd9c50d 100644 --- a/lib/widgets/patients/profile/patient-profile-app-bar.dart +++ b/lib/widgets/patients/profile/patient-profile-app-bar.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; @@ -157,7 +158,7 @@ class PatientProfileAppBar extends StatelessWidget with PreferredSizeWidget { patient.patientStatusType == 43 ? AppText( TranslationBase.of(context).arrivedP, - color: Colors.green, + color: AppGlobal.appGreenColor, fontWeight: FontWeight.bold, fontFamily: 'Poppins', fontSize: SizeConfig diff --git a/lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart b/lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart index f0678e22..46b8ed7f 100644 --- a/lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart +++ b/lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart @@ -162,7 +162,7 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget patient.patientStatusType == 43 ? AppText( TranslationBase.of(context).arrivedP, - color: Colors.green, + color: AppGlobal.appGreenColor, fontWeight: FontWeight.bold, fontFamily: 'Poppins', fontSize: 12, @@ -356,7 +356,7 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget return BoxDecoration( border: Border( top: BorderSide( - color: Colors.green, + color: AppGlobal.appGreenColor, width: 5, ), ), diff --git a/lib/widgets/shared/card_with_bg_widget.dart b/lib/widgets/shared/card_with_bg_widget.dart index c8e187a1..e36b84a4 100644 --- a/lib/widgets/shared/card_with_bg_widget.dart +++ b/lib/widgets/shared/card_with_bg_widget.dart @@ -2,7 +2,6 @@ import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; - class CardWithBgWidget extends StatelessWidget { final Widget widget; final Color bgColor; @@ -12,7 +11,12 @@ class CardWithBgWidget extends StatelessWidget { final double marginSymmetric; CardWithBgWidget( - {@required this.widget, this.bgColor, this.hasBorder = true, this.padding = 15.0, this.marginLeft = 10.0, this.marginSymmetric=10.0}); + {@required this.widget, + this.bgColor, + this.hasBorder = true, + this.padding = 15.0, + this.marginLeft = 10.0, + this.marginSymmetric = 10.0}); @override Widget build(BuildContext context) { @@ -27,6 +31,7 @@ class CardWithBgWidget extends StatelessWidget { border: Border.all( color: hasBorder ? Color(0xFF707070) : Colors.transparent, width: hasBorder ? 0.30 : 0), + ), child: Material( borderRadius: BorderRadius.all(Radius.circular(10.0)), @@ -34,12 +39,14 @@ class CardWithBgWidget extends StatelessWidget { children: [ if (projectProvider.isArabic) Positioned( - child: Container( + child: Container( decoration: BoxDecoration( color: bgColor ?? Color(0xFF58434F), borderRadius: BorderRadius.only( topRight: Radius.circular(10), - bottomRight: Radius.circular(10),),), + bottomRight: Radius.circular(10), + ), + ), width: 10, ), bottom: 1, @@ -50,10 +57,12 @@ class CardWithBgWidget extends StatelessWidget { Positioned( child: Container( decoration: BoxDecoration( - color: bgColor ?? Color(0xFF58434F), - borderRadius: BorderRadius.only( - topLeft: Radius.circular(10), - bottomLeft: Radius.circular(10),),), + color: bgColor ?? Color(0xFF58434F), + borderRadius: BorderRadius.only( + topLeft: Radius.circular(10), + bottomLeft: Radius.circular(10), + ), + ), width: 7, ), bottom: 1,