Merge remote-tracking branch 'origin/master'

# Conflicts:
#	lib/pages/login/login-type.dart
#	lib/theme/theme_value.dart
master
mobileteam 2 months ago
commit 194c7b2b9c

@ -64,7 +64,7 @@ class _ConfirmCancelOrderDialogState extends State<ConfirmCancelOrderDialog> {
fontSize: 14,
fontWeight: FontWeight.w700,
letterSpacing: -0.46,
color: Colors.red,
color: const Color(0xFF14384B),
),
),
),

@ -121,7 +121,7 @@ class _NewCMCPageState extends State<NewCMCPage> with TickerProviderStateMixin {
_color = Color(0xff359846);
} else if (status == 4 || status == 6 || status == 7) {
//cancel // Rejected
_color = Color(0xffD02127);
_color = Color(0xff14384B);
}
return Scaffold(
@ -218,7 +218,7 @@ class _NewCMCPageState extends State<NewCMCPage> with TickerProviderStateMixin {
child: Container(
padding: EdgeInsets.symmetric(vertical: 8, horizontal: 14),
decoration: BoxDecoration(
color: Color(0xffD02127),
color: Color(0xff14384B),
border: Border.all(color: Colors.white, width: 1),
borderRadius: BorderRadius.circular(10),
),
@ -238,7 +238,7 @@ class _NewCMCPageState extends State<NewCMCPage> with TickerProviderStateMixin {
],
)
: Container(
color: Colors.red,
color: const Color(0xFF14384B),
child: NewCMCStepOnePage(
changePageViewIndex: changePageViewIndex,
cMCInsertPresOrderRequestModel: cMCInsertPresOrderRequestModel,

@ -63,7 +63,7 @@ class _NewCMCStepOnePageState extends State<NewCMCStepOnePage> {
children: [
Radio(
value: num.tryParse(widget.model.cmcAllServicesList[index].serviceID!),
activeColor: Colors.red[800],
activeColor: const Color(0xFF14384B),
onChanged: (newValue) async {
selectedItem = index;
PatientERCMCInsertServicesList patientERCMCInsertServicesList = PatientERCMCInsertServicesList(

@ -261,7 +261,7 @@ class _NewCMCStepTowPageState extends State<NewCMCStepTowPage> {
Padding(
padding: const EdgeInsets.only(left: 20, right: 20, top: 14, bottom: 14),
child: SecondaryButton(
color: Colors.red[800],
color: const Color(0xFF14384B),
textColor: Colors.white,
onTap: () {
setState(() {

@ -76,7 +76,7 @@ class OrdersLogDetailsPage extends StatelessWidget {
_color = Color(0xff359846);
} else if (status == 4 || status == 6 || status == 7) {
//cancel // Rejected
_color = Color(0xffD02127);
_color = Color(0xff14384B);
}
return Container(
decoration: BoxDecoration(
@ -159,7 +159,7 @@ class OrdersLogDetailsPage extends StatelessWidget {
child: Container(
padding: EdgeInsets.symmetric(vertical: 8, horizontal: 14),
decoration: BoxDecoration(
color: Color(0xffD02127),
color: Color(0xff14384B),
border: Border.all(color: Colors.white, width: 1),
borderRadius: BorderRadius.circular(10),
),

@ -375,7 +375,7 @@ class MobileNumberTextFiled extends StatelessWidget {
flex: 1,
child: Icon(
Icons.phone,
color: Colors.red,
color: const Color(0xFF14384B),
)),
Expanded(
flex: 1,

@ -318,7 +318,7 @@ class _NewEReferralStepThreePageState extends State<NewEReferralStepThreePage> {
},
child: Icon(
Icons.close,
color: Colors.red[300],
color: const Color(0xFF14384B),
),
)
],

@ -327,7 +327,7 @@ class MobileNumberTextFiled extends StatelessWidget {
flex: 1,
child: Icon(
Icons.phone,
color: Colors.red,
color: const Color(0xFF14384B),
)),
Expanded(
flex: 1,

@ -95,7 +95,7 @@ class _SelectCityDialogState extends State<SelectCityDialog> {
child: Center(
child: Texts(
TranslationBase.of(context).cancel.toUpperCase(),
color: Colors.red,
color: const Color(0xFF14384B),
),
),
),

@ -1557,7 +1557,7 @@ class _SelectCountryDialogState extends State<SelectCountryDialog> {
child: Center(
child: Texts(
TranslationBase.of(context).cancel.toUpperCase(),
color: Colors.red,
color: const Color(0xFF14384B),
),
),
),

@ -90,7 +90,7 @@ class _SelectRelationTypeDialogState extends State<SelectRelationTypeDialog> {
child: Center(
child: Texts(
TranslationBase.of(context).cancel.toUpperCase(),
color: Colors.red,
color: const Color(0xFF14384B),
),
),
),

@ -290,7 +290,7 @@ class _EReferralConfirmSMSDialogState extends State<EReferralConfirmSMSDialog> {
width: double.maxFinite,
child: Texts(
model.error,
color: Colors.red,
color: const Color(0xFF14384B),
),
),
SizedBox(height: 20),

@ -61,7 +61,7 @@ class _ConfirmCancelOrderDialogState extends State<ConfirmCancelOrderDialog> {
child: Center(
child: Texts(
TranslationBase.of(context).cancel.toUpperCase(),
color: Colors.red,
color: const Color(0xFF14384B),
),
),
),

@ -59,7 +59,7 @@ class _NewHomeHealthCareStepOnePageState extends State<NewHomeHealthCareStepOneP
children: [
Checkbox(
value: isServiceSelected(int.parse(service.serviceID!)),
activeColor: Color(0xffD02127),
activeColor: Color(0xff14384B),
tristate: false,
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
onChanged: (bool? newValue) {

@ -214,7 +214,7 @@ class _NewHomeHealthCarePageState extends State<NewHomeHealthCarePage> with Tick
child: Container(
padding: EdgeInsets.symmetric(vertical: 8, horizontal: 14),
decoration: BoxDecoration(
color: Color(0xffD02127),
color: Color(0xff14384B),
border: Border.all(color: Colors.white, width: 1),
borderRadius: BorderRadius.circular(10),
),

@ -71,7 +71,7 @@ class OrdersLogDetailsPage extends StatelessWidget {
_color = Color(0xff359846);
} else if (status == 4 || status == 6 || status == 7) {
//cancel // Rejected
_color = Color(0xffD02127);
_color = Color(0xff14384B);
}
return Container(
decoration: BoxDecoration(
@ -154,7 +154,7 @@ class OrdersLogDetailsPage extends StatelessWidget {
child: Container(
padding: EdgeInsets.symmetric(vertical: 8, horizontal: 14),
decoration: BoxDecoration(
color: Color(0xffD02127),
color: Color(0xff14384B),
border: Border.all(color: Colors.white, width: 1),
borderRadius: BorderRadius.circular(10),
),

@ -549,7 +549,7 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails> with SingleTic
if (value.isApprovalCreated && value.approvalNo != 0) {
color = Color(0xff359846);
} else if (value.isApprovalRequired && value.isApprovalCreated && value.approvalNo == 0) {
color = Color(0xffD02127);
color = Color(0xff14384B);
} else {
color = Color(0xffCC9B14);
}

@ -77,7 +77,7 @@ class _CommonRadioButtonDialogState extends State<CommonRadioButtonDialog> {
child: TextButton(
child: Text(
TranslationBase.of(context).cancel,
style: TextStyle(color: Colors.redAccent, fontSize: 16, fontWeight: FontWeight.w500),
style: TextStyle(color: const Color(0xFF14384B), fontSize: 16, fontWeight: FontWeight.w500),
),
onPressed: () => Navigator.pop(context),
),
@ -86,7 +86,7 @@ class _CommonRadioButtonDialogState extends State<CommonRadioButtonDialog> {
child: TextButton(
child: Text(
TranslationBase.of(context).ok,
style: TextStyle(color: Colors.black87, fontSize: 16, fontWeight: FontWeight.w500),
style: TextStyle(color: const Color(0xFF14384B), fontSize: 16, fontWeight: FontWeight.w500),
),
onPressed: () => widget.onSelect(_selectedIndex),
),

@ -171,7 +171,7 @@ class _TodayPageState extends State<TodayPage> {
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w600,
color: Color(0xffD02127),
color: Color(0xff14384B),
letterSpacing: -0.56,
decoration: TextDecoration.underline,
),

@ -185,7 +185,7 @@ class ParkingPage extends StatelessWidget {
onTap: () => model.clearParking(),
child: Texts(
TranslationBase.of(context).clearMyData,
color: Colors.red,
color: const Color(0xFF14384B),
decoration: TextDecoration.underline,
))
],

@ -307,7 +307,7 @@ class RegionTitle extends StatelessWidget {
"${TranslationBase.of(context).HospitalString(num.parse(hmgCount)).replaceAll("@", hmgCount)} ,",
style: TextStyle(
fontSize: 14,
color: Color(0xFFD02127),
color: Color(0xff14384B),
fontWeight: FontWeight.w600),
),
SizedBox(
@ -358,7 +358,7 @@ class HospitalTitle extends StatelessWidget {
title,
style: TextStyle(
fontSize: 18,
color: isHMC ? Color(0xFF40ACC9) : Color(0xFFD02127),
color: isHMC ? Color(0xFF40ACC9) : Color(0xff14384B),
fontWeight: FontWeight.w600),
),
],

@ -320,7 +320,7 @@ class _LaserClinicState extends State<LaserClinic> with SingleTickerProviderStat
},
child: Container(
decoration: BoxDecoration(
color: _selectedCategoryIndex == index ? Color(0xffD02127) : Colors.white,
color: _selectedCategoryIndex == index ? Color(0xff14384B) : Colors.white,
borderRadius: BorderRadius.circular(36),
border: Border.all(
width: 1,
@ -387,7 +387,7 @@ class _LaserClinicState extends State<LaserClinic> with SingleTickerProviderStat
// _isFullBody = !_isFullBody;
// });
// },
// activeColor: Color(0xffD02127),
// activeColor: Color(0xff14384B),
// ),
// ),
// ),
@ -451,7 +451,7 @@ class _LaserClinicState extends State<LaserClinic> with SingleTickerProviderStat
margin: EdgeInsets.only(top: 5, right: 5),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15.0),
border: Border.all(color: _isSelected ? Color(0xffD02127) : Color(0xffEAEAEA), width: 2),
border: Border.all(color: _isSelected ? Color(0xff14384B) : Color(0xffEAEAEA), width: 2),
),
child: LaserBodyParts()
.getCategoryImage(isMale, (isMale ? maleLaserCategory : femaleLaserCategory)[_selectedCategoryIndex].laserCategoryID, laserBodyPartsList[index].mappingCode!),
@ -462,7 +462,7 @@ class _LaserClinicState extends State<LaserClinic> with SingleTickerProviderStat
height: 18,
child: Icon(Icons.done, color: Colors.white, size: 12),
decoration: BoxDecoration(
color: Color(0xffD02127),
color: Color(0xff14384B),
borderRadius: BorderRadius.circular(30.0),
),
),

@ -106,7 +106,7 @@ class HospitalTitle extends StatelessWidget {
style: TextStyle(
fontSize: 18,
color:
isHMC ? Color(0xFF40ACC9) : Color(0xFFD02127),
isHMC ? Color(0xFF40ACC9) : Color(0xff14384B),
fontWeight: FontWeight.w600),
),
],

@ -130,7 +130,7 @@ class HospitalBodyWidget extends StatelessWidget {
fontSize: 22,
color: isHMC
? Color(0xFF40ACC9)
: Color(0xFFD02127),
: Color(0xff14384B),
fontWeight: FontWeight.w700),
),
),

@ -116,7 +116,7 @@ class RegionTitle extends StatelessWidget {
"${TranslationBase.of(context).HospitalString(num.parse(hmgCount)).replaceAll("@", hmgCount)}",
style: TextStyle(
fontSize: 14,
color: Color(0xFFD02127),
color: Color(0xff14384B),
fontWeight: FontWeight.w600),
),
],

@ -576,7 +576,7 @@ class RegionTitle extends StatelessWidget {
"${TranslationBase.of(context).HospitalString(num.parse(hmgCount)).replaceAll("@", hmgCount)} ,",
style: TextStyle(
fontSize: 14,
color: Color(0xFFD02127),
color: Color(0xff14384B),
fontWeight: FontWeight.w600),
),
SizedBox(
@ -626,7 +626,7 @@ class HospitalTitle extends StatelessWidget {
title,
style: TextStyle(
fontSize: 18,
color: isHMC ? Color(0xFF40ACC9) : Color(0xFFD02127),
color: isHMC ? Color(0xFF40ACC9) : Color(0xff14384B),
fontWeight: FontWeight.w600),
),
],

@ -704,7 +704,7 @@ class RegionTitle extends StatelessWidget {
"${TranslationBase.of(context).HospitalString(num.parse(hmgCount)).replaceAll("@", hmgCount)} ,",
style: TextStyle(
fontSize: 14,
color: Color(0xFFD02127),
color: Color(0xff14384B),
fontWeight: FontWeight.w600),
),
SizedBox(
@ -755,7 +755,7 @@ class HospitalTitle extends StatelessWidget {
title,
style: TextStyle(
fontSize: 18,
color: isHMC ? Color(0xFF40ACC9) : Color(0xFFD02127),
color: isHMC ? Color(0xFF40ACC9) : Color(0xff14384B),
fontWeight: FontWeight.w600),
),
],

@ -178,8 +178,8 @@ class _DoctorViewState extends State<DoctorView> {
// RatingBar.readOnly(
// initialRating: this.doctor.actualDoctorRate!.toDouble(),
// size: 16.0,
// filledColor: Color(0XFFD02127),
// emptyColor: Color(0XFFD02127),
// filledColor: Color(0xff14384B),
// emptyColor: Color(0xff14384B),
// isHalfAllowed: true,
// halfFilledIcon: Icons.star_half,
// filledIcon: Icons.star,

@ -110,7 +110,7 @@ class _HospitalsLiveChatPageState extends State<HospitalsLiveChatPage> {
TranslationBase.of(context).start,
//Changed By Aamir URL
chat!.isEmpty ? null : () => {launch(chat!)},
color: Color(0xffD02127),
color: Color(0xff14384B),
textColor: chat!.isEmpty ? Color(0xff000000) : Colors.white,
disabledColor: Color(0xffEAEAEA),
),

@ -63,7 +63,7 @@ class AddFamilyMemberType extends StatelessWidget {
// TranslationBase.of(context).registerNow,
// style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white, letterSpacing: -0.48),
// ),
// color: Color(0xffD02127),
// color: Color(0xff14384B),
// shape: RoundedRectangleBorder(
// borderRadius: BorderRadius.circular(6),
// ),

@ -362,7 +362,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
padding: EdgeInsets.only(top: 3, bottom: 3, left: 8, right: 8),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(50),
color: result.status == 3 ? Color(0xff349745) : Color(0xffD02127),
color: result.status == 3 ? Color(0xff349745) : Color(0xff14384B),
),
child: Text(
result.statusDescription != null ? result.statusDescription! : "",

@ -78,7 +78,7 @@ class _AmbulanceRequestIndexPageState extends State<AmbulanceRequestIndexPage> {
_color = Color(0xff359846);
} else if (status == 4 || status == 6 || status == 7) {
//cancel // Rejected
_color = Color(0xffD02127);
_color = Color(0xff14384B);
}
}
@ -187,7 +187,7 @@ class _AmbulanceRequestIndexPageState extends State<AmbulanceRequestIndexPage> {
child: Container(
padding: EdgeInsets.symmetric(vertical: 8, horizontal: 14),
decoration: BoxDecoration(
color: Color(0xffD02127),
color: Color(0xff14384B),
border: Border.all(color: Colors.white, width: 1),
borderRadius: BorderRadius.circular(10),
),

@ -54,7 +54,7 @@ class _EdOnlineQuestionsPageState extends State<EdOnlineQuestionsPage> {
children: [
Checkbox(
value: widget.selectedQuestions!.contains(model.triageQuestionsModelList[index]),
activeColor: Color(0xffD02127),
activeColor: Color(0xff14384B),
tristate: false,
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
onChanged: (bool? newValue) {

@ -70,7 +70,7 @@ class OrderLogPage extends StatelessWidget {
_color = Color(0xff359846);
} else if (status == 4 || status == 6 || status == 7) {
//cancel // Rejected
_color = Color(0xffD02127);
_color = Color(0xff14384B);
}
return Container(
@ -170,7 +170,7 @@ class OrderLogPage extends StatelessWidget {
child: Container(
padding: EdgeInsets.symmetric(vertical: 8, horizontal: 14),
decoration: BoxDecoration(
color: Color(0xffD02127),
color: Color(0xff14384B),
border: Border.all(color: Colors.white, width: 1),
borderRadius: BorderRadius.circular(10),
),

@ -274,7 +274,7 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
TranslationBase.of(context).reviewAppointment,
goToBookConfirm,
// DocAvailableAppointments.areSlotsAvailable ? goToBookConfirm : null,
color: Color(0xFFD02127),
color: Color(0xff14384B),
disabledColor: Color(0xff28323A).withOpacity(0.3),
),
),

@ -509,7 +509,7 @@ class _MyAppointmentsState extends State<MyAppointments> with SingleTickerProvid
height: 22,
child: Radio(
value: _value,
activeColor: _value == _currentPage ? Color(0xffD02127) : Color(0xffE8E8E8),
activeColor: _value == _currentPage ? Color(0xff14384B) : Color(0xffE8E8E8),
groupValue: _currentPage,
onChanged: (index) {
setState(() {

@ -41,7 +41,7 @@ class PageViewIndicator extends StatelessWidget {
height: isActive ? 12 : 12,
width: isActive ? 12 : 12,
decoration: BoxDecoration(
color: isActive ? Color(0xffD02127) : Color(0xffD0D0D0),
color: isActive ? Color(0xff14384B) : Color(0xffD0D0D0),
borderRadius: BorderRadius.all(Radius.circular(12))),
);
}

@ -319,8 +319,8 @@ class _ToDoState extends State<ToDo> with SingleTickerProviderStateMixin {
RatingBar(
initialRating: appoList[index].actualDoctorRate.toDouble(),
itemSize: 16.0,
glowColor: Color(0XFFD02127),
unratedColor: Color(0XFFD02127),
glowColor: Color(0xff14384B),
unratedColor: Color(0xff14384B),
ignoreGestures: true,
ratingWidget: RatingWidget(
full: Icon(

@ -133,8 +133,8 @@ class _TodoListCardState extends State<TodoListCard> {
// RatingBar.readOnly(
// initialRating: 4.5,
// size: 16.0,
// filledColor: Color(0XFFD02127),
// emptyColor: Color(0XFFD02127),
// filledColor: Color(0xff14384B),
// emptyColor: Color(0xff14384B),
// isHalfAllowed: true,
// halfFilledIcon: Icons.star_half,
// filledIcon: Icons.star,

@ -299,7 +299,7 @@ class _SendFeedbackPageState extends State<SendFeedbackPage> {
},
child: Icon(
FontAwesomeIcons.trashAlt.data,
color: Colors.red[300],
color: const Color(0xFF14384B),
))
],
),
@ -345,7 +345,7 @@ class _SendFeedbackPageState extends State<SendFeedbackPage> {
});
}
},
color: Color(0xffD02127),
color: Color(0xff14384B),
textColor: Colors.white,
disabledColor: Color(0xffEAEAEA),
),

@ -241,7 +241,7 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
//MediaQuery.of(context).size.width / 2.8 : 0,
padding: EdgeInsets.all(4),
decoration: BoxDecoration(
color: Color(0xffb23838),
color: const Color(0xFF14384B),
// borderRadius: BorderRadius.only(topLeft: Radius.circular(6)
// ),
),
@ -435,7 +435,7 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
width: model.finalProducts[index].rxMessage != null ? MediaQuery.of(context).size.width / 3.70 : 0,
padding: EdgeInsets.all(4),
decoration: BoxDecoration(
color: Color(0xffb23838),
color: const Color(0xFF14384B),
//borderRadius: BorderRadius.only(topLeft: Radius.circular(5)),
),
child: model.finalProducts[index].rxMessage != null

@ -46,7 +46,7 @@ class InsuranceApprovalDetail extends StatelessWidget {
children: [
Text(
insuranceApprovalModel.approvalStatusDescption!,
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: insuranceApprovalModel.status == 9 ? Color(0xff359846) : Color(0xffD02127), letterSpacing: -0.4, height: 18 / 10),
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: insuranceApprovalModel.status == 9 ? Color(0xff359846) : Color(0xff14384B), letterSpacing: -0.4, height: 18 / 10),
),
Text(
insuranceApprovalModel.doctorName!,

@ -58,7 +58,7 @@ class _InsuranceApprovalState extends State<InsuranceApproval> {
_patientStatusColor = Color(0xff2E303A);
_patientStatusString = TranslationBase.of(context).liveCare.capitalizeFirstofEach;
} else if (!model.insuranceApproval[index].isInOutPatient!) {
_patientStatusColor = Color(0xffD02127);
_patientStatusColor = Color(0xff14384B);
_patientStatusString = TranslationBase.of(context).inPatient.capitalizeFirstofEach;
} else {
_patientStatusString = TranslationBase.of(context).outpatient.capitalizeFirstofEach;
@ -112,7 +112,7 @@ class _InsuranceApprovalState extends State<InsuranceApproval> {
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w600,
color: model.insuranceApproval[index].status == 9 ? Color(0xff359846) : Color(0xffD02127),
color: model.insuranceApproval[index].status == 9 ? Color(0xff359846) : Color(0xff14384B),
letterSpacing: -0.4,
height: 18 / 10),
),

@ -119,7 +119,7 @@ class _ForgotPassword extends State<ForgotPassword> {
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white, letterSpacing: -0.48),
),
style: TextButton.styleFrom(
backgroundColor: (mobileNo.length >= 9) == true ? Color(0xffD02127) : Color(0xff575757),
backgroundColor: (mobileNo.length >= 9) == true ? Color(0xff14384B) : Color(0xff575757),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(6),
),

@ -83,7 +83,7 @@ class LoginType extends StatelessWidget {
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white, letterSpacing: -0.48),
),
style: TextButton.styleFrom(
backgroundColor: CustomColors.accentColor,
backgroundColor: Color(0xff14384B),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(6),
),

@ -488,7 +488,7 @@ class _RegisterInfo extends State<RegisterInfo> {
// widget.changePageViewIndex!(0);
// getPatientOccupationList();
locator<GAnalytics>().loginRegistration.registration_cancel(step: page == 1 ? 'personal info' : 'other details');
}, textColor: Colors.white, color: Color(0xffD02127))),
}, textColor: Colors.white, color: Color(0xff14384B))),
),
Expanded(
child: Padding(

@ -175,7 +175,7 @@ class _Register extends State<Register> {
child: DefaultButton(TranslationBase.of(context).cancel, () {
Navigator.of(context).pop();
locator<GAnalytics>().loginRegistration.registration_cancel(step: 'enter details');
}, textColor: Colors.white, color: Color(0xffD02127))),
}, textColor: Colors.white, color: Color(0xff14384B))),
),
Expanded(
child: Padding(

@ -117,7 +117,7 @@ class _RequestTypePageState extends State<RequestTypePage> {
}
})
},
color: Color(0xffD02127),
color: Color(0xff14384B),
textColor: Colors.white,
disabledColor: Color(0xffEAEAEA),
),

@ -350,7 +350,7 @@ class _AdvancePaymentPageState extends State<AdvancePaymentPage> {
});
projectViewModel.analytics.advancePayments.wallet_payment_details();
},
color: Color(0xffD02127),
color: Color(0xff14384B),
textColor: Colors.white,
disabledColor: Color(0xffEAEAEA),
),

@ -206,7 +206,7 @@ class PrescriptionDetailsPageINP extends StatelessWidget {
return;
},
iconData: Icons.notifications_active,
color: Color(0xffD02127),
color: Color(0xff14384B),
fontSize: 13.0,
//textColor: Color(0xff2B353E),
),

@ -233,7 +233,7 @@ class _PrescriptionDetailsPageState extends State<PrescriptionDetailsPage> {
}
},
iconData: Icons.notifications_active,
color: Color(0xffD02127),
color: Color(0xff14384B),
fontSize: 13.0,
//textColor: Color(0xff2B353E),
),

@ -37,7 +37,7 @@ class PrescriptionsHistoryDetailsPage extends StatelessWidget {
_color = Color(0xff359846);
} else if (status == 4 || status == 6 || status == 7) {
//cancel // Rejected
_color = Color(0xffD02127);
_color = Color(0xff14384B);
}
return AppScaffold(
isShowAppBar: true,

@ -49,7 +49,7 @@ class PrescriptionsHistoryPage extends StatelessWidget {
_color = Color(0xff359846);
} else if (status == 4 || status == 6 || status == 7) {
//cancel // Rejected
_color = Color(0xffD02127);
_color = Color(0xff14384B);
}
return InkWell(

@ -106,7 +106,7 @@ class _InPatientMedicalReportsState extends State<InPatientMedicalReports> {
height: 22,
child: Radio(
value: _value,
activeColor: _value == _currentPage ? Color(0xffD02127) : Color(0xffE8E8E8),
activeColor: _value == _currentPage ? Color(0xff14384B) : Color(0xffE8E8E8),
groupValue: _currentPage,
onChanged: (index) {
setState(() {

@ -91,7 +91,7 @@ class _MonthlyReportsPageState extends State<MonthlyReportsPage> {
),
CustomSwitch(
value: isSummary,
activeColor: Color(0xffD02127),
activeColor: Color(0xff14384B),
inactiveColor: Color(0xff28323A).withOpacity(0.3),
onChanged: () async {
setState(() {
@ -215,7 +215,7 @@ class _MonthlyReportsPageState extends State<MonthlyReportsPage> {
isAgree = !isAgree;
});
},
activeColor: Color(0xffD02127),
activeColor: Color(0xff14384B),
),
Text(
TranslationBase.of(context).iAgreeToTheTermsAndConditions,

@ -324,7 +324,7 @@ class _HomeReportPageState extends State<HomeReportPage> with SingleTickerProvid
height: 22,
child: Radio(
value: _value,
activeColor: _value == _currentPage ? Color(0xffD02127) : Color(0xffE8E8E8),
activeColor: _value == _currentPage ? Color(0xff14384B) : Color(0xffE8E8E8),
groupValue: _currentPage,
onChanged: (index) {
setState(() {

@ -261,7 +261,7 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
width: model.products[index].rxMessage != null ? MediaQuery.of(context).size.width / 5 : 0,
padding: EdgeInsets.all(4),
decoration: BoxDecoration(
color: Color(0xffb23838),
color: const Color(0xFF14384B),
borderRadius: BorderRadius.only(topLeft: Radius.circular(6)),
),
child: model.products[index].rxMessage != null
@ -441,7 +441,7 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
width: model.products[index].rxMessage != null ? MediaQuery.of(context).size.width / 5 : 0,
padding: EdgeInsets.all(4),
decoration: BoxDecoration(
color: Color(0xffb23838),
color: const Color(0xFF14384B),
borderRadius: BorderRadius.only(topLeft: Radius.circular(6)),
),
child: model.products[index].rxMessage != null

@ -95,8 +95,8 @@ class OfferAndPackagesDetailState extends State<OfferAndPackagesDetail> {
// initialRating: 4.5,
// // todo ask haroon about rating value
// size: 18.0,
// filledColor: Color(0XFFD02127),
// emptyColor: Color(0XFFD02127),
// filledColor: Color(0xff14384B),
// emptyColor: Color(0xff14384B),
// isHalfAllowed: true,
// halfFilledIcon: Icons.star_half,
// filledIcon: Icons.star,

@ -91,7 +91,7 @@ class PackagesOrdersHistorySatate extends State<PackagesOrdersHistory>{
} else if (status == 3) { //completed
return Color(0xff359846);
} else if (status == 4 || status == 6 || status == 7) { //cancel // Rejected
return Color(0xffD02127);
return Color(0xff14384B);
}
return Colors.transparent;
}

@ -613,7 +613,7 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
),
child: Texts(
TranslationBase.of(context).offers.toUpperCase(),
color: Colors.red,
color: const Color(0xFF14384B),
fontSize: 13.0,
fontWeight: FontWeight.w900,
),
@ -820,7 +820,7 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
width: model.parentProducts[index].rxMessage != null ? MediaQuery.of(context).size.width / 5.3 : 0,
padding: EdgeInsets.all(4),
decoration: BoxDecoration(
color: Color(0xffb23838),
color: const Color(0xFF14384B),
borderRadius: BorderRadius.only(topLeft: Radius.circular(6)),
),
child: model.parentProducts[index].rxMessage != null

@ -254,7 +254,7 @@ class SearchBar extends SearchDelegate<String> {
height: 100,
width: 100,
child: Card(
color: Colors.red,
color: const Color(0xFF14384B),
child: Center(
child: Text(query),
),

@ -60,7 +60,7 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
height: 40,
padding: EdgeInsets.all(4),
decoration: BoxDecoration(
color: Color(0xffD02127),
color: Color(0xff14384B),
// color: Colors.red[700]
// borderRadius: BorderRadius.only(topLeft: Radius.circular(6)),
),
@ -145,7 +145,7 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
: Icons.favorite),
color: !widget.isInWishList!
? Color(0xff2E303A)
: Color(0xffD02127),
: Color(0xff14384B),
onPressed: () async {
{
if (widget.customerId != null) {
@ -172,7 +172,7 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
: Icons.favorite),
color: !widget.isInWishList!
? Color(0xff2E303A)
: Color(0xffD02127),
: Color(0xff14384B),
onPressed: () async {
{
if (widget.customerId != null) {
@ -292,8 +292,8 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
// initialRating: double.parse(
// widget.item.approvedRatingSum.toString()),
// size: 18.0,
// filledColor: Color(0XFFD02127),
// emptyColor: Color(0XFFD02127),
// filledColor: Color(0xff14384B),
// emptyColor: Color(0xff14384B),
// isHalfAllowed: true,
// halfFilledIcon: Icons.star_half,
// filledIcon: Icons.star,
@ -366,6 +366,6 @@ class _ProductNameAndPriceState extends State<ProductNameAndPrice> {
if (widget.isStockAvailable)
return Color(0xFF5AB145);
else
return Color(0xFFD02127);
return Color(0xff14384B);
}
}

@ -217,7 +217,7 @@ class _RecommendedProductsState extends State<RecommendedProducts> {
: 0,
padding: EdgeInsets.all(4),
decoration: BoxDecoration(
color: Color(0xffb23838),
color: const Color(0xFF14384B),
borderRadius: BorderRadius.only(
topLeft: Radius.circular(6),
),

@ -277,8 +277,8 @@ class ProductTileItem extends StatelessWidget {
// RatingBar.readOnly(
// initialRating: item.approvedRatingSum.toDouble(),
// size: 13.0,
// filledColor: Color(0XFFD02127),
// emptyColor: Color(0XFFD02127),
// filledColor: Color(0xff14384B),
// emptyColor: Color(0xff14384B),
// isHalfAllowed: true,
// halfFilledIcon: Icons.star_half,
// filledIcon: Icons.star,

@ -29,7 +29,7 @@ class ViewAllHomeWidget extends StatelessWidget {
},
child: Texts(
TranslationBase.of(context).viewAll,
color: Color(0xffD02127),
color: Color(0xff14384B),
decoration: TextDecoration.underline,
fontWeight: FontWeight.w600,
fontSize: 12.0,

@ -185,7 +185,7 @@ class _SearchProductsPageState extends State<SearchProductsPage> {
width: model.searchList[index].rxMessage != null ? MediaQuery.of(context).size.width / 3 : 0,
padding: EdgeInsets.all(4),
decoration: BoxDecoration(
color: Color(0xffb23838),
color: const Color(0xFF14384B),
borderRadius: BorderRadius.only(topLeft: Radius.circular(6)),
),
child: model.searchList[index].rxMessage != null

@ -223,7 +223,7 @@ class _ProfileSettings extends State<ProfileSettings> with TickerProviderStateMi
// },
// child: Text(
// TranslationBase.of(context).deleteAccount,
// style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, letterSpacing: -0.64, color: Color(0xffD02127), decoration: TextDecoration.underline),
// style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, letterSpacing: -0.64, color: Color(0xff14384B), decoration: TextDecoration.underline),
// ),
// ),
mHeight(8),

@ -633,7 +633,7 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
width: model.subProducts[index].rxMessage != null ? MediaQuery.of(context).size.width / 3 : 0,
padding: EdgeInsets.all(4),
decoration: BoxDecoration(
color: Color(0xffb23838),
color: const Color(0xFF14384B),
borderRadius: BorderRadius.only(topLeft: Radius.circular(6)),
),
child: model.subProducts[index].rxMessage != null
@ -781,7 +781,7 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
width: model.subProducts[index].rxMessage != null ? MediaQuery.of(context).size.width / 3.70 : 0,
padding: EdgeInsets.all(4),
decoration: BoxDecoration(
color: Color(0xffb23838),
color: const Color(0xFF14384B),
//borderRadius: BorderRadius.only(topLeft: Radius.circular(5)),
),
child: model.subProducts[index].rxMessage != null

@ -53,7 +53,7 @@ class AppToast {
alignment: Alignment.topCenter,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(radius.toDouble()),
color: Colors.red,
color: const Color(0xFF14384B),
),
child: Wrap(
children: [

@ -786,7 +786,7 @@ class Utils {
errorWidget: (context, url, error) {
return Icon(
Icons.error,
color: Colors.red,
color: const Color(0xFF14384B),
size: 50,
);
});
@ -873,7 +873,7 @@ class Utils {
flowChartText,
maxLines: 1,
minFontSize: 6,
style: TextStyle(decoration: TextDecoration.underline, fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xffD02127), letterSpacing: -0.48, height: 18 / 12),
style: TextStyle(decoration: TextDecoration.underline, fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff14384B), letterSpacing: -0.48, height: 18 / 12),
),
SizedBox(height: 12),
if (!isLast)
@ -924,7 +924,7 @@ class Utils {
isCapitable ? text.toLowerCase().capitalizeFirstofEach : text,
maxLines: 1,
minFontSize: 6,
style: TextStyle(decoration: TextDecoration.underline, fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xffD02127), letterSpacing: -0.48, height: 18 / 12),
style: TextStyle(decoration: TextDecoration.underline, fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff14384B), letterSpacing: -0.48, height: 18 / 12),
),
SizedBox(height: 10),
if (!isLast)

@ -522,7 +522,7 @@ Color getColor(String selectedColor) {
if ("black" == selectedColor) {
return Colors.black;
} else if ("red" == selectedColor) {
return Colors.red;
return const Color(0xFF14384B);
} else if ("blueAccent" == selectedColor) {
return Colors.blueAccent;
} else if ("blue" == selectedColor) {

@ -31,7 +31,7 @@ class RoundedContainer extends StatefulWidget {
this.margin = 10,
this.elevation = 1,
this.showBorder = false,
this.borderColor = Colors.red,
this.borderColor = const Color(0xFF14384B),
this.customCornerRaduis = false,
this.topLeft = 0,
this.topRight = 0,

@ -68,8 +68,8 @@ class LabResultWidget extends StatelessWidget {
height: 45.0,
child: CustomTextButton(
backgroundColor: Color(0xFFc5272d),
disabledForegroundColor: Colors.red[300]!.withOpacity(0.38),
disabledBackgroundColor: Colors.red[300]!.withOpacity(0.12),
disabledForegroundColor: const Color(0xFF14384B).withOpacity(0.38),
disabledBackgroundColor: const Color(0xFF14384B).withOpacity(0.12),
elevation: 0,
onPressed: () {
showKSADialog(context);

@ -201,8 +201,8 @@ class DoctorCard extends StatelessWidget {
// RatingBar.readOnly(
// initialRating: rating,
// size: 16.0,
// filledColor: Color(0XFFD02127),
// emptyColor: Color(0XFFD02127),
// filledColor: Color(0xff14384B),
// emptyColor: Color(0xff14384B),
// isHalfAllowed: true,
// halfFilledIcon: Icons.star_half,
// filledIcon: Icons.star,

@ -35,7 +35,7 @@ class _ShimmerLoadingWidgetState extends State<ShimmerLoadingWidget> {
if (snapshot.hasError) {
widget = Texts(
"Error happened",
color: Colors.red,
color: const Color(0xFF14384B),
fontSize: 20,
bold: true,
);

@ -106,8 +106,8 @@ class PackagesItemCardState extends State<PackagesItemCard> {
RatingBar(
initialRating: 4.5, // todo ask haroon about parameter for rating
// size: 18.0,
// filledColor: Color(0XFFD02127),
// emptyColor: Color(0XFFD02127),
// filledColor: Color(0xff14384B),
// emptyColor: Color(0xff14384B),
// isHalfAllowed: true,
// halfFilledIcon: Icons.star_half,
// filledIcon: Icons.star,
@ -182,8 +182,8 @@ class PackagesItemCardState extends State<PackagesItemCard> {
// RatingBar.readOnly(
// initialRating: 4.5,
// size: 18.0,
// filledColor: Color(0XFFD02127),
// emptyColor: Color(0XFFD02127),
// filledColor: Color(0xff14384B),
// emptyColor: Color(0xff14384B),
// isHalfAllowed: true,
// halfFilledIcon: Icons.star_half,
// filledIcon: Icons.star,

@ -155,12 +155,12 @@ class _OfferPackagesItemWidgetState extends State<OfferPackagesItemWidget> {
children: [
Texts(
widget.model.title,
color: Colors.red,
color: const Color(0xFF14384B),
fontSize: 20,
),
Texts(
widget.model.desc,
color: Colors.red,
color: const Color(0xFF14384B),
fontSize: 12,
),
Container(

@ -206,7 +206,7 @@ class _NotAutPageState extends State<NotAutPage> {
// style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white, letterSpacing: -0.48),
// ),
// style: TextButton.styleFrom(
// backgroundColor: Color(0xffD02127),
// backgroundColor: Color(0xff14384B),
// shape: RoundedRectangleBorder(
// borderRadius: BorderRadius.circular(6),
// ),

@ -12,7 +12,6 @@ class WeatherSlider extends StatelessWidget {
WeatherSlider(this.data, this.projectViewModel);
LinearGradient red = LinearGradient(colors: [const Color(0xFF14384B), const Color(0xFF14384B)]);
LinearGradient green = LinearGradient(colors: [Colors.greenAccent[100]!, Colors.greenAccent]);
LinearGradient grey = LinearGradient(colors: [Colors.grey[100]!, Colors.grey]);
LinearGradient orange = LinearGradient(colors: [Colors.orangeAccent[100]!, Colors.orange]);
LinearGradient yellow = LinearGradient(colors: [Colors.yellow[100]!, Colors.yellow[600]!]);
@ -65,7 +64,7 @@ class WeatherSlider extends StatelessWidget {
width: 0,
decoration: ShapeDecoration(
color: data.colorName == 'red'
? Colors.redAccent
? const Color(0xFF14384B)
: data.colorName == 'orange'
? Colors.orangeAccent
: data.colorName == 'green'
@ -84,7 +83,7 @@ class WeatherSlider extends StatelessWidget {
width: 0,
decoration: ShapeDecoration(
color: data.colorName == 'red'
? Colors.redAccent
? const Color(0xFF14384B)
: data.colorName == 'orange'
? Colors.orangeAccent
: data.colorName == 'green'
@ -131,7 +130,7 @@ class WeatherSlider extends StatelessWidget {
AppText(data.categoriesNames!.category3!,
fontSize: 12,
color: data.categoriesNames!.category3 == data.category && data.colorName == 'red'
? Colors.redAccent!
? const Color(0xFF14384B)
: data.categoriesNames!.category3! == data.category && data.colorName == 'orange'
? Colors.orangeAccent!
: data.categoriesNames!.category3 == data.category && data.colorName == 'green'
@ -153,7 +152,7 @@ class WeatherSlider extends StatelessWidget {
AppText(data.categoriesNames!.category5!,
fontSize: 12,
color: data.categoriesNames!.category5 == data.category && data.colorName == 'red'
? Colors.redAccent
? const Color(0xFF14384B)
: data.categoriesNames!.category5! == data.category && data.colorName == 'orange'
? Colors.orangeAccent
: data.categoriesNames!.category5! == data.category && data.colorName == 'green'

Loading…
Cancel
Save