Merge branch 'Dec_fixes' into 'development'

change the green color

See merge request Cloud_Solution/doctor_app_flutter!914
merge-requests/915/merge
Elham Ali 4 years ago
commit 4760d4ae50

@ -400,7 +400,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos; SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos; SUPPORTED_PLATFORMS = iphoneos;
@ -485,7 +485,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = YES; MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos; SDKROOT = iphoneos;
@ -534,7 +534,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos; SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos; SUPPORTED_PLATFORMS = iphoneos;

@ -456,4 +456,5 @@ const TIMER_MIN = 10;
class AppGlobal { class AppGlobal {
static var CONTEX; static var CONTEX;
static Color appPrimaryColor = Color(0xFFB9382C); static Color appPrimaryColor = Color(0xFFB9382C);
static Color appGreenColor = Color(0xFF359846);
} }

@ -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/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/viewModel/doctor_replay_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/doctor_replay_view_model.dart';
@ -370,7 +371,7 @@ class _DoctorReplayChatState extends State<DoctorReplayChat> {
child: Center( child: Center(
child: AppButton( child: AppButton(
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
color: Colors.green[600], color: AppGlobal.appGreenColor,
title: "Update Your Answer", //TranslationBase.of(context).close, title: "Update Your Answer", //TranslationBase.of(context).close,
onPressed: () { onPressed: () {
setState(() { setState(() {
@ -400,7 +401,7 @@ class _DoctorReplayChatState extends State<DoctorReplayChat> {
fontSize: 13.5, fontSize: 13.5,
suffixIcon: FontAwesomeIcons.arrowRight, suffixIcon: FontAwesomeIcons.arrowRight,
suffixIconColor: Colors.green, suffixIconColor: AppGlobal.appGreenColor,
onSuffixTap: ()async { onSuffixTap: ()async {
if(msgController.text.isEmpty){ if(msgController.text.isEmpty){

@ -37,7 +37,7 @@ class _DoctorReplyWidgetState extends State<DoctorReplyWidget> {
? IN_PROGRESS_COLOR ? IN_PROGRESS_COLOR
: widget.reply.infoStatus == 3 : widget.reply.infoStatus == 3
? Color(0xFFD02127) ? Color(0xFFD02127)
: Colors.green[600], : AppGlobal.appGreenColor,
hasBorder: false, hasBorder: false,
widget: Container( widget: Container(
child: InkWell( child: InkWell(
@ -77,7 +77,7 @@ class _DoctorReplyWidgetState extends State<DoctorReplyWidget> {
? IN_PROGRESS_COLOR ? IN_PROGRESS_COLOR
: widget.reply.infoStatus == 3 : widget.reply.infoStatus == 3
? Color(0xFFD02127) ? Color(0xFFD02127)
: Colors.green[600], : AppGlobal.appGreenColor,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: 1.8 * SizeConfig.textMultiplier)), fontSize: 1.8 * SizeConfig.textMultiplier)),

@ -63,7 +63,7 @@ class _EndCallScreenState extends State<EndCallScreen> {
PatientProfileCardModel(TranslationBase.of(context).resume, PatientProfileCardModel(TranslationBase.of(context).resume,
TranslationBase.of(context).theCall, '', 'patient/vital_signs.png', TranslationBase.of(context).theCall, '', 'patient/vital_signs.png',
isInPatient: isInpatient, isInPatient: isInpatient,
color: Colors.green[800], color: AppGlobal.appGreenColor,
onTap: () async { onTap: () async {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
await liveCareModel await liveCareModel
@ -347,7 +347,7 @@ class _EndCallScreenState extends State<EndCallScreen> {
}, },
title: TranslationBase.of(context).noteConfirm, title: TranslationBase.of(context).noteConfirm,
fontColor: Colors.white, fontColor: Colors.white,
color: Colors.green[600], color: AppGlobal.appGreenColor,
), ),
AppButton( AppButton(
onPressed: () { onPressed: () {

@ -159,7 +159,7 @@ class _LiveCarePatientScreenState extends State<LiveCarePatientScreen> {
)), )),
// AppButton( // AppButton(
// fontWeight: FontWeight.w700, // fontWeight: FontWeight.w700,
// color:Colors.green[600], // color:AppGlobal.appGreenColor[600],
// title: TranslationBase.of(context).initiateCall, // title: TranslationBase.of(context).initiateCall,
// disabled: model.state == ViewState.BusyLocal, // disabled: model.state == ViewState.BusyLocal,
// onPressed: () async { // onPressed: () async {

@ -1,5 +1,6 @@
import 'dart:async'; 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/config/shared_pref_kay.dart';
import 'package:doctor_app_flutter/core/viewModel/LiveCarePatientViewModel.dart'; import 'package:doctor_app_flutter/core/viewModel/LiveCarePatientViewModel.dart';
import 'package:doctor_app_flutter/core/viewModel/livecare_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/livecare_view_model.dart';
@ -242,7 +243,7 @@ class _VideoCallPageState extends State<VideoCallPage> {
onPressed: () => {resumeCall()}, onPressed: () => {resumeCall()},
child: child:
Text(TranslationBase.of(context).resumecall), Text(TranslationBase.of(context).resumecall),
color: Colors.green[900], color: AppGlobal.appGreenColor,
textColor: Colors.white, textColor: Colors.white,
), ),
), ),

@ -295,7 +295,7 @@ class _AddPatientSickLeaveScreenState extends State<AddPatientSickLeaveScreen> {
child: AppButton( child: AppButton(
title: TranslationBase.of(context) title: TranslationBase.of(context)
.addSickLeaverequest, .addSickLeaverequest,
color: Colors.green, color: AppGlobal.appGreenColor,
onPressed: () async { onPressed: () async {
submitForm(model); submitForm(model);
}), }),

@ -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/config/size_config.dart';
import 'package:doctor_app_flutter/core/model/referral/DischargeReferralPatient.dart'; import 'package:doctor_app_flutter/core/model/referral/DischargeReferralPatient.dart';
import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.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: referredPatient.referralStatus == 1
? Color(0xffc4aa54) ? Color(0xffc4aa54)
: referredPatient.referralStatus == 46 : referredPatient.referralStatus == 46
? Colors.green[700] ? AppGlobal.appGreenColor
: Colors.red[700], : Colors.red[700],
), ),
AppText( AppText(

@ -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/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart';
@ -522,7 +523,7 @@ class ProceduresWidget extends StatelessWidget {
AppText( AppText(
"${procedure.isCovered}", "${procedure.isCovered}",
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
color: procedure.isCovered ? Colors.green : Colors.red, color: procedure.isCovered ? AppGlobal.appGreenColor : Colors.red,
fontSize: SizeConfig.textMultiplier * 2.0, fontSize: SizeConfig.textMultiplier * 2.0,
), ),
SizedBox( SizedBox(

@ -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/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/service/AnalyticsService.dart'; import 'package:doctor_app_flutter/core/service/AnalyticsService.dart';
@ -135,7 +136,7 @@ class _MedicalReportPageState extends State<MedicalReportPage> {
margin: EdgeInsets.symmetric(horizontal: 8), margin: EdgeInsets.symmetric(horizontal: 8),
child: CardWithBgWidget( child: CardWithBgWidget(
hasBorder: false, 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( widget: Column(
children: [ children: [
Row( Row(
@ -150,7 +151,7 @@ class _MedicalReportPageState extends State<MedicalReportPage> {
: TranslationBase.of(context).verified, : TranslationBase.of(context).verified,
color: model.medicalReportList[index].status == 1 color: model.medicalReportList[index].status == 1
? Color(0xFFCC9B14) ? Color(0xFFCC9B14)
: Colors.green[700], : AppGlobal.appGreenColor,
fontSize: 1.4 * SizeConfig.textMultiplier, fontSize: 1.4 * SizeConfig.textMultiplier,
bold: true, bold: true,
), ),

@ -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/shared_pref_kay.dart';
import 'package:doctor_app_flutter/core/model/note/note_model.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/model/note/update_note_model.dart';
@ -147,7 +148,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
: model.patientProgressNoteList[index] : model.patientProgressNoteList[index]
.status == .status ==
2 2
? Colors.green[600] ? AppGlobal.appGreenColor
: Color(0xFFCC9B14), : Color(0xFFCC9B14),
widget: Column( widget: Column(
children: [ children: [
@ -196,7 +197,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
TranslationBase.of(context) TranslationBase.of(context)
.noteVerified, .noteVerified,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Colors.green[600], color: AppGlobal.appGreenColor,
fontSize: 12, fontSize: 12,
), ),
if (model.patientProgressNoteList[index].status != 2 && if (model.patientProgressNoteList[index].status != 2 &&
@ -318,7 +319,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
}, },
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.green[600], color: AppGlobal.appGreenColor,
borderRadius: borderRadius:
BorderRadius.circular( BorderRadius.circular(
10), 10),

@ -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/note_model.dart';
import 'package:doctor_app_flutter/core/model/note/update_note_model.dart'; import 'package:doctor_app_flutter/core/model/note/update_note_model.dart';
import 'package:doctor_app_flutter/core/service/AnalyticsService.dart'; import 'package:doctor_app_flutter/core/service/AnalyticsService.dart';
@ -320,7 +321,7 @@ class _ProgressNoteState extends State<OperationReportScreen> {
}, },
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.green[600], color: AppGlobal.appGreenColor,
borderRadius: borderRadius:
BorderRadius.circular(10), BorderRadius.circular(10),
), ),

@ -1,5 +1,6 @@
import 'dart:async'; 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/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/service/AnalyticsService.dart'; import 'package:doctor_app_flutter/core/service/AnalyticsService.dart';
import 'package:doctor_app_flutter/core/service/VideoCallService.dart'; import 'package:doctor_app_flutter/core/service/VideoCallService.dart';
@ -334,7 +335,7 @@ class _PatientProfileScreenState extends State<PatientProfileScreen>
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
color: isCallFinished color: isCallFinished
? Colors.red[600] ? Colors.red[600]
: Colors.green[600], : AppGlobal.appGreenColor,
title: isCallFinished title: isCallFinished
? TranslationBase.of(context).endCall ? TranslationBase.of(context).endCall
: TranslationBase.of(context).initiateCall, : TranslationBase.of(context).initiateCall,

@ -198,7 +198,7 @@ class _AddReplayOnReferralPatientState extends State<AddReplayOnReferralPatient>
}, },
title: TranslationBase.of(context).noteConfirm, title: TranslationBase.of(context).noteConfirm,
fontColor: Colors.white, fontColor: Colors.white,
color: Colors.green[600], color: AppGlobal.appGreenColor,
), ),
), ),
], ],

@ -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/config/size_config.dart';
import 'package:doctor_app_flutter/core/model/referral/MyReferralPatientModel.dart'; import 'package:doctor_app_flutter/core/model/referral/MyReferralPatientModel.dart';
import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart';
@ -105,7 +106,7 @@ class _ReplySummeryOnReferralPatientState
onPressed: () {}, onPressed: () {},
title: TranslationBase.of(context).noteConfirm, title: TranslationBase.of(context).noteConfirm,
fontColor: Colors.white, fontColor: Colors.white,
color: Colors.green[600], color: AppGlobal.appGreenColor,
), ),
), ),
], ],

@ -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/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/model/referral/MyReferralPatientModel.dart'; import 'package:doctor_app_flutter/core/model/referral/MyReferralPatientModel.dart';
@ -105,7 +106,7 @@ class MyReferralDetailScreen extends StatelessWidget {
color: referralPatient.referralStatus == 1 color: referralPatient.referralStatus == 1
? Color(0xffc4aa54) ? Color(0xffc4aa54)
: referralPatient.referralStatus == 46 || referralPatient.referralStatus == 2 : referralPatient.referralStatus == 46 || referralPatient.referralStatus == 2
? Colors.green[700] ? AppGlobal.appGreenColor
: Colors.red[700], : Colors.red[700],
), ),
AppText( AppText(

@ -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/config/size_config.dart';
import 'package:doctor_app_flutter/core/model/referral/MyReferralPatientModel.dart'; import 'package:doctor_app_flutter/core/model/referral/MyReferralPatientModel.dart';
import 'package:doctor_app_flutter/core/service/AnalyticsService.dart'; import 'package:doctor_app_flutter/core/service/AnalyticsService.dart';
@ -146,7 +147,7 @@ class ReferralPatientDetailScreen extends StatelessWidget {
color: referredPatient.referralStatus == 1 color: referredPatient.referralStatus == 1
? Color(0xffc4aa54) ? Color(0xffc4aa54)
: referredPatient.referralStatus == 46 || referredPatient.referralStatus == 2 : referredPatient.referralStatus == 46 || referredPatient.referralStatus == 2
? Colors.green[700] ? AppGlobal.appGreenColor
: Colors.red[700], : Colors.red[700],
), ),
AppText( AppText(

@ -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/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/PatientType.dart'; import 'package:doctor_app_flutter/core/enum/PatientType.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart';
@ -157,7 +158,7 @@ class ReferredPatientDetailScreen extends StatelessWidget {
color: referredPatient.referralStatus == 1 color: referredPatient.referralStatus == 1
? Color(0xffc4aa54) ? Color(0xffc4aa54)
: referredPatient.referralStatus == 46 : referredPatient.referralStatus == 46
? Colors.green[700] ? AppGlobal.appGreenColor
: Colors.red[700], : Colors.red[700],
), ),
AppText( AppText(

@ -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/config/size_config.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/models/SOAP/selected_items/my_selected_examination.dart'; import 'package:doctor_app_flutter/models/SOAP/selected_items/my_selected_examination.dart';
@ -59,7 +60,7 @@ class ExaminationItemCard extends StatelessWidget {
? examination.isAbnormal ? examination.isAbnormal
? Colors.red.shade800 ? Colors.red.shade800
: Colors.grey.shade800 : Colors.grey.shade800
: Colors.green.shade800, : AppGlobal.appGreenColor,
fontSize: SizeConfig.textMultiplier * 1.8, fontSize: SizeConfig.textMultiplier * 1.8,
), ),
if (!examination.notExamined) if (!examination.notExamined)

@ -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/shared_pref_kay.dart';
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart';
@ -167,7 +168,7 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage>
"Verified", "Verified",
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontFamily: 'Poppins', fontFamily: 'Poppins',
color: Colors.green, color: AppGlobal.appGreenColor,
), ),
], ],
), ),

@ -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/service/AnalyticsService.dart';
import 'package:doctor_app_flutter/core/viewModel/leave_rechdule_response.dart'; import 'package:doctor_app_flutter/core/viewModel/leave_rechdule_response.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
@ -62,7 +63,7 @@ class AddRescheduleLeavScreen extends StatelessWidget {
: item.status == 2 : item.status == 2
? HexColor('#CC9B14') ? HexColor('#CC9B14')
: item.status == 9 : item.status == 9
? Colors.green ? AppGlobal.appGreenColor
: Colors.red, : Colors.red,
width: 5.0, width: 5.0,
))), ))),
@ -89,7 +90,7 @@ class AddRescheduleLeavScreen extends StatelessWidget {
: item.status == 2 : item.status == 2
? HexColor('#CC9B14') ? HexColor('#CC9B14')
: item.status == 9 : item.status == 9
? Colors.green ? AppGlobal.appGreenColor
: Colors.red, : Colors.red,
fontSize: 14, fontSize: 14,
), ),
@ -174,7 +175,7 @@ class AddRescheduleLeavScreen extends StatelessWidget {
(item.status == 2) (item.status == 2)
? IconButton( ? IconButton(
icon: Image.asset('assets/images/edit.png'), icon: Image.asset('assets/images/edit.png'),
// color: Colors.green, //Colors.black, // color: AppGlobal.appGreenColor, //Colors.black,
onPressed: () => {openLeave(context, true, extendedData: item)}, onPressed: () => {openLeave(context, true, extendedData: item)},
) )
: SizedBox(), : SizedBox(),

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/config/config.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_flexible_toast/flutter_flexible_toast.dart'; import 'package:flutter_flexible_toast/flutter_flexible_toast.dart';
@ -13,7 +14,7 @@ class DrAppToastMsg {
FlutterFlexibleToast.showToast( FlutterFlexibleToast.showToast(
message: msg, message: msg,
toastLength: Toast.LENGTH_SHORT, toastLength: Toast.LENGTH_SHORT,
backgroundColor: Colors.green, backgroundColor: AppGlobal.appGreenColor,
icon: ICON.SUCCESS, icon: ICON.SUCCESS,
fontSize: 16, fontSize: 16,
imageSize: 35, imageSize: 35,

@ -49,7 +49,7 @@ class Helpers {
onPressed: okFunction, onPressed: okFunction,
title: TranslationBase.of(context).noteConfirm, title: TranslationBase.of(context).noteConfirm,
fontColor: Colors.white, fontColor: Colors.white,
color: Colors.green[600], color: AppGlobal.appGreenColor,
), ),
AppButton( AppButton(
onPressed: () { onPressed: () {

@ -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/config/size_config.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/models/doctor/list_doctor_working_hours_table_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, width: MediaQuery.of(context).size.width * 0.55,
child: CardWithBgWidget( child: CardWithBgWidget(
bgColor: AppDateUtils.isToday(workingHoursTable.date) bgColor: AppDateUtils.isToday(workingHoursTable.date)
? Colors.green[500] ? AppGlobal.appGreenColor
: Colors.transparent, : Colors.transparent,
// hasBorder: false, // hasBorder: false,
widget: Container( widget: Container(
@ -64,7 +65,7 @@ class MyScheduleWidget extends StatelessWidget {
"Today", "Today",
fontSize: 1.8 * SizeConfig.textMultiplier, fontSize: 1.8 * SizeConfig.textMultiplier,
fontFamily: 'Poppins', fontFamily: 'Poppins',
color: Colors.green[500], color: AppGlobal.appGreenColor,
// fontSize: 18 // fontSize: 18
), ),
SizedBox( SizedBox(

@ -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/config/size_config.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
@ -61,9 +62,9 @@ class PatientReferralItemWidget extends StatelessWidget {
bgColor: referralStatusCode == 1 bgColor: referralStatusCode == 1
? Color(0xffc4aa54) ? Color(0xffc4aa54)
: referralStatusCode == 2 : referralStatusCode == 2
? Colors.green[700] ? AppGlobal.appGreenColor
: referralStatusCode == 46 : referralStatusCode == 46
? Colors.green[900] ? AppGlobal.appGreenColor
: referralStatusCode == 4 : referralStatusCode == 4
? Colors.red[700] ? Colors.red[700]
: Colors.red[900], : Colors.red[900],
@ -85,9 +86,9 @@ class PatientReferralItemWidget extends StatelessWidget {
color: referralStatusCode == 1 color: referralStatusCode == 1
? Color(0xffc4aa54) ? Color(0xffc4aa54)
: referralStatusCode == 2 : referralStatusCode == 2
? Colors.green[700] ? AppGlobal.appGreenColor
: referralStatusCode == 46 : referralStatusCode == 46
? Colors.green[900] ? AppGlobal.appGreenColor
: referralStatusCode == 4 : referralStatusCode == 4
? Colors.red[700] ? Colors.red[700]
: Colors.red[900], : Colors.red[900],

@ -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/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/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/util/date-utils.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/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:cached_network_image/cached_network_image.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 '../../../util/extenstions.dart';
import 'ShowTimer.dart'; import 'ShowTimer.dart';
@ -38,6 +42,7 @@ class PatientCard extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
String nationalityName = patientInfo.nationalityName != null String nationalityName = patientInfo.nationalityName != null
? patientInfo.nationalityName.trim() ? patientInfo.nationalityName.trim()
: patientInfo.nationality != null : patientInfo.nationality != null
@ -50,10 +55,19 @@ class PatientCard extends StatelessWidget {
return Container( return Container(
width: SizeConfig.screenWidth * 0.9, width: SizeConfig.screenWidth * 0.9,
margin: EdgeInsets.all(6), 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( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
color: Colors.white, 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( child: CardWithBgWidget(
padding: 0, padding: 0,
@ -63,18 +77,21 @@ class PatientCard extends StatelessWidget {
bgColor: isFromLiveCare bgColor: isFromLiveCare
? Colors.white ? Colors.white
: (isMyPatient && !isFromSearch) : (isMyPatient && !isFromSearch)
? Colors.green[500] ? AppGlobal.appGreenColor
: patientInfo.patientStatusType == 43 : patientInfo.patientStatusType == 43
? Colors.green[500] ? AppGlobal.appGreenColor
: isMyPatient : isMyPatient
? Colors.green[500] ? AppGlobal.appGreenColor
: isInpatient : isInpatient
? Colors.white ? Colors.white
: !isFromSearch : !isFromSearch
? Colors.red[800] ? Colors.red[800]
: Colors.white, : Colors.white,
widget: Container( widget: Container(
color: Colors.white, decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
color: Colors.white,
),
// padding: EdgeInsets.only(left: 10, right: 0, bottom: 0), // padding: EdgeInsets.only(left: 10, right: 0, bottom: 0),
child: InkWell( child: InkWell(
child: Column( child: Column(
@ -94,7 +111,7 @@ class PatientCard extends StatelessWidget {
AppText( AppText(
TranslationBase.of(context) TranslationBase.of(context)
.arrivedP, .arrivedP,
color: Colors.green, color: AppGlobal.appGreenColor,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: 10, fontSize: 10,
@ -117,7 +134,7 @@ class PatientCard extends StatelessWidget {
? 'Confirmed' ? 'Confirmed'
: 'Booked', : 'Booked',
color: patientInfo.status == 2 color: patientInfo.status == 2
? Colors.green ? AppGlobal.appGreenColor
: Colors.grey, : Colors.grey,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontFamily: 'Poppins', fontFamily: 'Poppins',
@ -154,7 +171,7 @@ class PatientCard extends StatelessWidget {
? 'Confirmed' ? 'Confirmed'
: 'Booked', : 'Booked',
color: patientInfo.status == 2 color: patientInfo.status == 2
? Colors.green ? AppGlobal.appGreenColor
: Colors.grey, : Colors.grey,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontFamily: 'Poppins', fontFamily: 'Poppins',
@ -196,7 +213,7 @@ class PatientCard extends StatelessWidget {
color: color:
patientInfo.status == 2 patientInfo.status == 2
? Colors.grey ? Colors.grey
: Colors.green, : AppGlobal.appGreenColor,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: 12, fontSize: 12,
@ -249,7 +266,7 @@ class PatientCard extends StatelessWidget {
), ),
AppText( AppText(
'My Patient', 'My Patient',
color: Colors.green, color: AppGlobal.appGreenColor,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: 12, fontSize: 12,

@ -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/config/size_config.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.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 patient.patientStatusType == 43
? AppText( ? AppText(
TranslationBase.of(context).arrivedP, TranslationBase.of(context).arrivedP,
color: Colors.green, color: AppGlobal.appGreenColor,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: SizeConfig fontSize: SizeConfig

@ -162,7 +162,7 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget
patient.patientStatusType == 43 patient.patientStatusType == 43
? AppText( ? AppText(
TranslationBase.of(context).arrivedP, TranslationBase.of(context).arrivedP,
color: Colors.green, color: AppGlobal.appGreenColor,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: 12, fontSize: 12,
@ -356,7 +356,7 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget
return BoxDecoration( return BoxDecoration(
border: Border( border: Border(
top: BorderSide( top: BorderSide(
color: Colors.green, color: AppGlobal.appGreenColor,
width: 5, width: 5,
), ),
), ),

@ -2,7 +2,6 @@ import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class CardWithBgWidget extends StatelessWidget { class CardWithBgWidget extends StatelessWidget {
final Widget widget; final Widget widget;
final Color bgColor; final Color bgColor;
@ -12,7 +11,12 @@ class CardWithBgWidget extends StatelessWidget {
final double marginSymmetric; final double marginSymmetric;
CardWithBgWidget( 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 @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -27,6 +31,7 @@ class CardWithBgWidget extends StatelessWidget {
border: Border.all( border: Border.all(
color: hasBorder ? Color(0xFF707070) : Colors.transparent, color: hasBorder ? Color(0xFF707070) : Colors.transparent,
width: hasBorder ? 0.30 : 0), width: hasBorder ? 0.30 : 0),
), ),
child: Material( child: Material(
borderRadius: BorderRadius.all(Radius.circular(10.0)), borderRadius: BorderRadius.all(Radius.circular(10.0)),
@ -34,12 +39,14 @@ class CardWithBgWidget extends StatelessWidget {
children: [ children: [
if (projectProvider.isArabic) if (projectProvider.isArabic)
Positioned( Positioned(
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: bgColor ?? Color(0xFF58434F), color: bgColor ?? Color(0xFF58434F),
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
topRight: Radius.circular(10), topRight: Radius.circular(10),
bottomRight: Radius.circular(10),),), bottomRight: Radius.circular(10),
),
),
width: 10, width: 10,
), ),
bottom: 1, bottom: 1,
@ -50,10 +57,12 @@ class CardWithBgWidget extends StatelessWidget {
Positioned( Positioned(
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: bgColor ?? Color(0xFF58434F), color: bgColor ?? Color(0xFF58434F),
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
topLeft: Radius.circular(10), topLeft: Radius.circular(10),
bottomLeft: Radius.circular(10),),), bottomLeft: Radius.circular(10),
),
),
width: 7, width: 7,
), ),
bottom: 1, bottom: 1,

Loading…
Cancel
Save